Bug 972608 - Update feedback charm entry strings. r=sfoster
authorJim Mathies <jmathies@mozilla.com>
Sat, 15 Feb 2014 07:06:26 -0600
changeset 169282 aaa3019c7653b038a45dbd098be4ffc34f4eda04
parent 169281 f79959add4b3f5ba337e33ce2a24b17ee3bc36c3
child 169283 fbcd1f3a17031475eaebe315defe0794bb1c4d39
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
reviewerssfoster
bugs972608
milestone30.0a1
Bug 972608 - Update feedback charm entry strings. r=sfoster
browser/metro/base/content/browser.xul
browser/metro/base/content/flyoutpanels/SettingsCharm.js
browser/metro/locales/en-US/chrome/browser.properties
browser/metro/locales/jar.mn
browser/metro/profile/metro.js
--- a/browser/metro/base/content/browser.xul
+++ b/browser/metro/base/content/browser.xul
@@ -1381,11 +1381,9 @@ Desktop browser's sync prefs.
       <vbox id="autofill-popup"
             class="menu-popup">
         <richlistbox id="menupopup-commands"
                      onclick="if (event.target != this) AutofillMenuUI.selectByIndex(this.selectedIndex);"
                      flex="1"/>
       </vbox>
     </box>
   </stack>
-  <!-- XXX: Expose feedback string to SettingsCharm.js -->
-  <label value="&helpFeedbackPage.label;" id="feedback-label" href="https://input.mozilla.org/feedback/metrofirefox" hidden="true"/>
 </window>
--- a/browser/metro/base/content/flyoutpanels/SettingsCharm.js
+++ b/browser/metro/base/content/flyoutpanels/SettingsCharm.js
@@ -49,21 +49,19 @@ var SettingsCharm = {
     // About
     this.addEntry({
         label: Strings.browser.GetStringFromName("aboutCharm1"),
         onselected: function() FlyoutPanelsUI.show('AboutFlyoutPanel')
     });
 
     // Feedback
     this.addEntry({
-        // feedbackLabel is a temporary measure to expose this string
-        // from the baseMenuOverlay.dtd
-        label: Elements.feedbackLabel.value,
+        label: Strings.browser.GetStringFromName("feedbackCharm"),
         onselected: function() {
-          let url = Elements.feedbackLabel.getAttribute("href");
+          let url = Services.urlFormatter.formatURLPref("app.support.inputURL");
           BrowserUI.addAndShowTab(url, Browser.selectedTab);
         }
     });
 
     // Help
     this.addEntry({
         label: Strings.browser.GetStringFromName("helpOnlineCharm"),
         onselected: function() {
--- a/browser/metro/locales/en-US/chrome/browser.properties
+++ b/browser/metro/locales/en-US/chrome/browser.properties
@@ -41,16 +41,17 @@ clearPrivateData.clearButton=Clear
 clearPrivateData.title2=Clear private data
 # LOCALIZATION NOTE (clearPrivateData.message3): "Options" is the optionsCharm.
 clearPrivateData.message3=This will permanently delete the private data you have selected in "Options".
 
 # Settings Charms
 aboutCharm1=About
 optionsCharm=Options
 searchCharm=Search
+feedbackCharm=Feedback (online)
 helpOnlineCharm=Help (online)
 
 # General
 # LOCALIZATION NOTE (browserForSaveLocation): Title for the "Save..." file picker dialog
 browserForSaveLocation=Save Location
 # LOCALIZATION NOTE (browserForSaveLocation): Title for the "Open..." file picker dialog
 browserForOpenLocation=Open Location
 
--- a/browser/metro/locales/jar.mn
+++ b/browser/metro/locales/jar.mn
@@ -34,14 +34,12 @@
 
 #
 # Browser jar resources
 #
 
 @AB_CD@.jar:
 relativesrcdir browser/locales:
   locale/browser/syncBrand.dtd            (%chrome/browser/syncBrand.dtd)
-# Temporary hack to provide a 'feedback' string
-  locale/browser/baseMenuOverlay.dtd      (%chrome/browser/baseMenuOverlay.dtd)
   locale/browser/netError.dtd             (%chrome/overrides/netError.dtd)
 % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd
   locale/browser/appstrings.properties    (%chrome/overrides/appstrings.properties)
 % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties
--- a/browser/metro/profile/metro.js
+++ b/browser/metro/profile/metro.js
@@ -429,16 +429,17 @@ pref("dom.ipc.plugins.enabled", true);
 pref("dom.ipc.content.nice", 1);
 
 // product URLs
 // The breakpad report server to link to in about:crashes
 pref("breakpad.reportURL", "https://crash-stats.mozilla.com/report/index/");
 // TODO: This is not the correct article for metro!!!
 pref("app.sync.tutorialURL", "https://support.mozilla.org/kb/sync-firefox-between-desktop-and-mobile");
 pref("app.support.baseURL", "https://support.mozilla.org/1/touch/%VERSION%/%OS%/%LOCALE%/");
+pref("app.support.inputURL", "https://input.mozilla.org/feedback/metrofirefox");
 pref("app.privacyURL", "http://www.mozilla.org/%LOCALE%/legal/privacy/firefox.html");
 pref("app.creditsURL", "http://www.mozilla.org/credits/");
 pref("app.channelURL", "http://www.mozilla.org/%LOCALE%/firefox/channel/");
 
 // Name of alternate about: page for certificate errors (when undefined, defaults to about:neterror)
 pref("security.alternate_certificate_error_page", "certerror");
 
 pref("security.warn_viewing_mixed", false); // Warning is disabled.  See Bug 616712.