Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1451992 - Migrate Preferences::Subdialogs::SiteData to Fluent. r=jaws,flod

Browse Source 
MozReview-Commit-ID: KzEP0iCfzGf

--HG--
extra : amend_source : 15bca3b8ca44950e1284427726e037a22fbfc7e5
This commit is contained in:
Zibi Braniecki 2018-04-05 22:37:59 +02:00
parent 2021285e2a
commit 6b595c6539
8 changed files with 262 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/components/preferences/in-content/preferences.xul
View File

@ -22,8 +22,6 @@
<!ENTITY % historyDTD SYSTEM "chrome://mozapps/locale/update/history.dtd">
<!ENTITY % certManagerDTD SYSTEM "chrome://pippki/locale/certManager.dtd">
<!ENTITY % deviceManangerDTD SYSTEM "chrome://pippki/locale/deviceManager.dtd">
<!ENTITY % siteDataSettingsDTD SYSTEM
"chrome://browser/locale/preferences/siteDataSettings.dtd" >
<!ENTITY % privacyDTD SYSTEM "chrome://browser/locale/preferences/privacy.dtd">
<!ENTITY % syncBrandDTD SYSTEM "chrome://browser/locale/syncBrand.dtd">
<!ENTITY % syncDTD SYSTEM "chrome://browser/locale/preferences/sync.dtd">
@ -37,7 +35,6 @@
%historyDTD;
%certManagerDTD;
%deviceManangerDTD;
%siteDataSettingsDTD;
%privacyDTD;
%syncBrandDTD;
%syncDTD;
@ -69,6 +66,7 @@
<link rel="localization" href="browser/preferences/languages.ftl"/>
<link rel="localization" href="browser/preferences/permissions.ftl"/>
<link rel="localization" href="browser/preferences/selectBookmark.ftl"/>
<link rel="localization" href="browser/preferences/siteDataSettings.ftl"/>
<script type="text/javascript" src="chrome://global/content/l10n.js"></script>

10
browser/components/preferences/in-content/privacy.xul
View File

@ -233,10 +233,12 @@
<button id="siteDataSettings"
class="accessory-button"
data-l10n-id="sitedata-settings"
searchkeywords="&window2.title;
&hostCol.label;
&cookiesCol.label;
&usageCol.label;"/>
search-l10n-ids="
site-data-settings-window.title,
site-data-column-host.label,
site-data-column-cookies.label,
site-data-column-storage.label,
"/>
</hbox>
<hbox>
<button id="cookieExceptions"

15
browser/components/preferences/siteDataRemoveSelected.xul
View File

@ -8,17 +8,19 @@
<?xml-stylesheet href="chrome://browser/content/preferences/siteDataSettings.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/in-content/siteDataSettings.css" type="text/css"?>
<!DOCTYPE dialog SYSTEM "chrome://browser/locale/preferences/siteDataSettings.dtd" >
<dialog id="SiteDataRemoveSelectedDialog"
windowtype="Browser:SiteDataRemoveSelected"
width="500"
title="&removingDialog1.title;"
data-l10n-id="site-data-removing-window"
data-l10n-attrs="title"
onload="gSiteDataRemoveSelected.init();"
ondialogaccept="gSiteDataRemoveSelected.ondialogaccept(); return true;"
ondialogcancel="gSiteDataRemoveSelected.ondialogcancel(); return true;"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<link rel="localization" href="browser/preferences/siteDataSettings.ftl"/>
<script type="application/javascript" src="chrome://global/content/l10n.js"></script>
<script src="chrome://browser/content/preferences/siteDataRemoveSelected.js"/>
<stringbundle id="bundlePreferences"
@ -32,19 +34,20 @@
<vbox flex="1">
<!-- Only show this label on OS X because of no dialog title -->
<label id="removing-label"
data-l10n-id="site-data-removing-header"
#ifndef XP_MACOSX
hidden="true"
#endif
>&removingDialog1.title;</label>
/>
<separator class="thin"/>
<description id="removing-description">&removingSelected1.description;</description>
<description id="removing-description" data-l10n-id="site-data-removing-desc"/>
</vbox>
</hbox>
<separator />
<vbox flex="1">
<label>&siteTree3.label;</label>
<label data-l10n-id="site-data-removing-table"/>
<separator class="thin"/>
<tree id="sitesTree" flex="1" seltype="single" hidecolumnpicker="true">
<treecols>

25
browser/components/preferences/siteDataSettings.xul
View File

