pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] Fixed @bykoianko comments. (TTS)

Browse source
This commit is contained in:
v.mikhaylenko 2015-11-12 17:43:51 +03:00
parent 2df36d58d3
commit 66078b262b
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm
View file

@ -226,16 +226,16 @@ namespace tts
string bcp47ToTwineLanguage(NSString const * bcp47LangName)
{
if (bcp47LangName == nil || [bcp47LangName length] < 2)
return "";
return string("");
if ([bcp47LangName isEqualToString:@"zh-CN"] || [bcp47LangName isEqualToString:@"zh-CHS"]
|| [bcp47LangName isEqualToString:@"zh-SG"])
{
return "zh-Hans"; // Chinese simplified
return string("zh-Hans"); // Chinese simplified
}
if ([bcp47LangName hasPrefix:@"zh"])
return "zh-Hant"; // Chinese traditional
return string("zh-Hant"); // Chinese traditional
// Taking two first symbols of a language name. For example ru-RU -> ru
return [[bcp47LangName substringToIndex:2] UTF8String];

1
iphone/Maps/MWMTTSSettingsViewController.mm
View file

@ -28,6 +28,7 @@ using namespace std;
_languages.reserve(3);
auto const & v = tts.availableLanguages;
NSAssert(!v.empty(), @"Vector can't be empty!");
pair<string, string> const standart = v.front();
_languages.push_back(standart);