From 24c8c2e10761f8a392bacfee0b142f15deb98c6a Mon Sep 17 00:00:00 2001
From: Jim Mathies <jmathies@mozilla.com>
Date: Sat, 15 Feb 2014 07:06:26 -0600
Subject: [PATCH] Bug 972608 - Update feedback charm entry strings. r=sfoster

---
 browser/metro/base/content/browser.xul                   | 2 --
 browser/metro/base/content/flyoutpanels/SettingsCharm.js | 6 ++----
 browser/metro/locales/en-US/chrome/browser.properties    | 1 +
 browser/metro/locales/jar.mn                             | 2 --
 browser/metro/profile/metro.js                           | 1 +
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/browser/metro/base/content/browser.xul b/browser/metro/base/content/browser.xul
index a6dacf27e9c9..92cdab6a4ae3 100644
--- a/browser/metro/base/content/browser.xul
+++ b/browser/metro/base/content/browser.xul
@@ -1386,6 +1386,4 @@ Desktop browser's sync prefs.
       </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>
diff --git a/browser/metro/base/content/flyoutpanels/SettingsCharm.js b/browser/metro/base/content/flyoutpanels/SettingsCharm.js
index a0f31f6e2fff..829f5a99a254 100644
--- a/browser/metro/base/content/flyoutpanels/SettingsCharm.js
+++ b/browser/metro/base/content/flyoutpanels/SettingsCharm.js
@@ -54,11 +54,9 @@ var SettingsCharm = {
 
     // 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);
         }
     });
diff --git a/browser/metro/locales/en-US/chrome/browser.properties b/browser/metro/locales/en-US/chrome/browser.properties
index 4f1d1cd0e122..27f5a3e385a6 100644
--- a/browser/metro/locales/en-US/chrome/browser.properties
+++ b/browser/metro/locales/en-US/chrome/browser.properties
@@ -46,6 +46,7 @@ clearPrivateData.message3=This will permanently delete the private data you have
 aboutCharm1=About
 optionsCharm=Options
 searchCharm=Search
+feedbackCharm=Feedback (online)
 helpOnlineCharm=Help (online)
 
 # General
diff --git a/browser/metro/locales/jar.mn b/browser/metro/locales/jar.mn
index b7ecf68d0dc2..250e5d6a1abf 100644
--- a/browser/metro/locales/jar.mn
+++ b/browser/metro/locales/jar.mn
@@ -39,8 +39,6 @@
 @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)
diff --git a/browser/metro/profile/metro.js b/browser/metro/profile/metro.js
index ccfc72dceeff..77c682508a11 100644
--- a/browser/metro/profile/metro.js
+++ b/browser/metro/profile/metro.js
@@ -434,6 +434,7 @@ 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/");