diff options
| author | Artem Nosach <ANosach@luxoft.com> | 2016-02-19 10:39:04 +0200 |
|---|---|---|
| committer | Artem Nosach <ANosach@luxoft.com> | 2016-02-19 10:39:04 +0200 |
| commit | 5653019ee1ab1fafb473aa649ae1b01fc94be425 (patch) | |
| tree | 47fae9a836751a977cddebd510e4f810729d0dcb | |
| parent | 541d8b119c3e8e13982987c4066523b0420870f0 (diff) | |
| parent | 5cae9b679de9b9fe3eb5b340259aa11ba032f0f5 (diff) | |
| download | smartdevicelink-5653019ee1ab1fafb473aa649ae1b01fc94be425.tar.gz | |
Merge pull request #387 from LuxoftSDL/hotfix/Wrong_language_codes_in_hmi_capabilities_json
Fix wrong language codes in hmi_capabilities.json
| -rwxr-xr-x[-rw-r--r--] | src/appMain/hmi_capabilities.json | 18 | ||||
| -rw-r--r-- | src/components/application_manager/src/hmi_capabilities.cc | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/appMain/hmi_capabilities.json b/src/appMain/hmi_capabilities.json index 78b4eaf87..fac4ac24b 100644..100755 --- a/src/appMain/hmi_capabilities.json +++ b/src/appMain/hmi_capabilities.json @@ -1,10 +1,10 @@ { "UI": { - "language":"EN_US", + "language":"EN-US", "languages":[ - "EN_US","ES_MX","FR_CA","DE_DE","ES_ES","EN_GB","RU_RU","TR_TR","PL_PL","FR_FR","IT_IT","SV_SE","PT_PT","NL_NL","ZH_TW", -"JA_JP","AR_SA","KO_KR","PT_BR","CS_CZ","DA_DK","NO_NO" + "EN-US","ES-MX","FR-CA","DE-DE","ES-ES","EN-GB","RU-RU","TR-TR","PL-PL","FR-FR","IT-IT","SV-SE","PT-PT","NL-NL","ZH-TW", +"JA-JP","AR-SA","KO-KR","PT-BR","CS-CZ","DA-DK","NO-NO" ], "displayCapabilities": { @@ -328,21 +328,21 @@ "VR": { "capabilities":["TEXT"], - "language":"EN_US", + "language":"EN-US", "languages": [ - "EN_US","ES_MX","FR_CA","DE_DE","ES_ES","EN_GB","RU_RU","TR_TR","PL_PL","FR_FR","IT_IT","SV_SE","PT_PT","NL_NL","ZH_TW", -"JA_JP","AR_SA","KO_KR","PT_BR","CS_CZ","DA_DK","NO_NO" + "EN-US","ES-MX","FR-CA","DE-DE","ES-ES","EN-GB","RU-RU","TR-TR","PL-PL","FR-FR","IT-IT","SV-SE","PT-PT","NL-NL","ZH-TW", +"JA-JP","AR-SA","KO-KR","PT-BR","CS-CZ","DA-DK","NO-NO" ] }, "TTS": { "capabilities":"TEXT", - "language":"EN_US", + "language":"EN-US", "languages": [ - "EN_US","ES_MX","FR_CA","DE_DE","ES_ES","EN_GB","RU_RU","TR_TR","PL_PL","FR_FR","IT_IT","SV_SE","PT_PT","NL_NL","ZH_TW", -"JA_JP","AR_SA","KO_KR","PT_BR","CS_CZ","DA_DK","NO_NO" + "EN-US","ES-MX","FR-CA","DE-DE","ES-ES","EN-GB","RU-RU","TR-TR","PL-PL","FR-FR","IT-IT","SV-SE","PT-PT","NL-NL","ZH-TW", +"JA-JP","AR-SA","KO-KR","PT-BR","CS-CZ","DA-DK","NO-NO" ] }, "Buttons": diff --git a/src/components/application_manager/src/hmi_capabilities.cc b/src/components/application_manager/src/hmi_capabilities.cc index 20f810264..96d4a39ae 100644 --- a/src/components/application_manager/src/hmi_capabilities.cc +++ b/src/components/application_manager/src/hmi_capabilities.cc @@ -602,7 +602,7 @@ bool HMICapabilities::load_capabilities_from_file() { if (check_existing_json_member(ui, "language")) { const std::string lang = ui.get("language", "EN-US").asString(); - ui_language_ = (MessageHelper::CommonLanguageFromString(lang)); + set_active_ui_language(MessageHelper::CommonLanguageFromString(lang)); } if (check_existing_json_member(ui, "languages")) { @@ -804,7 +804,7 @@ bool HMICapabilities::load_capabilities_from_file() { Json::Value vr = root_json.get("VR", ""); if (check_existing_json_member(vr, "language")) { const std::string lang = vr.get("language", "EN-US").asString(); - vr_language_ = MessageHelper::CommonLanguageFromString(lang); + set_active_vr_language(MessageHelper::CommonLanguageFromString(lang)); } if (check_existing_json_member(vr, "languages")) { @@ -833,7 +833,7 @@ bool HMICapabilities::load_capabilities_from_file() { if (check_existing_json_member(tts, "language")) { const std::string lang = tts.get("language", "EN-US").asString(); - tts_language_ = MessageHelper::CommonLanguageFromString(lang); + set_active_tts_language(MessageHelper::CommonLanguageFromString(lang)); } if (check_existing_json_member(tts, "languages")) { |