From: Jimmy Huang Date: Fri, 14 Mar 2014 18:05:28 +0000 (-0700) Subject: Replaced all locale str with ".UTF-8" to ".utf8" X-Git-Tag: accepted/tizen/ivi/20140317.203308~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;ds=sidebyside;h=77b900fe56090ee656979ed87ac405e4c122f2ef;p=profile%2Fivi%2FSettingsApp.git Replaced all locale str with ".UTF-8" to ".utf8" - Fixed compatibility with localed since the locale values end with .utf8 instead of .UTF-8. Change-Id: If5e83b356cc03c29386a0cfd0f756482dd00578d Signed-off-by: Jimmy Huang --- diff --git a/index.html b/index.html index e7f8f76..e12e0d5 100644 --- a/index.html +++ b/index.html @@ -380,19 +380,19 @@
- + - + - + - + - +
Apply
diff --git a/js/panel-locale.js b/js/panel-locale.js index b583b1c..6bea2fa 100644 --- a/js/panel-locale.js +++ b/js/panel-locale.js @@ -97,10 +97,10 @@ function localeToLanguage(locale) { locale = locale.substr(5, locale.length); } - if (locale === 'C' || locale === 'en_US.UTF-8') return 'english'; - else if (locale === 'de_DE.UTF-8') return 'german'; - else if (locale === 'ja_JP.UTF-8') return 'japanese'; - else if (locale === 'zh_CN.UTF-8') return 'simplified_chinese'; - else if (locale === 'zh_HK.UTF-8' || locale === 'zh_TW.UTF-8') return 'traditional_chinese'; + if (locale === 'C' || locale === 'en_US.utf8') return 'english'; + else if (locale === 'de_DE.utf8') return 'german'; + else if (locale === 'ja_JP.utf8') return 'japanese'; + else if (locale === 'zh_CN.utf8') return 'simplified_chinese'; + else if (locale === 'zh_HK.utf8' || locale === 'zh_TW.utf8') return 'traditional_chinese'; else return null; } \ No newline at end of file