Bug 1193200, undue string changes from previous push, a=rkent
authorR Kent James <rkent@caspia.com>
Wed, 07 Oct 2015 13:05:00 -0700
changeset 26393 27787d7bf72a9f36832491b7b6521ff27f7d1ab0
parent 26392 a3e5dfc44beb9c3c3237d00e46791ac96c5dc013
child 26394 b7780e495c67fd9b6b49e39154506721e39e72fa
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrkent
bugs1193200
Bug 1193200, undue string changes from previous push, a=rkent
mail/components/preferences/cookies.js
mail/components/preferences/permissions.js
mail/locales/en-US/chrome/messenger/preferences/preferences.properties
--- a/mail/components/preferences/cookies.js
+++ b/mail/components/preferences/cookies.js
@@ -509,17 +509,17 @@ var gCookiesWindow = {
                                      this._ds.timeFormatSeconds,
                                      date.getFullYear(),
                                      date.getMonth() + 1,
                                      date.getDate(),
                                      date.getHours(),
                                      date.getMinutes(),
                                      date.getSeconds());
     }
-    return this._bundle.getString("expireAtEndOfSession");
+    return this._bundle.getString("AtEndOfSession");
   },
 
   _updateCookieData: function (aItem)
   {
     var seln = this._view.selection;
     var ids = ["name", "value", "host", "path", "isSecure", "expires"];
     var properties;
 
--- a/mail/components/preferences/permissions.js
+++ b/mail/components/preferences/permissions.js
@@ -70,19 +70,21 @@ var gPermissionManager = {
     var stringKey = null;
     switch (aCapability) {
     case nsIPermissionManager.ALLOW_ACTION:
       stringKey = "can";
       break;
     case nsIPermissionManager.DENY_ACTION:
       stringKey = "cannot";
       break;
-    case nsICookiePermission.ACCESS_ALLOW_FIRST_PARTY_ONLY:
-      stringKey = "canAccessFirstParty";
-      break;
+    // This condition is really hard to reach, I don't believe it
+    // can be set with the current mail UI.
+    //case nsICookiePermission.ACCESS_ALLOW_FIRST_PARTY_ONLY:
+    //  stringKey = "canAccessFirstParty";
+    //  break;
     case nsICookiePermission.ACCESS_SESSION:
       stringKey = "canSession";
       break;
     }
     return this._bundle.getString(stringKey);
   },
 
   addPermission: function (aCapability)
--- a/mail/locales/en-US/chrome/messenger/preferences/preferences.properties
+++ b/mail/locales/en-US/chrome/messenger/preferences/preferences.properties
@@ -78,19 +78,18 @@ cookiepermissionstext=You can specify wh
 invalidURI=Please enter a valid hostname
 invalidURITitle=Invalid Hostname Entered
 
 #### Cookie Viewer
 hostColon=Host:
 domainColon=Domain:
 forSecureOnly=Encrypted connections only
 forAnyConnection=Any type of connection
-expireAtEndOfSession=At end of session
+AtEndOfSession=at end of session
 can=Allow
-canAccessFirstParty=Allow first party only
 canSession=Allow for Session
 cannot=Block
 noCookieSelected=<no cookie selected>
 cookiesAll=The following cookies are stored on your computer:
 cookiesFiltered=The following cookies match your search:
 removeCookies=Remove Cookies
 removeCookie=Remove Cookie