Bug 1164407 - Pocket not enabled on ja builds under Mac OS X. r=adw

browser/app/profile/firefox.js

@@ -1920,4 +1920,4 @@ pref("browser.pocket.api", "api.getpocket.com");
 pref("browser.pocket.site", "getpocket.com");
 pref("browser.pocket.oAuthConsumerKey", "40249-e88c401e1b1f2242d9e441c4");
 pref("browser.pocket.useLocaleList", true);
-pref("browser.pocket.enabledLocales", "en-US de es-ES ja ru");
+pref("browser.pocket.enabledLocales", "en-US de es-ES ja ja-JP-mac ru");

browser/base/content/browser-places.js

@@ -1572,6 +1572,8 @@ let BookmarkingUI = {
                    getService(Ci.nsIXULChromeRegistry).
                    getSelectedLocale("browser");
       if (locale != "en-US") {
+        if (locale == "ja-JP-mac")
+          locale = "ja";
         let url = "chrome://browser/content/browser-pocket-" + locale + ".properties";
         let bundle = Services.strings.createBundle(url);
         let item = document.getElementById(prefix + "pocket");

browser/base/content/nsContextMenu.js

@@ -191,6 +191,8 @@ nsContextMenu.prototype = {
                      getService(Ci.nsIXULChromeRegistry).
                      getSelectedLocale("browser");
         if (locale != "en-US") {
+          if (locale == "ja-JP-mac")
+            locale = "ja";
           let url = "chrome://browser/content/browser-pocket-" + locale + ".properties";
           let bundle = Services.strings.createBundle(url);
           let item = document.getElementById("context-pocket");

browser/components/customizableui/CustomizableWidgets.jsm

@@ -1080,6 +1080,8 @@ if (Services.prefs.getBoolPref("browser.pocket.enabled")) {
   }
 
   if (isEnabledForLocale) {
+    if (browserLocale == "ja-JP-mac")
+      browserLocale = "ja";
     let url = "chrome://browser/content/browser-pocket-" + browserLocale + ".properties";
     let strings = Services.strings.createBundle(url);
     let label;