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

@@ -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

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)

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"));

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),

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 () {

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

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