simplified chinese used for all chinese languages for now

This commit is contained in:
Kyle Spearrin 2016-12-26 14:38:18 -05:00
parent b2712119d1
commit 6c847292c7
2 changed files with 25 additions and 20 deletions

View file

@ -52,6 +52,13 @@ namespace Bit.Android.Services
Console.WriteLine("Android Language:" + androidLanguage); Console.WriteLine("Android Language:" + androidLanguage);
var netLanguage = androidLanguage; var netLanguage = androidLanguage;
if(netLanguage.StartsWith("zh"))
{
// simplified chinese used for all for now
netLanguage = "zh-Hans";
}
else
{
// certain languages need to be converted to CultureInfo equivalent // certain languages need to be converted to CultureInfo equivalent
switch(androidLanguage) switch(androidLanguage)
{ {
@ -69,6 +76,7 @@ namespace Bit.Android.Services
// add more application-specific cases here (if required) // add more application-specific cases here (if required)
// ONLY use cultures that have been tested and known to work // ONLY use cultures that have been tested and known to work
} }
}
Console.WriteLine(".NET Language/Locale:" + netLanguage); Console.WriteLine(".NET Language/Locale:" + netLanguage);
return netLanguage; return netLanguage;

View file

@ -58,14 +58,11 @@ namespace Bit.iOS.Core.Services
Console.WriteLine("iOS Language:" + iOSLanguage); Console.WriteLine("iOS Language:" + iOSLanguage);
var netLanguage = iOSLanguage; var netLanguage = iOSLanguage;
if(netLanguage.StartsWith("zh-Hans")) if(netLanguage.StartsWith("zh"))
{ {
// simplified chinese used for all for now
netLanguage = "zh-Hans"; netLanguage = "zh-Hans";
} }
else if(netLanguage.StartsWith("zh-Hant"))
{
netLanguage = "zh-Hant";
}
else else
{ {
//certain languages need to be converted to CultureInfo equivalent //certain languages need to be converted to CultureInfo equivalent