mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Checking in for Jungshik Shin. 

Fix for bug 195093. 'modernize'  nsILocale and nsIPlatformCharset.
r=smontagu sr=darin
This commit is contained in:
varga%nixcorp.com 2003-10-30 15:08:48 +00:00
Родитель 3a9888d5b7
Коммит 2e490df717
6 изменённых файлов: 9 добавлений и 9 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
browser/base/content/contentAreaUtils.js
Просмотреть файл

@ -685,7 +685,7 @@ function getStringBundle()
const lsContractID = "@mozilla.org/intl/nslocaleservice;1";
const lsIID = Components.interfaces.nsILocaleService;
const ls = Components.classes[lsContractID].getService(lsIID);
var appLocale = ls.GetApplicationLocale();
var appLocale = ls.getApplicationLocale();
return sbs.createBundle(bundleURL, appLocale);
}

4
browser/components/bookmarks/content/bookmarks.js
Просмотреть файл

@ -1013,9 +1013,9 @@ var BookmarksUtils = {
var BUNDLESVC = Components.classes["@mozilla.org/intl/stringbundle;1"]
.getService(Components.interfaces.nsIStringBundleService);
var bookmarksBundle = "chrome://browser/locale/bookmarks/bookmarks.properties";
this._bundle = BUNDLESVC.createBundle(bookmarksBundle, LOCALESVC.GetApplicationLocale());
this._bundle = BUNDLESVC.createBundle(bookmarksBundle, LOCALESVC.getApplicationLocale());
var brandBundle = "chrome://global/locale/brand.properties";
this._brandShortName = BUNDLESVC.createBundle(brandBundle, LOCALESVC.GetApplicationLocale())
this._brandShortName = BUNDLESVC.createBundle(brandBundle, LOCALESVC.getApplicationLocale())
.GetStringFromName("brandShortName");
}

2
toolkit/content/widgets/browser.xml
Просмотреть файл

@ -283,7 +283,7 @@
var stringBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"]
.getService(Components.interfaces.nsIStringBundleService);
var bundleURL = "chrome://global/locale/tabbrowser.properties";
this._mStrBundle = stringBundleService.createBundle(bundleURL, localeService.GetApplicationLocale());
this._mStrBundle = stringBundleService.createBundle(bundleURL, localeService.getApplicationLocale());
}
return this._mStrBundle;
]]></getter>

2
toolkit/content/widgets/stringbundle.xml
Просмотреть файл

@ -68,7 +68,7 @@
try {
var localeService = Components.classes["@mozilla.org/intl/nslocaleservice;1"]
.getService(Components.interfaces.nsILocaleService);
return localeService.GetApplicationLocale();
return localeService.getApplicationLocale();
}
catch (ex) {
return null;

2
toolkit/content/widgets/wizard.xml
Просмотреть файл

@ -154,7 +154,7 @@
.getService(Components.interfaces.nsILocaleService);
var stringBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"].getService(Components.interfaces.nsIStringBundleService);
var bundleURL = "chrome://global/locale/wizard.properties";
this._bundle = stringBundleService.createBundle(bundleURL, localeService.GetApplicationLocale());
this._bundle = stringBundleService.createBundle(bundleURL, localeService.getApplicationLocale());
// get anonymous content references
this._wizardHeader = document.getAnonymousElementByAttribute(this, "anonid", "Header");

6
toolkit/xre/nsAppRunner.cpp
Просмотреть файл

@ -820,9 +820,9 @@ getUILangCountry(nsAString& aUILang, nsAString& aCountry)
nsCOMPtr<nsILocaleService> localeService = do_GetService(NS_LOCALESERVICE_CONTRACTID, &result);
NS_ASSERTION(NS_SUCCEEDED(result),"getUILangCountry: get locale service failed");
nsXPIDLString uiLang;
result = localeService->GetLocaleComponentForUserAgent(getter_Copies(uiLang));
aUILang = uiLang;
result = localeService->GetLocaleComponentForUserAgent(aUILang);
NS_ASSERTION(NS_SUCCEEDED(result),
"getUILangCountry: get locale componet for user agent failed");
result = getCountry(aUILang, aCountry);
return result;
}