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

Fixed bug #3903 (Need region code for Macintosh GetPlatformLocale) and bug #11189 (Locale service was returning wrong locale for scriptability)

This commit is contained in:
tague%netscape.com 1999-08-09 03:59:32 +00:00
Родитель fe1e77f9bd
Коммит 907c28f7c2
6 изменённых файлов: 122 добавлений и 22 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
intl/locale/public/nsIMacLocale.h
Просмотреть файл

@ -35,8 +35,8 @@ class nsIMacLocale : public nsISupports {
public:
NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMACLOCALE_IID)
NS_IMETHOD GetPlatformLocale(const nsString* locale,short* scriptCode,short* langCode) = 0;
NS_IMETHOD GetXPLocale(short scriptCode,short langCode, nsString* locale) = 0;
NS_IMETHOD GetPlatformLocale(const nsString* locale,short* scriptCode,short* langCode, short* regionCode) = 0;
NS_IMETHOD GetXPLocale(short scriptCode,short langCode, short regionCode, nsString* locale) = 0;
};

6
intl/locale/src/mac/nsCollationMac.cpp
Просмотреть файл

@ -132,7 +132,7 @@ nsresult nsCollationMac::Initialize(nsILocale* locale)
m_scriptcode = 0; //smRoman
mCharset.SetString("ISO-8859-1"); //TODO: should be "MacRoman"
if (locale != nsnull) {
const PRUnichar *aLocaleUnichar;
PRUnichar *aLocaleUnichar;
nsString aLocale;
nsString aCategory("NSILOCALE_COLLATE");
nsresult res = locale->GetCategory(aCategory.GetUnicode(), &aLocaleUnichar);
@ -141,10 +141,10 @@ nsresult nsCollationMac::Initialize(nsILocale* locale)
//TODO: Get a charset name from a script code.
nsIMacLocale* macLocale = nsnull;
short scriptcode, langcode;
short scriptcode, langcode, regioncode;
res = nsComponentManager::CreateInstance(kMacLocaleFactoryCID, NULL, kIMacLocaleIID, (void**)&macLocale);
if (NS_SUCCEEDED(res) && nsnull != macLocale) {
if (NS_SUCCEEDED(res = macLocale->GetPlatformLocale(&aLocale, &scriptcode, &langcode))) {
if (NS_SUCCEEDED(res = macLocale->GetPlatformLocale(&aLocale, &scriptcode, &langcode, &regioncode))) {
m_scriptcode = scriptcode;
}
macLocale->Release();

6
intl/locale/src/mac/nsDateTimeFormatMac.cpp
Просмотреть файл

@ -262,7 +262,7 @@ nsresult nsDateTimeFormatMac::FormatTMTime(nsILocale* locale,
// Get a script code and a charset name
if (locale != nsnull) {
const PRUnichar *aLocaleUnichar;
PRUnichar *aLocaleUnichar;
nsString aLocale;
nsString aCategory("NSILOCALE_TIME");
res = locale->GetCategory(aCategory.GetUnicode(), &aLocaleUnichar);
@ -270,10 +270,10 @@ nsresult nsDateTimeFormatMac::FormatTMTime(nsILocale* locale,
aLocale.SetString(aLocaleUnichar);
//TODO: Get a charset name from a script code.
nsCOMPtr <nsIMacLocale> macLocale;
short langcode;
short langcode, regioncode;
res = nsComponentManager::CreateInstance(kMacLocaleFactoryCID, NULL, kIMacLocaleIID, getter_AddRefs(macLocale));
if (NS_SUCCEEDED(res)) {
res = macLocale->GetPlatformLocale(&aLocale, &scriptcode, &langcode);
res = macLocale->GetPlatformLocale(&aLocale, &scriptcode, &langcode, &regioncode);
}
}
}

121
intl/locale/src/mac/nsMacLocale.cpp
Просмотреть файл

@ -28,16 +28,16 @@
NS_DEFINE_IID(kIMacLocaleIID, NS_IMACLOCALE_IID);
NS_DEFINE_IID(kMacLocaleCID, NS_MACLOCALE_CID);
struct iso_map
struct iso_lang_map
{
char* iso_code;
short mac_lang_code;
short mac_script_code;
};
typedef struct iso_map iso_map;
typedef struct iso_lang_map iso_lang_map;
iso_map lang_list[] = {
iso_lang_map lang_list[] = {
{ "sq", langAlbanian, smRoman },
{ "am", langAmharic, smEthiopic },
{ "ar", langArabic, smArabic },
@ -138,6 +138,63 @@ iso_map lang_list[] = {
{ "", 0, 0}
};
struct iso_country_map
{
char* iso_code;
short mac_region_code;
};
typedef struct iso_country_map iso_country_map;
iso_country_map country_list[] = {
{ "US", verUS},
{ "EG", verArabic},
{ "DZ", verArabic},
{ "AU", verAustralia},
{ "BE", verFrBelgium },
{ "CA", verEngCanada },
{ "CN", verChina },
{ "HR", verYugoCroatian },
{ "CY", verCyprus },
{ "DK", verDenmark },
{ "EE", verEstonia },
{ "FI", verFinland },
{ "FR", verFrance },
{ "DE", verGermany },
{ "EL", verGreece },
{ "HU", verHungary },
{ "IS", verIceland },
{ "IN", verIndiaHindi},
{ "IR", verIran },
{ "IQ", verArabic },
{ "IE", verIreland },
{ "IL", verIsrael },
{ "IT", verItaly },
{ "JP", verJapan },
{ "KP", verKorea },
{ "LV", verLatvia },
{ "LY", verArabic },
{ "LT", verLithuania },
{ "LU", verFrBelgiumLux },
{ "MT", verMalta },
{ "MA", verArabic },
{ "NL", verNetherlands },
{ "NO", verNorway },
{ "PK", verPakistan },
{ "PL", verPoland },
{ "PT", verPortugal },
{ "RU", verRussia },
{ "SA", verArabic },
{ "ES", verSpain },
{ "SE", verSweden },
{ "CH", verFrSwiss },
{ "TW", verTaiwan},
{ "TH", verThailand },
{ "TN", verArabic},
{ "TR", verTurkey },
{ "GB", verBritain },
{ "", 0 }
};
/* nsMacLocale ISupports */
@ -154,22 +211,43 @@ nsMacLocale::~nsMacLocale(void)
}
NS_IMETHODIMP
nsMacLocale::GetPlatformLocale(const nsString* locale,short* scriptCode, short* langCode)
nsMacLocale::GetPlatformLocale(const nsString* locale,short* scriptCode, short* langCode, short* regionCode)
{
char country_code[3];
char lang_code[3];
char region_code[3];
char* xp_locale = locale->ToNewCString();
bool validCountryFound;
int i;
if (xp_locale != nsnull) {
if (!ParseLocaleString(xp_locale,lang_code,country_code,region_code,'-')) {
*scriptCode = smRoman;
*langCode = langEnglish;
*regionCode = verUS;
delete [] xp_locale;
return NS_ERROR_FAILURE;
}
if (country_code[0]!=0)
{
validCountryFound=false;
for(i=0;strlen(country_list[i].iso_code)!=0;i++) {
if (strcmp(country_list[i].iso_code,country_code)==0) {
*regionCode = country_list[i].mac_region_code;
validCountryFound=true;
break;
}
}
if (!validCountryFound) {
*scriptCode = smRoman;
*langCode = langEnglish;
*regionCode = verUS;
delete [] xp_locale;
return NS_ERROR_FAILURE;
}
}
for(i=0;strlen(lang_list[i].iso_code)!=0;i++) {
if (strcmp(lang_list[i].iso_code,lang_code)==0) {
*scriptCode = lang_list[i].mac_script_code;
@ -184,20 +262,41 @@ nsMacLocale::GetPlatformLocale(const nsString* locale,short* scriptCode, short*
}
NS_IMETHODIMP
nsMacLocale::GetXPLocale(short scriptCode, short langCode, nsString* locale)
nsMacLocale::GetXPLocale(short scriptCode, short langCode, short regionCode, nsString* locale)
{
int i;
nsString* temp;
bool validResultFound = false;
nsString temp;
//
// parse language
//
for(i=0;strlen(lang_list[i].iso_code)!=0;i++) {
if (langCode==lang_list[i].mac_lang_code) {
temp = new nsString(lang_list[i].iso_code);
*locale = *temp;
delete temp;
return NS_OK;
if (langCode==lang_list[i].mac_lang_code && scriptCode==lang_list[i].mac_script_code) {
temp = lang_list[i].iso_code;
validResultFound = true;
break;
}
}
//
// parse region
//
for(i=0;strlen(country_list[i].iso_code)!=0;i++) {
if (regionCode==country_list[i].mac_region_code) {
temp += '-';
temp += country_list[i].iso_code;
validResultFound = true;
break;
}
}
if (validResultFound) {
*locale = temp;
return NS_OK;
}
return NS_ERROR_FAILURE;
}

4
intl/locale/src/mac/nsMacLocale.h
Просмотреть файл

@ -35,8 +35,8 @@ public:
nsMacLocale();
virtual ~nsMacLocale();
NS_IMETHOD GetPlatformLocale(const nsString* locale,short* scriptCode, short* langCode);
NS_IMETHOD GetXPLocale(short scriptCode, short langCode, nsString* locale);
NS_IMETHOD GetPlatformLocale(const nsString* locale,short* scriptCode, short* langCode, short* regionCode);
NS_IMETHOD GetXPLocale(short scriptCode, short langCode, short regionCode, nsString* locale);
protected:
inline PRBool ParseLocaleString(const char* locale_string, char* language, char* country, char* region, char separator);

3
intl/locale/src/nsLocaleService.cpp
Просмотреть файл

@ -254,13 +254,14 @@ nsLocaleService::nsLocaleService(void)
#endif // XP_PC
#ifdef XP_MAC
long script = GetScriptManagerVariable(smSysScript);
long lang = GetScriptVariable(smSystemScript,smScriptLang);
long region = GetScriptManagerVariable(smRegionCode);
nsIMacLocale* macConverter;
nsresult result = nsComponentManager::CreateInstance(kMacLocaleFactoryCID,
NULL,kIMacLocaleIID,(void**)&macConverter);
if (result==NS_OK && macConverter!=nsnull) {
nsString xpLocale;
result = macConverter->GetXPLocale((short)script,(short)region,&xpLocale);
result = macConverter->GetXPLocale((short)script,(short)lang,(short)region,&xpLocale);
if (result!=NS_OK) { macConverter->Release(); return; }
result = NewLocale(xpLocale.ToNewUnicode(),&mSystemLocale);
if (result!=NS_OK) { macConverter->Release(); return; }