@ -9,16 +9,19 @@
<?xml-stylesheet href="chrome://browser/content/preferences/siteDataSettings.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/in-content/siteDataSettings.css" type="text/css"?>
<!DOCTYPE dialog SYSTEM "chrome://browser/locale/preferences/siteDataSettings.dtd" >
<window id="SiteDataSettingsDialog" windowtype="Browser:SiteDataSettings"
class="windowDialog" title="&window2.title;"
data-l10n-id="site-data-settings-window"
data-l10n-attrs="title"
class="windowDialog"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
style="width: 45em;"
onload="gSiteDataSettings.init();"
onkeypress="gSiteDataSettings.onKeyPress(event);"
persist="screenX screenY width height">
<link rel="localization" href="browser/preferences/siteDataSettings.ftl"/>
<script type="application/javascript" src="chrome://global/content/l10n.js"></script>
<script src="chrome://browser/content/preferences/siteDataSettings.js"/>
<stringbundle id="bundlePreferences"
@ -31,30 +34,30 @@
<hbox id="searchBoxContainer">
<textbox id="searchBox" type="search" flex="1"
placeholder="&searchTextboxPlaceHolder;" accesskey="&searchTextboxPlaceHolder.accesskey;"/>
data-l10n-id="site-data-search-textbox"/>
</hbox>
<separator class="thin"/>
<richlistbox seltype="multiple" id="sitesList" orient="vertical" flex="1">
<listheader>
<treecol flex="4" width="50" label="&hostCol.label;" id="hostCol"/>
<treecol flex="1" width="50" label="&cookiesCol.label;" id="cookiesCol"/>
<treecol flex="4" width="50" data-l10n-id="site-data-column-host" id="hostCol"/>
<treecol flex="1" width="50" data-l10n-id="site-data-column-cookies" id="cookiesCol"/>
<!-- Sorted by usage so the user can quickly see which sites use the most data. -->
<treecol flex="2" width="50" label="&usageCol.label;" id="usageCol" data-isCurrentSortCol="true"/>
<treecol flex="2" width="50" label="&lastAccessedCol.label;" id="lastAccessedCol" />
<treecol flex="2" width="50" data-l10n-id="site-data-column-storage" id="usageCol" data-isCurrentSortCol="true"/>
<treecol flex="2" width="50" data-l10n-id="site-data-column-last-used" id="lastAccessedCol" />
</listheader>
</richlistbox>
</vbox>
<hbox align="start">
<button id="removeSelected" label="&removeSelected.label;" accesskey="&removeSelected.accesskey;"/>
<button id="removeSelected" data-l10n-id="site-data-remove-selected"/>
<button id="removeAll"/>
</hbox>
<vbox align="end">
<hbox>
<button id="cancel" label="&cancel.label;" accesskey="&cancel.accesskey;"/>
<button id="save" label="&save.label;" accesskey="&save.accesskey;"/>
<button id="cancel" data-l10n-id="site-data-button-cancel"/>
<button id="save" data-l10n-id="site-data-button-save"/>
</hbox>
</vbox>

45
browser/locales/en-US/browser/preferences/siteDataSettings.ftl Normal file
View File

@ -0,0 +1,45 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
## Settings
site-data-settings-window =
.title = Manage Cookies and Site Data
site-data-search-textbox =
.placeholder = Search websites
.accesskey = S
site-data-column-host =
.label = Site
site-data-column-cookies =
.label = Cookies
site-data-column-storage =
.label = Storage
site-data-column-last-used =
.label = Last Used
site-data-remove-selected =
.label = Remove Selected
.accesskey = R
site-data-button-cancel =
.label = Cancel
.accesskey = C
site-data-button-save =
.label = Save Changes
.accesskey = a
## Removing
site-data-removing-window =
.title = { site-data-removing-header }
site-data-removing-header = Removing Cookies and Site Data
site-data-removing-desc = Removing cookies and site data may log you out of websites. Are you sure you want to make the changes?
site-data-removing-table = Cookies and site data for the following websites will be removed

20
browser/locales/en-US/chrome/browser/preferences/siteDataSettings.dtd
View File

@ -1,20 +0,0 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!ENTITY window2.title "Manage Cookies and Site Data">
<!ENTITY hostCol.label "Site">
<!ENTITY cookiesCol.label "Cookies">
<!ENTITY usageCol.label "Storage">
<!ENTITY lastAccessedCol.label "Last Used">
<!ENTITY searchTextboxPlaceHolder "Search websites">
<!ENTITY searchTextboxPlaceHolder.accesskey "S">
<!ENTITY removeSelected.label "Remove Selected">
<!ENTITY removeSelected.accesskey "r">
<!ENTITY save.label "Save Changes">
<!ENTITY save.accesskey "a">
<!ENTITY cancel.label "Cancel">
<!ENTITY cancel.accesskey "C">
<!ENTITY removingDialog1.title "Removing Cookies and Site Data">
<!ENTITY removingSelected1.description "Removing cookies and site data may log you out of websites. Are you sure you want to make the changes?">
<!ENTITY siteTree3.label "Cookies and site data for the following websites will be removed">

1
browser/locales/jar.mn
View File

@ -60,7 +60,6 @@
locale/browser/preferences/preferences.properties (%chrome/browser/preferences/preferences.properties)
locale/browser/preferences/privacy.dtd (%chrome/browser/preferences/privacy.dtd)
locale/browser/preferences/security.dtd (%chrome/browser/preferences/security.dtd)
locale/browser/preferences/siteDataSettings.dtd (%chrome/browser/preferences/siteDataSettings.dtd)
locale/browser/preferences/sync.dtd (%chrome/browser/preferences/sync.dtd)
locale/browser/preferences/translation.dtd (%chrome/browser/preferences/translation.dtd)
locale/browser/syncBrand.dtd (%chrome/browser/syncBrand.dtd)

