Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

44070: match browser and OS locale. r=alecf,sr=hyatt,a=asa. Match browser

Browse Source 
UI locale and system locale when intl.locale.matchOS == true; Runtime
only behavior; won't  write to disk. Fallback to default chrome locale when
matching langpacks are not installed.
This commit is contained in:
tao%netscape.com 2002-03-31 07:33:57 +00:00
parent 733279d76a
commit de85a936fc
10 changed files with 111 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chrome/public/nsIChromeRegistry.idl
View File

@ -92,6 +92,8 @@ interface nsIChromeRegistry : nsISupports
// Special additional APIs for locales only.
void selectLocaleForProfile(in wstring localeName, in wstring profilePath);
wstring getSelectedLocale(in wstring packageName);
/* runtimeProvider == true: don't assert the runtime change */
void setRuntimeProvider(in boolean runtimeProvider);
/* Installation APIs */
void installSkin(in string baseURL, in boolean useProfile, in boolean allowScripts);

18
chrome/src/nsChromeRegistry.cpp
View File

@ -249,6 +249,7 @@ nsChromeRegistry::nsChromeRegistry()
mUseXBLForms = PR_FALSE;
mBatchInstallFlushes = PR_FALSE;
mRuntimeProvider = PR_FALSE;
nsCOMPtr<nsIPref> prefService(do_GetService(kPrefServiceCID));
if (prefService)
@ -1521,6 +1522,15 @@ NS_IMETHODIMP nsChromeRegistry::SelectLocaleForProfile(const PRUnichar *aLocale,
return SetProvider(nsCAutoString("locale"), mSelectedLocale, aLocale, PR_TRUE, NS_ConvertUCS2toUTF8(aProfilePath).get(), PR_TRUE);
}
/* void setRuntimeProvider (in boolean runtimeProvider); */
// should we inline this one?
NS_IMETHODIMP nsChromeRegistry::SetRuntimeProvider(PRBool runtimeProvider)
{
mRuntimeProvider = runtimeProvider;
return NS_OK;
}
/* wstring getSelectedLocale (); */
NS_IMETHODIMP nsChromeRegistry::GetSelectedLocale(const PRUnichar *aPackageName,
PRUnichar **_retval)
@ -1721,8 +1731,14 @@ nsChromeRegistry::SetProviderForPackage(const nsCString& aProvider,
nsCOMPtr<nsIRDFRemoteDataSource> remote = do_QueryInterface(dataSource, &rv);
if (NS_FAILED(rv)) return rv;
if (!mBatchInstallFlushes)
// add one more check:
// assert the data source only when we are not setting runtime-only provider
if (!mBatchInstallFlushes && !mRuntimeProvider)
rv = remote->Flush();
// always reset the flag
mRuntimeProvider = PR_FALSE;
return rv;
}

1
chrome/src/nsChromeRegistry.h
View File

@ -188,6 +188,7 @@ protected:
PRBool mProfileInitialized;
PRBool mUseXBLForms;
PRBool mRuntimeProvider;
nsCString mProfileRoot;
nsCString mInstallRoot;

1
modules/libpref/src/init/all.js
View File

@ -547,6 +547,7 @@ pref("intl.charsetmenu.browser.cache.size", 5);
pref("intl.charset.detector", "chrome://navigator/locale/navigator.properties");
pref("intl.charset.default", "chrome://navigator-platform/locale/navigator.properties");
pref("intl.content.langcode", "chrome://communicator-region/locale/region.properties");
pref("intl.locale.matchOS", true);
pref("font.language.group", "chrome://navigator/locale/navigator.properties");
// -- folders (Mac: these are binary aliases.)

2
rdf/chrome/public/nsIChromeRegistry.idl
View File

@ -92,6 +92,8 @@ interface nsIChromeRegistry : nsISupports
// Special additional APIs for locales only.
void selectLocaleForProfile(in wstring localeName, in wstring profilePath);
wstring getSelectedLocale(in wstring packageName);
/* runtimeProvider == true: don't assert the runtime change */
void setRuntimeProvider(in boolean runtimeProvider);
/* Installation APIs */
void installSkin(in string baseURL, in boolean useProfile, in boolean allowScripts);

18
rdf/chrome/src/nsChromeRegistry.cpp
View File

@ -249,6 +249,7 @@ nsChromeRegistry::nsChromeRegistry()
mUseXBLForms = PR_FALSE;
mBatchInstallFlushes = PR_FALSE;
mRuntimeProvider = PR_FALSE;
nsCOMPtr<nsIPref> prefService(do_GetService(kPrefServiceCID));
if (prefService)
@ -1521,6 +1522,15 @@ NS_IMETHODIMP nsChromeRegistry::SelectLocaleForProfile(const PRUnichar *aLocale,
return SetProvider(nsCAutoString("locale"), mSelectedLocale, aLocale, PR_TRUE, NS_ConvertUCS2toUTF8(aProfilePath).get(), PR_TRUE);
}
/* void setRuntimeProvider (in boolean runtimeProvider); */
// should we inline this one?
NS_IMETHODIMP nsChromeRegistry::SetRuntimeProvider(PRBool runtimeProvider)
{
mRuntimeProvider = runtimeProvider;
return NS_OK;
}
/* wstring getSelectedLocale (); */
NS_IMETHODIMP nsChromeRegistry::GetSelectedLocale(const PRUnichar *aPackageName,
PRUnichar **_retval)
@ -1721,8 +1731,14 @@ nsChromeRegistry::SetProviderForPackage(const nsCString& aProvider,
nsCOMPtr<nsIRDFRemoteDataSource> remote = do_QueryInterface(dataSource, &rv);
if (NS_FAILED(rv)) return rv;
if (!mBatchInstallFlushes)
// add one more check:
// assert the data source only when we are not setting runtime-only provider
if (!mBatchInstallFlushes && !mRuntimeProvider)
rv = remote->Flush();
// always reset the flag
mRuntimeProvider = PR_FALSE;
return rv;
}

