From 9de5516730071de2f84ec0db0917f832affbb8df Mon Sep 17 00:00:00 2001 From: Mark Finkle Date: Tue, 22 Sep 2009 10:21:15 -0400 Subject: [PATCH] [mq]: locales --- mobile/app/mobile.js | 4 +- mobile/chrome/content/browser-ui.js | 3 +- mobile/chrome/content/browser.xul | 63 +++--- mobile/chrome/content/extensions.js | 6 +- mobile/chrome/content/languages.properties | 111 +++++++++++ mobile/chrome/content/preferences.js | 180 ++++++++++++++++++ mobile/chrome/jar.mn | 2 + .../locales/en-US/chrome/browser.properties | 6 +- mobile/locales/en-US/chrome/preferences.dtd | 3 + 9 files changed, 344 insertions(+), 34 deletions(-) create mode 100644 mobile/chrome/content/languages.properties create mode 100644 mobile/chrome/content/preferences.js diff --git a/mobile/app/mobile.js b/mobile/app/mobile.js index 8ecd43dd8aed..04b58652f459 100644 --- a/mobile/app/mobile.js +++ b/mobile/app/mobile.js @@ -310,7 +310,6 @@ pref("privacy.item.sessions", true); pref("privacy.item.geolocation", true); pref("privacy.item.siteSettings", true); - pref("plugins.enabled", true); // URL to the Learn More link XXX this is the firefox one. Bug XXX fixes this. @@ -354,3 +353,6 @@ pref("app.support.baseURL", "http://support.mozilla.com/1/%APP%/%VERSION%/%OS%/% // Name of alternate about: page for certificate errors (when undefined, defaults to about:neterror) pref("security.alternate_certificate_error_page", "certerror"); + +// Inherit OS locale +pref("intl.locale.matchOS", true); diff --git a/mobile/chrome/content/browser-ui.js b/mobile/chrome/content/browser-ui.js index 5ded9866ec1c..1364fbcc8d9c 100644 --- a/mobile/chrome/content/browser-ui.js +++ b/mobile/chrome/content/browser-ui.js @@ -396,6 +396,7 @@ var BrowserUI = { ExtensionsView.init(); DownloadsView.init(); + PreferencesView.init(); }, uninit : function() { @@ -603,7 +604,7 @@ var BrowserUI = { let panelUI = document.getElementById("panel-container"); panelUI.hidden = true; }, - + handleEvent: function (aEvent) { switch (aEvent.type) { // Browser events diff --git a/mobile/chrome/content/browser.xul b/mobile/chrome/content/browser.xul index 2b97d3e00b92..294d7a443890 100644 --- a/mobile/chrome/content/browser.xul +++ b/mobile/chrome/content/browser.xul @@ -74,6 +74,7 @@