Bug 849287 - Clean up strings for Metro site permission notifications [r=jimm]
authorMatt Brubeck <mbrubeck@mozilla.com>
Fri, 08 Mar 2013 13:51:24 -0800
changeset 124275 a9df76f9f8f4b6b9df9024b02e5e56f75c2af564
parent 124274 20dff242f58031b81081480c5440ec93890cce6c
child 124276 09bb2980eafbee4a45fb0dcb2d28ff6b9361e3f3
push id24323
push usermbrubeck@mozilla.com
push dateFri, 08 Mar 2013 21:52:51 +0000
treeherdermozilla-inbound@09bb2980eafb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjimm
bugs849287
milestone22.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 849287 - Clean up strings for Metro site permission notifications [r=jimm]
browser/metro/base/content/helperui/OfflineApps.js
browser/metro/components/ContentPermissionPrompt.js
browser/metro/locales/en-US/chrome/browser.properties
--- a/browser/metro/base/content/helperui/OfflineApps.js
+++ b/browser/metro/base/content/helperui/OfflineApps.js
@@ -37,30 +37,26 @@ var OfflineApps = {
       let buttons = [{
         label: strings.GetStringFromName("offlineApps.allow"),
         accessKey: "",
         callback: function() {
           for (let i = 0; i < notification.documents.length; i++)
             OfflineApps.allowSite(notification.documents[i], aTarget);
         }
       },{
-        label: strings.GetStringFromName("offlineApps.never"),
+        label: strings.GetStringFromName("contentPermissions.neverForSite"),
         accessKey: "",
         callback: function() {
           for (let i = 0; i < notification.documents.length; i++)
             OfflineApps.disallowSite(notification.documents[i]);
         }
-      },{
-        label: strings.GetStringFromName("offlineApps.notNow"),
-        accessKey: "",
-        callback: function() { /* noop */ }
       }];
 
       const priority = notificationBox.PRIORITY_INFO_LOW;
-      let message = strings.formatStringFromName("offlineApps.available2", [host], 1);
+      let message = strings.formatStringFromName("offlineApps.wantsTo", [host], 1);
       notification = notificationBox.appendNotification(message, notificationID, "", priority, buttons);
       notification.documents = [aRequest];
     }
   },
 
   allowSite: function(aRequest, aTarget) {
     let currentURI = Services.io.newURI(aRequest.location, aRequest.charset, null);
     Services.perms.add(currentURI, "offline-app", Ci.nsIPermissionManager.ALLOW_ACTION);
--- a/browser/metro/components/ContentPermissionPrompt.js
+++ b/browser/metro/components/ContentPermissionPrompt.js
@@ -10,18 +10,17 @@ Cu.import("resource://gre/modules/XPCOMU
 Cu.import("resource://gre/modules/Services.jsm");
 
 const kCountBeforeWeRemember = 5;
 
 const kEntities = {
   "geolocation": "geolocation2",
   "desktop-notification": "desktopNotification",
   "indexedDB": "offlineApps",
-  "indexedDBQuota": "indexedDBQuota",
-  "openWebappsManage": "openWebappsManage"
+  "indexedDBQuota": "indexedDBQuota"
 };
 
 const kIcons = {
   geolocation: "chrome://browser/skin/images/infobar-geolocation.png"
 };
 
 function ContentPermissionPrompt() {}
 
--- a/browser/metro/locales/en-US/chrome/browser.properties
+++ b/browser/metro/locales/en-US/chrome/browser.properties
@@ -54,32 +54,23 @@ geolocation2.wantsTo=Share your location
 desktopNotification.allow=Allow
 desktopNotification.wantsTo=%S wants to use notifications.
 
 # Error Console
 typeError=Error:
 typeWarning=Warning:
 
 # Offline web applications
-offlineApps.available2=%S wants to store data on your device for offline use.
 offlineApps.allow=Allow
-offlineApps.never=Don't Allow
-offlineApps.notNow=Not Now
-
-# New-style ContentPermissionPrompt values
 offlineApps.wantsTo=%S wants to store data on your device for offline use.
 
 # IndexedDB Quota increases
 indexedDBQuota.allow=Allow
 indexedDBQuota.wantsTo=%S wants to store a lot of data on your device for offline use.
 
-# Open Web Apps management API
-openWebappsManage.allow=Allow
-openWebappsManage.wantsTo=%S wants to manage applications on your device.
-
 # Bookmark List
 bookmarkList.desktop=Desktop Bookmarks
 
 # Closing Tabs
 tabs.closeWarningTitle=Confirm close
 
 # LOCALIZATION NOTE (tabs.closeWarning): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals