зеркало из https://github.com/mozilla/gecko-dev.git
90080 - no restart message appears when switching UI language.
r=jag, sr=hyatt
This commit is contained in:
Родитель
ded51b7a2b
Коммит
dd22c296f8
|
@ -54,3 +54,6 @@ switchskinstitle=Apply Theme
|
|||
# for example, in Japanese build, instead of showing English description
|
||||
# set the following value to false so it won't show up.
|
||||
showskinsdescription=true
|
||||
|
||||
switchlanguage=Preferred language changes will take effect when you restart %S.
|
||||
switchlanguagetitle=Change Preferred Language
|
||||
|
|
|
@ -48,7 +48,6 @@
|
|||
|
||||
function switchUILanguage()
|
||||
{
|
||||
|
||||
var oldLangCode = parent.hPrefWindow.getPref( "localizedstring", "general.useragent.locale");
|
||||
var newLangCode;
|
||||
|
||||
|
@ -70,6 +69,16 @@
|
|||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService);
|
||||
var strbundle = document.getElementById("navigatorBundle");
|
||||
var brandbundle = document.getElementById("brandBundle");
|
||||
|
||||
var dialogTitle = strbundle.getString("switchlanguagetitle");
|
||||
var brandName = brandbundle.getString("brandShortName");
|
||||
var msg = strbundle.getFormattedString("switchlanguage", [brandName]);
|
||||
promptService.alert(window, dialogTitle, msg);
|
||||
|
||||
return true;
|
||||
}
|
||||
]]>
|
||||
|
@ -77,6 +86,9 @@
|
|||
|
||||
<hbox class="box-smallheader" title="&lHeader;"/>
|
||||
|
||||
<stringbundle id="navigatorBundle" src="chrome://navigator/locale/navigator.properties"/>
|
||||
<stringbundle id="brandBundle" src="chrome://global/locale/brand.properties"/>
|
||||
|
||||
<groupbox id="generalStartupPreferences" align="start">
|
||||
<caption label="&onStartLegend.label;"/>
|
||||
<!-- XXX remove when navigator overlays.rdf works -->
|
||||
|
@ -103,9 +115,15 @@
|
|||
|
||||
<separator class="thin" />
|
||||
|
||||
<<<<<<< pref-appearance.xul
|
||||
<menulist id="languageList" class="small-margin"
|
||||
pref="true" preftype="localizedstring"
|
||||
prefstring="general.useragent.locale" prefattribute="value"
|
||||
=======
|
||||
<menulist id="languageList"
|
||||
preftype="localizedstring"
|
||||
prefstring="general.useragent.locale"
|
||||
>>>>>>> 1.45
|
||||
wsm_attributes="value"
|
||||
datasources="rdf:chrome" ref="urn:mozilla:locale:root"
|
||||
sortResource="http://www.mozilla.org/rdf/chrome#name"
|
||||
|
|
Загрузка…
Ссылка в новой задаче