From c8bbe85af8dd15fe891a087ebe8cc61d30a14294 Mon Sep 17 00:00:00 2001 From: Margaret Leibovic Date: Fri, 27 Feb 2015 11:29:18 -0800 Subject: [PATCH] Bug 1136716 - Consolidate reader view strings in one .properties file, and make the strings to close reader view consistent. r=bnicholson,Unfocused --HG-- extra : rebase_source : e50c9c99a919a660fb064fc452c0cee62a04ee43 --- browser/locales/en-US/chrome/browser/readerMode.properties | 6 ------ browser/locales/jar.mn | 1 - browser/modules/ReaderParent.jsm | 4 ++-- mobile/android/chrome/content/Reader.js | 4 ++-- mobile/android/chrome/content/browser.js | 1 + mobile/android/locales/en-US/chrome/browser.properties | 4 ---- toolkit/locales/en-US/chrome/global/aboutReader.properties | 4 ++++ 7 files changed, 9 insertions(+), 15 deletions(-) delete mode 100644 browser/locales/en-US/chrome/browser/readerMode.properties diff --git a/browser/locales/en-US/chrome/browser/readerMode.properties b/browser/locales/en-US/chrome/browser/readerMode.properties deleted file mode 100644 index 2d7028818b5c..000000000000 --- a/browser/locales/en-US/chrome/browser/readerMode.properties +++ /dev/null @@ -1,6 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -readerView.enter=Enter Reader View -readerView.exit=Exit Reader View diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn index b12d5cc5907b..03a8cdf7ca4c 100644 --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn @@ -139,7 +139,6 @@ locale/browser/preferences/tabs.dtd (%chrome/browser/preferences/tabs.dtd) locale/browser/preferences/search.dtd (%chrome/browser/preferences/search.dtd) locale/browser/preferences/translation.dtd (%chrome/browser/preferences/translation.dtd) - locale/browser/readerMode.properties (%chrome/browser/readerMode.properties) #ifdef MOZ_SERVICES_SYNC locale/browser/syncBrand.dtd (%chrome/browser/syncBrand.dtd) locale/browser/syncSetup.dtd (%chrome/browser/syncSetup.dtd) diff --git a/browser/modules/ReaderParent.jsm b/browser/modules/ReaderParent.jsm index 12fa092e24b7..6bb2db0a0e93 100644 --- a/browser/modules/ReaderParent.jsm +++ b/browser/modules/ReaderParent.jsm @@ -15,7 +15,7 @@ Cu.import("resource://gre/modules/Task.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "ReaderMode", "resource://gre/modules/ReaderMode.jsm"); -const gStringBundle = Services.strings.createBundle("chrome://browser/locale/readerMode.properties"); +const gStringBundle = Services.strings.createBundle("chrome://global/locale/aboutReader.properties"); let ReaderParent = { @@ -107,7 +107,7 @@ let ReaderParent = { if (browser.currentURI.spec.startsWith("about:reader")) { button.setAttribute("readeractive", true); button.hidden = false; - button.setAttribute("tooltiptext", gStringBundle.GetStringFromName("readerView.exit")); + button.setAttribute("tooltiptext", gStringBundle.GetStringFromName("readerView.close")); } else { button.removeAttribute("readeractive"); button.setAttribute("tooltiptext", gStringBundle.GetStringFromName("readerView.enter")); diff --git a/mobile/android/chrome/content/Reader.js b/mobile/android/chrome/content/Reader.js index 86827966b602..d4a2413857b2 100644 --- a/mobile/android/chrome/content/Reader.js +++ b/mobile/android/chrome/content/Reader.js @@ -171,7 +171,7 @@ let Reader = { let browser = tab.browser; if (browser.currentURI.spec.startsWith("about:reader")) { this.pageAction.id = PageActions.add({ - title: Strings.browser.GetStringFromName("readerView.exit"), + title: Strings.reader.GetStringFromName("readerView.close"), icon: "drawable://reader_active", clickCallback: () => this.pageAction.readerModeCallback(tab.id), important: true @@ -188,7 +188,7 @@ let Reader = { if (browser.isArticle) { this.pageAction.id = PageActions.add({ - title: Strings.browser.GetStringFromName("readerView.enter"), + title: Strings.reader.GetStringFromName("readerView.enter"), icon: "drawable://reader", clickCallback: () => this.pageAction.readerModeCallback(tab.id), longClickCallback: () => this.pageAction.readerModeActiveCallback(tab.id), diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index 2a917c528e19..5b92284a1e22 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -323,6 +323,7 @@ let Strings = { init: function () { XPCOMUtils.defineLazyGetter(Strings, "brand", () => Services.strings.createBundle("chrome://branding/locale/brand.properties")); XPCOMUtils.defineLazyGetter(Strings, "browser", () => Services.strings.createBundle("chrome://browser/locale/browser.properties")); + XPCOMUtils.defineLazyGetter(Strings, "reader", () => Services.strings.createBundle("chrome://global/locale/aboutReader.properties")); }, flush: function () { diff --git a/mobile/android/locales/en-US/chrome/browser.properties b/mobile/android/locales/en-US/chrome/browser.properties index 7e80a51e9138..f91856c4bf27 100644 --- a/mobile/android/locales/en-US/chrome/browser.properties +++ b/mobile/android/locales/en-US/chrome/browser.properties @@ -361,10 +361,6 @@ getUserMedia.sharingCamera.message2 = Camera is on getUserMedia.sharingMicrophone.message2 = Microphone is on getUserMedia.sharingCameraAndMicrophone.message2 = Camera and microphone are on -#Reader view -readerView.enter = Enter Reader View -readerView.exit = Exit Reader View - # LOCALIZATION NOTE (readerMode.toolbarTip): # Tip shown to users the first time we hide the reader mode toolbar. readerMode.toolbarTip=Tap the screen to show reader options diff --git a/toolkit/locales/en-US/chrome/global/aboutReader.properties b/toolkit/locales/en-US/chrome/global/aboutReader.properties index 4fb832818b73..98ca9609c70d 100644 --- a/toolkit/locales/en-US/chrome/global/aboutReader.properties +++ b/toolkit/locales/en-US/chrome/global/aboutReader.properties @@ -27,3 +27,7 @@ aboutReader.toolbar.closeReadingList=Close Reading List aboutReader.toolbar.share=Share aboutReader.footer.deleteThisArticle=Delete this article + +# Reader View toolbar button +readerView.enter=Enter Reader View +readerView.close=Close Reader View