Merge pull request #2872 from maciekczwa/develop

fixed #2283: Adding Polish language support.
This commit is contained in:
James Chen 2013-06-13 00:00:36 -07:00
commit b372fc8534
9 changed files with 43 additions and 5 deletions

View File

@ -69,7 +69,8 @@ typedef enum LanguageType
kLanguageHungarian,
kLanguagePortuguese,
kLanguageArabic,
kLanguageNorwegian
kLanguageNorwegian,
kLanguagePolish
} ccLanguageType;
// end of platform group

View File

@ -118,7 +118,11 @@ ccLanguageType CCApplication::getCurrentLanguage()
else if (0 == strcmp("nb", pLanguageName))
{
ret = kLanguageNorwegian;
}
}
else if (0 == strcmp("pl", pLanguageName))
{
ret = kLanguagePolish;
}
return ret;
}

View File

@ -165,6 +165,10 @@ ccLanguageType CCApplication::getCurrentLanguage()
else if (strcmp(language, "nb") == 0)
{
ret_language = kLanguageNorwegian;
}
else if (strcmp(language, "pl") == 0)
{
ret_language = kLanguagePolish;
}
free(language);
free(country);

View File

@ -122,6 +122,9 @@ ccLanguageType CCApplication::getCurrentLanguage()
else if ([languageCode isEqualToString:@"nb"]){
ret = kLanguageNorwegian;
}
else if ([languageCode isEqualToString:@"pl"]){
ret = kLanguagePolish;
}
return ret;
}

View File

@ -160,6 +160,14 @@ ccLanguageType CCApplication::getCurrentLanguage()
{
ret = kLanguageArabic;
}
else if (0 == strcmp("nb", pLanguageName))
{
ret = kLanguageNorwegian;
}
else if (0 == strcmp("pl", pLanguageName))
{
ret = kLanguagePolish;
}
return ret;
}

View File

@ -129,7 +129,10 @@ ccLanguageType CCApplication::getCurrentLanguage()
}
else if ([languageCode isEqualToString:@"nb"]){
ret = kLanguageNorwegian;
}
}
else if ([languageCode isEqualToString:@"pl"]){
ret = kLanguagePolish;
}
return ret;
}

View File

@ -193,7 +193,15 @@ ccLanguageType CCApplication::getCurrentLanguage()
case S3E_DEVICE_LANGUAGE_ARABIC:
currentLanguage = kLanguageArabic;
break;
case S3E_DEVICE_LANGUAGE_NORWEGIAN:
currentLanguage = kLanguageNorwegian;
break;
case S3E_DEVICE_LANGUAGE_POLISH:
currentLanguage = kLanguagePolish;
break;
default:
currentLanguage = kLanguageEnglish;
break;

View File

@ -142,6 +142,10 @@ ccLanguageType CCApplication::getCurrentLanguage()
{
ret = kLanguageNorwegian;
}
else if (0 == languageCode.CompareTo(L"pol"))
{
ret = kLanguagePolish;
}
return ret;
}

View File

@ -151,9 +151,12 @@ ccLanguageType CCApplication::getCurrentLanguage()
case LANG_ARABIC:
ret = kLanguageArabic;
break;
case LANG_NORWEGIAN:
case LANG_NORWEGIAN:
ret = kLanguageNorwegian;
break;
case LANG_POLISH:
ret = kLanguagePolish;
break;
}
return ret;