wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 669154 - Dont open locale picker window if the system locale is available. r=mfinkle

Browse Source
This commit is contained in:
Wes Johnston 2011-07-12 10:25:35 -07:00
parent 86f8bb179c
commit 6fff2d84cf
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mobile/chrome/content/localePicker.js
View File

@ -317,16 +317,11 @@ function localesMatch(aLocale1, aLocale2) {
function start() {
let mouseModule = new MouseModule();
// if we have gotten this far, we can assume that we don't have anything matching the system
// locale and we should show the locale picker
let chrome = Cc["@mozilla.org/chrome/chrome-registry;1"].getService(Ci.nsIXULChromeRegistry);
chrome.QueryInterface(Ci.nsIToolkitChromeRegistry);
let availableLocales = chrome.getLocalesForPackage("browser");
let localeService = Cc["@mozilla.org/intl/nslocaleservice;1"].getService(Ci.nsILocaleService);
let systemLocale = localeService.getSystemLocale().getCategory("NSILOCALE_CTYPE");
let matchingLocale = "";
let bestMatch = NO_MATCH;
let strings = Services.strings.createBundle("chrome://browser/content/languages.properties");
LocaleUI.availableLocales = [];
while (availableLocales.hasMore()) {
@ -336,24 +331,10 @@ function start() {
try { label = strings.GetStringFromName(locale); }
catch (e) { }
LocaleUI.availableLocales.push({addon: { id: locale, name: label, targetLocale: locale }});
// see if we have a locale that looks like the system locale
// if it is not the current locale, switch to it
let match = localesMatch(systemLocale, locale);
if (match > bestMatch) {
bestMatch = match;
matchingLocale = locale;
}
}
if (matchingLocale) {
if (matchingLocale != chrome.getSelectedLocale("browser"))
LocaleUI.language = matchingLocale;
LocaleUI.closeWindow();
} else {
LocaleUI._language = chrome.getSelectedLocale("browser");
LocaleUI.updateStrings();
}
LocaleUI._language = chrome.getSelectedLocale("browser");
LocaleUI.updateStrings();
// update the page strings and show the correct page
LocaleUI.defaultLanguage = LocaleUI._language;

20
mobile/components/BrowserCLH.js
View File

@ -118,6 +118,23 @@ function showPanelWhenReady(aWindow, aPage) {
}, false);
}
function haveSystemLocale() {
let chrome = Cc["@mozilla.org/chrome/chrome-registry;1"].getService(Ci.nsIXULChromeRegistry);
chrome.QueryInterface(Ci.nsIToolkitChromeRegistry);
let availableLocales = chrome.getLocalesForPackage("browser");
let localeService = Cc["@mozilla.org/intl/nslocaleservice;1"].getService(Ci.nsILocaleService);
let systemLocale = localeService.getSystemLocale().getCategory("NSILOCALE_CTYPE");
systemLocale = systemLocale.split("-")[0];
let systemLocaleRegEx = new RegExp("^" + systemLocale);
while (availableLocales.hasMore()) {
let locale = availableLocales.getNext();
if (systemLocaleRegEx.test(locale))
return true;
}
return false;
}
function BrowserCLH() { }
@ -211,7 +228,8 @@ BrowserCLH.prototype = {
}
// Show the locale selector if we have a new profile
if (needHomepageOverride() == "new profile" && Services.prefs.getBoolPref("browser.firstrun.show.localepicker")) {
if (needHomepageOverride() == "new profile" && Services.prefs.getBoolPref("browser.firstrun.show.localepicker") && !haveSystemLocale()) {
browserWin = openWindow(null, "chrome://browser/content/localePicker.xul", "_blank", "chrome,dialog=no,all", defaultURL);
aCmdLine.preventDefault = true;
return;