From 55bcb77a362c285aecd49396af9ab7e49808188a Mon Sep 17 00:00:00 2001 From: Gijs Kruitbosch Date: Tue, 12 May 2015 18:21:08 +0100 Subject: [PATCH] Bug 1164410 - fix l10n use in pocket, r=jaws a=dolske --- browser/base/content/baseMenuOverlay.xul | 1 - browser/base/content/browser-places.js | 20 +++++++++-------- ...erties => browser-pocket-en-US.properties} | 0 browser/base/content/nsContextMenu.js | 22 ++++++++++--------- browser/base/jar.mn | 2 +- .../customizableui/CustomizableWidgets.jsm | 2 +- 6 files changed, 25 insertions(+), 22 deletions(-) rename browser/base/content/{browser-pocket.properties => browser-pocket-en-US.properties} (100%) diff --git a/browser/base/content/baseMenuOverlay.xul b/browser/base/content/baseMenuOverlay.xul index f9613458ed03..4ee2ddf7c63f 100644 --- a/browser/base/content/baseMenuOverlay.xul +++ b/browser/base/content/baseMenuOverlay.xul @@ -112,6 +112,5 @@ - diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js index 098c6c6a5f7f..c8b8475eb7c2 100644 --- a/browser/base/content/browser-places.js +++ b/browser/base/content/browser-places.js @@ -1436,15 +1436,17 @@ let BookmarkingUI = { let locale = Cc["@mozilla.org/chrome/chrome-registry;1"]. getService(Ci.nsIXULChromeRegistry). getSelectedLocale("browser"); - let url = "chrome://browser/content/browser-pocket-" + locale + ".properties"; - let bundle = Services.strings.createBundle(url); - let item = document.getElementById(prefix + "pocket"); - try { - item.setAttribute("label", bundle.GetStringFromName("pocketMenuitem.label")); - } catch (err) { - // GetStringFromName throws when the bundle doesn't exist. In that - // case, the item will retain the browser-pocket.dtd en-US string that - // it has in the markup. + if (locale != "en-US") { + let url = "chrome://browser/content/browser-pocket-" + locale + ".properties"; + let bundle = Services.strings.createBundle(url); + let item = document.getElementById(prefix + "pocket"); + try { + item.setAttribute("label", bundle.GetStringFromName("pocketMenuitem.label")); + } catch (err) { + // GetStringFromName throws when the bundle doesn't exist. In that + // case, the item will retain the browser-pocket.dtd en-US string that + // it has in the markup. + } } } document.getElementById(prefix + "pocket").hidden = hidden; diff --git a/browser/base/content/browser-pocket.properties b/browser/base/content/browser-pocket-en-US.properties similarity index 100% rename from browser/base/content/browser-pocket.properties rename to browser/base/content/browser-pocket-en-US.properties diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js index f4ef3bb297f3..748c19b942a9 100644 --- a/browser/base/content/nsContextMenu.js +++ b/browser/base/content/nsContextMenu.js @@ -241,16 +241,18 @@ nsContextMenu.prototype = { let locale = Cc["@mozilla.org/chrome/chrome-registry;1"]. getService(Ci.nsIXULChromeRegistry). getSelectedLocale("browser"); - let url = "chrome://browser/content/browser-pocket-" + locale + ".properties"; - let bundle = Services.strings.createBundle(url); - let item = document.getElementById("context-pocket"); - try { - item.setAttribute("label", bundle.GetStringFromName("saveToPocketCmd.label")); - item.setAttribute("accesskey", bundle.GetStringFromName("saveToPocketCmd.accesskey")); - } catch (err) { - // GetStringFromName throws when the bundle doesn't exist. In that - // case, the item will retain the browser-pocket.dtd en-US string that - // it has in the markup. + if (locale != "en-US") { + let url = "chrome://browser/content/browser-pocket-" + locale + ".properties"; + let bundle = Services.strings.createBundle(url); + let item = document.getElementById("context-pocket"); + try { + item.setAttribute("label", bundle.GetStringFromName("saveToPocketCmd.label")); + item.setAttribute("accesskey", bundle.GetStringFromName("saveToPocketCmd.accesskey")); + } catch (err) { + // GetStringFromName throws when the bundle doesn't exist. In that + // case, the item will retain the browser-pocket.dtd en-US string that + // it has in the markup. + } } } } diff --git a/browser/base/jar.mn b/browser/base/jar.mn index 7954dd3a1093..7dd96a31c5d2 100644 --- a/browser/base/jar.mn +++ b/browser/base/jar.mn @@ -75,7 +75,7 @@ browser.jar: * content/browser/browser.css (content/browser.css) * content/browser/browser.js (content/browser.js) * content/browser/browser.xul (content/browser.xul) - content/browser/browser-pocket.properties (content/browser-pocket.properties) + content/browser/browser-pocket-en-US.properties (content/browser-pocket-en-US.properties) content/browser/browser-pocket.dtd (content/browser-pocket.dtd) content/browser/browser-pocket-de.properties (content/browser-pocket-de.properties) content/browser/browser-pocket-es-ES.properties (content/browser-pocket-es-ES.properties) diff --git a/browser/components/customizableui/CustomizableWidgets.jsm b/browser/components/customizableui/CustomizableWidgets.jsm index 875555b81674..518ac00f59fb 100644 --- a/browser/components/customizableui/CustomizableWidgets.jsm +++ b/browser/components/customizableui/CustomizableWidgets.jsm @@ -1088,7 +1088,7 @@ if (Services.prefs.getBoolPref("browser.pocket.enabled")) { } catch (err) { // GetStringFromName throws when the bundle doesn't exist. In that case, // fall back to the en-US browser-pocket.properties. - url = "chrome://browser/content/browser-pocket.properties"; + url = "chrome://browser/content/browser-pocket-en-US.properties"; strings = Services.strings.createBundle(url); label = strings.GetStringFromName("pocket-button.label"); tooltiptext = strings.GetStringFromName("pocket-button.tooltiptext");