зеркало из https://github.com/mozilla/gecko-dev.git
Bug 688824 - Only show restart notification when locale changes. r=mfinkle
This commit is contained in:
Родитель
9295f6a3a8
Коммит
57184c3691
|
@ -104,11 +104,17 @@ var PreferencesView = {
|
||||||
WeaveGlue.init();
|
WeaveGlue.init();
|
||||||
|
|
||||||
Services.prefs.addObserver("general.useragent.locale", this, false);
|
Services.prefs.addObserver("general.useragent.locale", this, false);
|
||||||
|
let chrome = Cc["@mozilla.org/chrome/chrome-registry;1"].getService(Ci.nsIXULChromeRegistry);
|
||||||
|
chrome.QueryInterface(Ci.nsIToolkitChromeRegistry);
|
||||||
|
this._currentLocale = chrome.getSelectedLocale("browser");
|
||||||
},
|
},
|
||||||
|
|
||||||
observe: function(aSubject, aTopic, aData) {
|
observe: function(aSubject, aTopic, aData) {
|
||||||
if (aData == "general.useragent.locale") {
|
if (aData == "general.useragent.locale") {
|
||||||
this.showRestart();
|
if (Services.prefs.getCharPref("general.useragent.locale") != this._currentLocale)
|
||||||
|
this.showRestart();
|
||||||
|
else
|
||||||
|
this.hideRestart();
|
||||||
this._loadLocales();
|
this._loadLocales();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -140,7 +146,6 @@ var PreferencesView = {
|
||||||
}
|
}
|
||||||
if (locale == selectedLocale) {
|
if (locale == selectedLocale) {
|
||||||
selectedLabel = label;
|
selectedLabel = label;
|
||||||
this._currentLocale = locale;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче