Bug 1441198 - Part 1 - Use correct copy for cookies and site data in about:preferences. r=nhnt11
This mostly changes "cookies" to "cookies and site data" and amends a few
other details.
MozReview-Commit-ID: 97xTSQPw2DA
--- a/browser/components/preferences/in-content/privacy.js
+++ b/browser/components/preferences/in-content/privacy.js
@@ -403,17 +403,17 @@ var gPrivacyPane = {
appendSearchKeywords("passwordExceptions", [
bundlePrefs.getString("savedLoginsExceptions_title"),
bundlePrefs.getString("savedLoginsExceptions_desc3"),
]);
appendSearchKeywords("showPasswords", [
signonBundle.getString("loginsDescriptionAll2"),
]);
appendSearchKeywords("cookieExceptions", [
- bundlePrefs.getString("cookiepermissionstext"),
+ bundlePrefs.getString("cookiepermissionstext1"),
]);
appendSearchKeywords("trackingProtectionExceptions", [
bundlePrefs.getString("trackingprotectionpermissionstitle"),
bundlePrefs.getString("trackingprotectionpermissionstext2"),
]);
appendSearchKeywords("changeBlockList", [
bundlePrefs.getString("blockliststitle"),
bundlePrefs.getString("blockliststext"),
@@ -449,17 +449,17 @@ var gPrivacyPane = {
appendSearchKeywords("addonExceptions", [
bundlePrefs.getString("addons_permissions_title2"),
bundlePrefs.getString("addonspermissionstext"),
]);
appendSearchKeywords("viewSecurityDevicesButton", [
pkiBundle.getString("enable_fips"),
]);
appendSearchKeywords("siteDataSettings", [
- bundlePrefs.getString("siteDataSettings2.description"),
+ bundlePrefs.getString("siteDataSettings3.description"),
bundlePrefs.getString("removeAllCookies.label"),
bundlePrefs.getString("removeSelectedCookies.label"),
]);
// Notify observers that the UI is now ready
Services.obs.notifyObservers(window, "privacy-pane-loaded");
},
@@ -876,18 +876,18 @@ var gPrivacyPane = {
showCookieExceptions() {
var bundlePreferences = document.getElementById("bundlePreferences");
var params = {
blockVisible: true,
sessionVisible: true,
allowVisible: true,
prefilledHost: "",
permissionType: "cookie",
- windowTitle: bundlePreferences.getString("cookiepermissionstitle"),
- introText: bundlePreferences.getString("cookiepermissionstext")
+ windowTitle: bundlePreferences.getString("cookiepermissionstitle1"),
+ introText: bundlePreferences.getString("cookiepermissionstext1")
};
gSubDialog.open("chrome://browser/content/preferences/permissions.xul",
null, params);
},
// CLEAR PRIVATE DATA
/*
@@ -1400,17 +1400,17 @@ var gPrivacyPane = {
},
updateTotalDataSizeLabel(siteDataUsage) {
SiteDataManager.getCacheSize().then(function(cacheUsage) {
let prefStrBundle = document.getElementById("bundlePreferences");
let totalSiteDataSizeLabel = document.getElementById("totalSiteDataSize");
let totalUsage = siteDataUsage + cacheUsage;
let size = DownloadUtils.convertByteUnits(totalUsage);
- totalSiteDataSizeLabel.textContent = prefStrBundle.getFormattedString("totalSiteDataSize1", size);
+ totalSiteDataSizeLabel.textContent = prefStrBundle.getFormattedString("totalSiteDataSize2", size);
});
},
clearSiteData() {
gSubDialog.open("chrome://browser/content/preferences/clearSiteData.xul");
},
initDataCollection() {
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -70,22 +70,22 @@
<label id="historyModeLabel"
control="historyMode"
accesskey="&historyHeader2.pre.accesskey;">&historyHeader2.pre.label;
</label>
<!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
<hbox>
<menulist id="historyMode">
<menupopup>
- <menuitem label="&historyHeader.remember.label;" value="remember" searchkeywords="&rememberDescription.label;"/>
+ <menuitem label="&historyHeader.remember.label;" value="remember" searchkeywords="&rememberDescription1.label;"/>
<menuitem label="&historyHeader.dontremember.label;" value="dontremember" searchkeywords="&dontrememberDescription.label;"/>
<menuitem label="&historyHeader.custom.label;" value="custom" searchkeywords="&privateBrowsingPermanent2.label;
&rememberHistory2.label;
&rememberSearchForm.label;
- &acceptCookies3.label;
+ &acceptCookies4.label;
&cookieExceptions.label;
&acceptThirdParty3.pre.label;
&acceptThirdParty.always.label;
&acceptThirdParty.visited.label;
&acceptThirdParty.never.label;
&keepUntil2.label;
&expire.label;
&close.label;
@@ -96,17 +96,17 @@
</hbox>
<label>&historyHeader.post.label;</label>
</hbox>
<hbox>
<deck id="historyPane" flex="1">
<vbox id="historyRememberPane">
<hbox align="center" flex="1">
<vbox flex="1">
- <description>&rememberDescription.label;</description>
+ <description>&rememberDescription1.label;</description>
</vbox>
</hbox>
</vbox>
<vbox id="historyDontRememberPane">
<hbox align="center" flex="1">
<vbox flex="1">
<description>&dontrememberDescription.label;</description>
</vbox>
--- a/browser/components/preferences/in-content/tests/browser_search_subdialogs_within_preferences_7.js
+++ b/browser/components/preferences/in-content/tests/browser_search_subdialogs_within_preferences_7.js
@@ -25,16 +25,8 @@ add_task(async function() {
* Test for searching for the "Connection Settings" subdialog.
*/
add_task(async function() {
await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
await evaluateSearchResults("Use system proxy settings", "connectionGroup");
await BrowserTestUtils.removeTab(gBrowser.selectedTab);
});
-/**
- * Test for searching for the "Settings - Site Data" subdialog.
- */
-add_task(async function() {
- await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
- await evaluateSearchResults("store site data on your computer", "siteDataGroup");
- await BrowserTestUtils.removeTab(gBrowser.selectedTab);
-});
--- a/browser/components/preferences/in-content/tests/browser_siteData.js
+++ b/browser/components/preferences/in-content/tests/browser_siteData.js
@@ -85,17 +85,17 @@ add_task(async function() {
let prefStrBundle = doc.getElementById("bundlePreferences");
let totalSiteDataSizeLabel = doc.getElementById("totalSiteDataSize");
is(clearBtn.disabled, false, "Should enable clear button after sites updated");
is(settingsButton.disabled, false, "Should enable settings button after sites updated");
await SiteDataManager.getTotalUsage()
.then(usage => {
actual = totalSiteDataSizeLabel.textContent;
expected = prefStrBundle.getFormattedString(
- "totalSiteDataSize1", DownloadUtils.convertByteUnits(usage + cacheSize));
+ "totalSiteDataSize2", DownloadUtils.convertByteUnits(usage + cacheSize));
is(actual, expected, "Should show the right total site data size");
});
Services.obs.notifyObservers(null, "sitedatamanager:updating-sites");
is(clearBtn.disabled, true, "Should disable clear button while updating sites");
is(settingsButton.disabled, true, "Should disable settings button while updating sites");
actual = totalSiteDataSizeLabel.textContent;
expected = prefStrBundle.getString("loadingSiteDataSize1");
@@ -104,17 +104,17 @@ add_task(async function() {
Services.obs.notifyObservers(null, "sitedatamanager:sites-updated");
is(clearBtn.disabled, false, "Should enable clear button after sites updated");
is(settingsButton.disabled, false, "Should enable settings button after sites updated");
cacheSize = await SiteDataManager.getCacheSize();
await SiteDataManager.getTotalUsage()
.then(usage => {
actual = totalSiteDataSizeLabel.textContent;
expected = prefStrBundle.getFormattedString(
- "totalSiteDataSize1", DownloadUtils.convertByteUnits(usage + cacheSize));
+ "totalSiteDataSize2", DownloadUtils.convertByteUnits(usage + cacheSize));
is(actual, expected, "Should show the right total site data size");
});
await BrowserTestUtils.removeTab(gBrowser.selectedTab);
});
// Test clearing service wroker through the settings panel
add_task(async function() {
--- a/browser/components/preferences/siteDataSettings.js
+++ b/browser/components/preferences/siteDataSettings.js
@@ -88,17 +88,17 @@ let gSiteDataSettings = {
let sortCol = document.querySelector("treecol[data-isCurrentSortCol=true]");
this._sortSites(this._sites, sortCol);
this._buildSitesList(this._sites);
Services.obs.notifyObservers(null, "sitedata-settings-init");
});
let brandShortName = document.getElementById("bundle_brand").getString("brandShortName");
let settingsDescription = document.getElementById("settingsDescription");
- settingsDescription.textContent = this._prefStrBundle.getFormattedString("siteDataSettings2.description", [brandShortName]);
+ settingsDescription.textContent = this._prefStrBundle.getFormattedString("siteDataSettings3.description", [brandShortName]);
setEventListener("sitesList", "select", this.onSelect);
setEventListener("hostCol", "click", this.onClickTreeCol);
setEventListener("usageCol", "click", this.onClickTreeCol);
setEventListener("lastAccessedCol", "click", this.onClickTreeCol);
setEventListener("cookiesCol", "click", this.onClickTreeCol);
setEventListener("cancel", "command", this.close);
setEventListener("save", "command", this.saveChanges);
--- a/browser/locales/en-US/chrome/browser/preferences/preferences.properties
+++ b/browser/locales/en-US/chrome/browser/preferences/preferences.properties
@@ -17,18 +17,18 @@ labelDefaultFontUnnamed=Default
veryLargeMinimumFontTitle=Large minimum font size
veryLargeMinimumFontWarning=You have selected a very large minimum font size (more than 24 pixels). This may make it difficult or impossible to use some important configuration pages like this one.
acceptVeryLargeMinimumFont=Keep my changes anyway
#### Permissions Manager
trackingprotectionpermissionstext2=You have disabled Tracking Protection on these websites.
trackingprotectionpermissionstitle=Exceptions - Tracking Protection
-cookiepermissionstext=You can specify which websites are always or never allowed to use cookies. Type the exact address of the site you want to manage and then click Block, Allow for Session, or Allow.
-cookiepermissionstitle=Exceptions - Cookies
+cookiepermissionstext1=You can specify which websites are always or never allowed to use cookies and site data. Type the exact address of the site you want to manage and then click Block, Allow for Session, or Allow.
+cookiepermissionstitle1=Exceptions - Cookies and Site Data
addonspermissionstext=You can specify which websites are allowed to install add-ons. Type the exact address of the site you want to allow and then click Allow.
addons_permissions_title2=Allowed Websites - Add-ons Installation
popuppermissionstext=You can specify which websites are allowed to open pop-up windows. Type the exact address of the site you want to allow and then click Allow.
popuppermissionstitle2=Allowed Websites - Pop-ups
notificationspermissionstext6=The following websites have requested to send you notifications. You can specify which websites are allowed to send you notifications. You can also block new requests asking to allow notifications.
notificationspermissionstitle2=Settings - Notification Permissions
notificationspermissionsdisablelabel=Block new requests asking to allow notifications
notificationspermissionsdisabledescription=This will prevent any websites not listed above from requesting permission to send notifications. Blocking notifications may break some website features.
@@ -161,29 +161,29 @@ removeAllShownCookies.accesskey=A
# you can use #1 in your localization as a placeholder for the number.
# For example this is the English string with numbers:
# removeSelectedCookied=Remove #1 Selected;Remove #1 Selected
removeSelectedCookies.label=Remove Selected;Remove Selected
removeSelectedCookies.accesskey=R
defaultUserContextLabel=None
-# LOCALIZATION NOTE (totalSiteDataSize1, siteUsage, siteUsagePersistent):
+# LOCALIZATION NOTE (totalSiteDataSize2, siteUsage, siteUsagePersistent):
# This is the total usage of site data, where we insert storage size and unit.
# e.g., "The total usage is currently 200 MB"
# %1$S = size
# %2$S = unit (MB, KB, etc.)
-totalSiteDataSize1=Your stored site data and cache are currently using %1$S %2$S of disk space
+totalSiteDataSize2=Your stored cookies, site data and cache are currently using %1$S %2$S of disk space.
siteUsage=%1$S %2$S
siteUsagePersistent=%1$S %2$S (Persistent)
loadingSiteDataSize1=Calculating site data and cache size…
acceptRemove=Remove
-# LOCALIZATION NOTE (siteDataSettings2.description): %S = brandShortName
-siteDataSettings2.description=The following websites store site data on your computer. %S keeps data from websites with persistent storage until you delete it, and deletes data from websites with non-persistent storage as space is needed.
+# LOCALIZATION NOTE (siteDataSettings3.description): %S = brandShortName
+siteDataSettings3.description=The following websites store cookies and site data on your computer. %S keeps data from websites with persistent storage until you delete it, and deletes data from websites with non-persistent storage as space is needed.
# LOCALIZATION NOTE (removeAllSiteData, removeAllSiteDataShown):
# removeAllSiteData and removeAllSiteDataShown are both used on the same one button,
# never displayed together and can share the same accesskey.
# When only partial sites are shown as a result of keyword search,
# removeAllShown is displayed as button label.
# removeAll is displayed when no keyword search and all sites are shown.
removeAllSiteData.label=Remove All
removeAllSiteData.accesskey=e
--- a/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
@@ -33,18 +33,18 @@
<!ENTITY locbar.bookmarks.accesskey "k">
<!ENTITY locbar.openpage.label "Open tabs">
<!ENTITY locbar.openpage.accesskey "O">
<!ENTITY locbar.searches.label "Related searches from the default search engine">
<!ENTITY locbar.searches.accesskey "d">
<!ENTITY suggestionSettings2.label "Change preferences for search engine suggestions">
-<!ENTITY acceptCookies3.label "Accept cookies and site data from websites">
-<!ENTITY acceptCookies3.accesskey "A">
+<!ENTITY acceptCookies4.label "Accept cookies and site data from websites (recommended)">
+<!ENTITY acceptCookies4.accesskey "A">
<!ENTITY blockCookies.label "Block cookies and site data (may cause websites to break)">
<!ENTITY blockCookies.accesskey "B">
<!ENTITY acceptThirdParty3.pre.label "Accept third-party cookies and site data">
<!ENTITY acceptThirdParty3.pre.accesskey "y">
<!ENTITY acceptThirdParty.always.label "Always">
<!ENTITY acceptThirdParty.never.label "Never">
@@ -61,17 +61,17 @@
<!ENTITY historyHeader2.pre.label "&brandShortName; will">
<!ENTITY historyHeader2.pre.accesskey "w">
<!ENTITY historyHeader.remember.label "Remember history">
<!ENTITY historyHeader.dontremember.label "Never remember history">
<!ENTITY historyHeader.custom.label "Use custom settings for history">
<!ENTITY historyHeader.post.label "">
-<!ENTITY rememberDescription.label "&brandShortName; will remember your browsing, download, form and search history, and keep cookies from websites you visit.">
+<!ENTITY rememberDescription1.label "&brandShortName; will remember your browsing, download, form and search history.">
<!ENTITY dontrememberDescription.label "&brandShortName; will use the same settings as private browsing, and will not remember any history as you browse the Web.">
<!ENTITY clearHistoryButton.label "Clear History…">
<!ENTITY clearHistoryButton.accesskey "s">
<!ENTITY privateBrowsingPermanent2.label "Always use private browsing mode">
<!ENTITY privateBrowsingPermanent2.accesskey "p">