From 7bcd985e83ae969dc490f537da9120096daf642e Mon Sep 17 00:00:00 2001 From: Jimmy Huang Date: Tue, 11 Mar 2014 12:02:29 -0700 Subject: [PATCH] Work around an issue where locale plugin still uses "LANG=" in locale set/get methods Change-Id: Ic95e573d98f1753cb1859d40ff07853d11a8b5d9 Signed-off-by: Jimmy Huang --- js/panel-locale.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/js/panel-locale.js b/js/panel-locale.js index cb38357..b583b1c 100644 --- a/js/panel-locale.js +++ b/js/panel-locale.js @@ -85,7 +85,7 @@ function updateSystemLocale() { if (tizen.locale) { console.log('New locale is set to ' + locale); - tizen.locale.setLocale(locale); + tizen.locale.setLocale('LANG=' + locale); localePageReload(); } else { console.error('tizen.locale missing - cannot update locale'); @@ -93,6 +93,10 @@ function updateSystemLocale() { } function localeToLanguage(locale) { + if (locale.indexOf('LANG=') == 0) { + 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'; -- 2.7.4