From 7c4e3bf6d5e4e7fb0af31b159b357aabd190935c Mon Sep 17 00:00:00 2001 From: Hokwon Song Date: Fri, 12 Apr 2013 23:16:39 +0900 Subject: [PATCH] Fix the Locale display name bug Change-Id: Ieadc093e0da0e3df29b6e9797d4d8acfe2c6a1f5 Signed-off-by: Hokwon Song --- src/locales/FLcl_LocaleImpl.cpp | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/src/locales/FLcl_LocaleImpl.cpp b/src/locales/FLcl_LocaleImpl.cpp index 224aea1..d1d6918 100644 --- a/src/locales/FLcl_LocaleImpl.cpp +++ b/src/locales/FLcl_LocaleImpl.cpp @@ -28,6 +28,7 @@ #include "FLcl_LocaleImpl.h" #include "FLcl_LocaleData.h" +#include "FLcl_LocaleManagerImpl.h" using namespace Tizen::Base; @@ -135,23 +136,8 @@ _LocaleImpl::GetLanguageCodeString(bool isTwoLetter) result _LocaleImpl::GetLanguageName(String& languageName) const { - U_ICU_NAMESPACE::UnicodeString icuStr; - languageName = _LocaleData::GetOspString(__icuLocale.getDisplayLanguage(icuStr)); - if (!languageName.IsEmpty()) - { - String languageScriptTmp(__icuLocale.getScript()); - - if (!languageScriptTmp.IsEmpty()) - { - U_ICU_NAMESPACE::UnicodeString icuScriptStr; - String languageScriptName = _LocaleData::GetOspString(__icuLocale.getDisplayScript(icuScriptStr)); - languageName.Insert(L" (", languageName.GetLength()); - languageName.Insert(languageScriptName, languageName.GetLength()); - languageName.Insert(L")", languageName.GetLength()); - } - return E_SUCCESS; - } - return E_UNSUPPORTED_OPERATION; + Locale loc = _LocaleManagerImpl::GetSystemLocale(); + return GetLanguageName(*loc.__pLocaleImpl, languageName); } result @@ -191,13 +177,8 @@ _LocaleImpl::Get3LetterCountryCodeString(void) const result _LocaleImpl::GetCountryName(String& countryName) const { - U_ICU_NAMESPACE::UnicodeString icuStr; - countryName = _LocaleData::GetOspString(__icuLocale.getDisplayCountry(icuStr)); - if (!countryName.IsEmpty()) - { - return E_SUCCESS; - } - return E_UNSUPPORTED_OPERATION; + Locale loc = _LocaleManagerImpl::GetSystemLocale(); + return GetCountryName(*loc.__pLocaleImpl, countryName); } result -- 2.7.4