1
rdf/chrome/src/nsChromeRegistry.h
View File

@ -188,6 +188,7 @@ protected:
PRBool mProfileInitialized;
PRBool mUseXBLForms;
PRBool mRuntimeProvider;
nsCString mProfileRoot;
nsCString mInstallRoot;

1
xpfe/bootstrap/Makefile.in
View File

@ -50,6 +50,7 @@ REQUIRES = xpcom \
browser \
docshell \
uconv \
locale \
xremoteservice \
$(NULL)
# for jprof

1
xpfe/bootstrap/makefile.win
View File

@ -43,6 +43,7 @@ REQUIRES = xpcom \
gfx \
intl \
uconv \
locale \
profile \
xpconnect \
$(NULL)

68
xpfe/bootstrap/nsAppRunner.cpp
View File

@ -43,6 +43,7 @@
#include "nsIURI.h"
#include "nsNetUtil.h"
#include "nsIPref.h"
#include "nsILocaleService.h"
#include "plevent.h"
#include "prmem.h"
#include "prnetdb.h"
@ -234,6 +235,7 @@ static nsresult InitializeProfileService(nsICmdLineService *cmdLineArgs);
// Install global locale if possible
static nsresult InstallGlobalLocale(nsICmdLineService *cmdLineArgs);
static nsresult getUILangCountry(nsAString& aUILang, nsAString& aCountry);
class stTSMCloser
{
@ -959,11 +961,59 @@ static nsresult Ensure1Window( nsICmdLineService* cmdLineArgs)
return rv;
}
// match OS locale
static char kMatchOSLocalePref[] = "intl.locale.matchOS";
nsresult
getCountry(const nsAString& lc_name, nsAString& aCountry)
{
nsresult result = NS_OK;
PRInt32 dash = lc_name.FindChar('-');
if (dash > 0)
aCountry = Substring(lc_name, dash+1, lc_name.Length()-dash);
else
result = NS_ERROR_FAILURE;
return result;
}
static nsresult
getUILangCountry(nsAString& aUILang, nsAString& aCountry)
{
nsresult result;
// get a locale service
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 = getCountry(aUILang, aCountry);
return result;
}
// update global locale if possible (in case when user-*.rdf can be updated)
// so that any apps after this can be invoked in the UILocale and contentLocale
static nsresult InstallGlobalLocale(nsICmdLineService *cmdLineArgs)
{
nsresult rv = NS_OK;
// check the pref first
nsCOMPtr<nsIPref> prefService(do_GetService("@mozilla.org/preferences;1"));
PRBool matchOS = PR_FALSE;
if (prefService)
prefService->GetBoolPref(kMatchOSLocalePref, &matchOS);
// match os locale
nsAutoString uiLang;
nsAutoString country;
if (matchOS) {
// compute lang and region code only when needed!
rv = getUILangCountry(uiLang, country);
}
nsXPIDLCString cmdUI;
rv = cmdLineArgs->GetCmdLineValue(UILOCALE_CMD_LINE_ARG, getter_Copies(cmdUI));
if (NS_SUCCEEDED(rv)){
@ -975,6 +1025,15 @@ static nsresult InstallGlobalLocale(nsICmdLineService *cmdLineArgs)
rv = chromeRegistry->SelectLocale(UILocaleName.get(), PR_FALSE);
}
}
// match OS when no cmdline override
if (!cmdUI && matchOS) {
nsCOMPtr<nsIChromeRegistry> chromeRegistry = do_GetService(kChromeRegistryCID, &rv);
if (chromeRegistry) {
chromeRegistry->SetRuntimeProvider(PR_TRUE);
rv = chromeRegistry->SelectLocale(uiLang.get(), PR_FALSE);
}
}
nsXPIDLCString cmdContent;
rv = cmdLineArgs->GetCmdLineValue(CONTENTLOCALE_CMD_LINE_ARG, getter_Copies(cmdContent));
if (NS_SUCCEEDED(rv)){
@ -986,6 +1045,15 @@ static nsresult InstallGlobalLocale(nsICmdLineService *cmdLineArgs)
rv = chromeRegistry->SelectLocale(ContentLocaleName.get(), PR_FALSE);
}
}
// match OS when no cmdline override
if (!cmdContent && matchOS) {
nsCOMPtr<nsIChromeRegistry> chromeRegistry = do_GetService(kChromeRegistryCID, &rv);
if (chromeRegistry) {
chromeRegistry->SetRuntimeProvider(PR_TRUE);
rv = chromeRegistry->SelectLocale(country.get(), PR_FALSE);
}
}
return NS_OK;
}