Bug 133764. Unable to change content pack and language pack at once. Patch by kairo@kairo.at, r=dbragg, sr=alecf, a=asa.

This commit is contained in:
caillon%returnzero.com 2002-04-13 22:48:28 +00:00
Родитель 89dfe33cad
Коммит dc1791db5e
1 изменённых файлов: 1 добавлений и 15 удалений

Просмотреть файл

@ -30,12 +30,6 @@
onload="parent.initPanel('chrome://content-packs/content/pref-contentpacks.xul'); " onload="parent.initPanel('chrome://content-packs/content/pref-contentpacks.xul'); "
headertitle="&lHeader;"> headertitle="&lHeader;">
<stringbundle id="bundle_contentPack"
src="chrome://content-packs/locale/contentpacks.properties"/>
<stringbundle id="bundle_brand"
src="chrome://global/locale/brand.properties"/>
<script type="application/x-javascript"> <script type="application/x-javascript">
<![CDATA[ <![CDATA[
var _elementIDs = ["contentPackList", "languagePackList"]; var _elementIDs = ["contentPackList", "languagePackList"];
@ -94,21 +88,13 @@
chromeRegistry.selectLocale(newContentPack, true); chromeRegistry.selectLocale(newContentPack, true);
var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService); var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
observerService.notifyObservers(null, "locale-selected", null); observerService.notifyObservers(null, "locale-selected", null);
var contentBundle = document.getElementById("bundle_contentPack");
var brandBundle = document.getElementById("bundle_brand");
var alertText = contentBundle.getString("contentAlert");
alertText = alertText.replace(/%brand%/g, brandBundle.getString("brandShortName"));
var titleText = contentBundle.GetStringFromName("languageTitle");
var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService();
promptService = promptService.QueryInterface(Components.interfaces.nsIPromptService);
promptService.alert(window, titleText, alertText);
} }
catch(e) { catch(e) {
return false; return false;
} }
} }
///Switch the Language pack if necessary //Switch the Language pack if necessary
var oldLanguagePack = parent.hPrefWindow.getPref( "localizedstring", "general.useragent.locale"); var oldLanguagePack = parent.hPrefWindow.getPref( "localizedstring", "general.useragent.locale");
var newLanguagePack; var newLanguagePack;