Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 08:12:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 972608 - Update feedback charm entry strings. r=sfoster

Browse Source
This commit is contained in:
Jim Mathies 2014-02-15 07:06:26 -06:00
parent 2ae37b022e
commit 24c8c2e107
5 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/metro/base/content/browser.xul
View File

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

6
browser/metro/base/content/flyoutpanels/SettingsCharm.js
View File

@ -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);
}
});

1
browser/metro/locales/en-US/chrome/browser.properties
View File

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

2
browser/metro/locales/jar.mn
View File

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

1
browser/metro/profile/metro.js
View File

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