187
python/l10n/fluent_migrations/bug_1451992_preferences_sitedata.py Normal file
View File

@ -0,0 +1,187 @@
# coding=utf8
# Any copyright is dedicated to the Public Domain.
# http://creativecommons.org/publicdomain/zero/1.0/
from __future__ import absolute_import
import fluent.syntax.ast as FTL
from fluent.migrate.helpers import MESSAGE_REFERENCE
from fluent.migrate import COPY, CONCAT, REPLACE
def migrate(ctx):
"""Bug 1451992 - Migrate Preferences::Subdialogs::Site Data to Fluent, part {index}."""
ctx.add_transforms(
'browser/browser/preferences/siteDataSettings.ftl',
'browser/browser/preferences/siteDataSettings.ftl',
[
FTL.Message(
id=FTL.Identifier('site-data-settings-window'),
attributes=[
FTL.Attribute(
FTL.Identifier('title'),
COPY(
'browser/chrome/browser/preferences/siteDataSettings.dtd',
'window2.title'
)
)
]
),
FTL.Message(
id=FTL.Identifier('site-data-search-textbox'),
attributes=[
FTL.Attribute(
FTL.Identifier('placeholder'),
COPY(
'browser/chrome/browser/preferences/siteDataSettings.dtd',
'searchTextboxPlaceHolder'
)
),
FTL.Attribute(
FTL.Identifier('accesskey'),
COPY(
'browser/chrome/browser/preferences/siteDataSettings.dtd',
'searchTextboxPlaceHolder.accesskey'
)
)
]
),
FTL.Message(
id=FTL.Identifier('site-data-column-host'),
attributes=[
FTL.Attribute(
FTL.Identifier('label'),
COPY(
'browser/chrome/browser/preferences/siteDataSettings.dtd',
'hostCol.label'
)
)
]
),
FTL.Message(
id=FTL.Identifier('site-data-column-cookies'),
attributes=[
FTL.Attribute(
FTL.Identifier('label'),
COPY(
'browser/chrome/browser/preferences/siteDataSettings.dtd',
'cookiesCol.label'
)
)
]
),
FTL.Message(
id=FTL.Identifier('site-data-column-storage'),
attributes=[
FTL.Attribute(
FTL.Identifier('label'),
COPY(
'browser/chrome/browser/preferences/siteDataSettings.dtd',
'usageCol.label'
)
)
]
),
FTL.Message(
id=FTL.Identifier('site-data-column-last-used'),
attributes=[
FTL.Attribute(
FTL.Identifier('label'),
COPY(
'browser/chrome/browser/preferences/siteDataSettings.dtd',
'lastAccessedCol.label'
)
)
]
),
FTL.Message(
id=FTL.Identifier('site-data-remove-selected'),
attributes=[
FTL.Attribute(
FTL.Identifier('label'),
COPY(
'browser/chrome/browser/preferences/siteDataSettings.dtd',
'removeSelected.label'
)
),
FTL.Attribute(
FTL.Identifier('accesskey'),
COPY(
'browser/chrome/browser/preferences/siteDataSettings.dtd',
'removeSelected.accesskey'
)
)
]
),
FTL.Message(
id=FTL.Identifier('site-data-button-cancel'),
attributes=[
FTL.Attribute(
FTL.Identifier('label'),
COPY(
'browser/chrome/browser/preferences/siteDataSettings.dtd',
'cancel.label'
)
),
FTL.Attribute(
FTL.Identifier('accesskey'),
COPY(
'browser/chrome/browser/preferences/siteDataSettings.dtd',
'cancel.accesskey'
)
)
]
),
FTL.Message(
id=FTL.Identifier('site-data-button-save'),
attributes=[
FTL.Attribute(
FTL.Identifier('label'),
COPY(
'browser/chrome/browser/preferences/siteDataSettings.dtd',
'save.label'
)
),
FTL.Attribute(
FTL.Identifier('accesskey'),
COPY(
'browser/chrome/browser/preferences/siteDataSettings.dtd',
'save.accesskey'
)
)
]
),
FTL.Message(
id=FTL.Identifier('site-data-removing-window'),
attributes=[
FTL.Attribute(
FTL.Identifier('title'),
CONCAT(
MESSAGE_REFERENCE('site-data-removing-header'),
)
)
]
),
FTL.Message(
id=FTL.Identifier('site-data-removing-header'),
value=COPY(
'browser/chrome/browser/preferences/siteDataSettings.dtd',
'removingDialog1.title'
)
),
FTL.Message(
id=FTL.Identifier('site-data-removing-desc'),
value=COPY(
'browser/chrome/browser/preferences/siteDataSettings.dtd',
'removingSelected1.description'
)
),
FTL.Message(
id=FTL.Identifier('site-data-removing-table'),
value=COPY(
'browser/chrome/browser/preferences/siteDataSettings.dtd',
'siteTree3.label'
)
)
]
)