Fix problems at language change

- change wrong strings in english/korean
- update 'language and input' view when changing language

Change-Id: Idafde25b156a096ac0b0aa7acf1ef3acd94cdb96
Signed-off-by: kiso.chang <kiso.chang@samsung.com>

diff --git a/resource/po/en.po b/resource/po/en.po
index 10102f330718670306cd31299468f3bd93b977e0..2107165bdc853663f6b7484a61bf678b53cddc5e 100644 (file)
--- a/resource/po/en.po
+++ b/resource/po/en.po
@@ -709,6 +709,9 @@ msgstr "SIM card manager"
 msgid "IDS_ST_HEADER_SHARED_CONTENT"
 msgstr "Shared content"
 
+msgid "IDS_ST_HEADER_APP_INSTALLATION"
+msgstr "App installation"
+
 msgid "IDS_ST_HEADER_SELECT_VIBRATION_PATTERNS_ABB"
 msgstr "Select vibration patterns"
 
@@ -769,6 +772,12 @@ msgstr "Installed applications"
 msgid "IDS_ST_HEADER_INPUT_AND_MOTION"
 msgstr "Input and motion"
 
+msgid "IDS_ST_BODY_INPUT_ASSISTANCE"
+msgstr "Input assistance"
+
+msgid "IDS_ST_BODY_AUTOFILL_SERVICE"
+msgstr "Autofill service"
+
 msgid "IDS_ST_HEADER_HOME_SCREEN_ABB"
 msgstr "Home screen"
 

diff --git a/resource/po/ko_KR.po b/resource/po/ko_KR.po
index 10f4b14a91e66013a4d181a130a764f1b1893a4f..7dc987ec836fd36bb3b27bc2df95430ab338f84a 100644 (file)
--- a/resource/po/ko_KR.po
+++ b/resource/po/ko_KR.po
@@ -709,6 +709,9 @@ msgstr "SIM 카드 관리자"
 msgid "IDS_ST_HEADER_SHARED_CONTENT"
 msgstr "공유 콘텐츠"
 
+msgid "IDS_ST_HEADER_APP_INSTALLATION"
+msgstr "앱 설치"
+
 msgid "IDS_ST_HEADER_SELECT_VIBRATION_PATTERNS_ABB"
 msgstr "진동 패턴 선택"
 
@@ -769,6 +772,12 @@ msgstr "설치된 애플리케이션"
 msgid "IDS_ST_HEADER_INPUT_AND_MOTION"
 msgstr "입력 및 모션"
 
+msgid "IDS_ST_BODY_INPUT_ASSISTANCE"
+msgstr "입력 보조"
+
+msgid "IDS_ST_BODY_AUTOFILL_SERVICE"
+msgstr "자동 입력 서비스"
+
 msgid "IDS_ST_HEADER_HOME_SCREEN_ABB"
 msgstr "홈 화면"
 

diff --git a/setting-language-and-input/src/setting-language-and-input-view.c b/setting-language-and-input/src/setting-language-and-input-view.c
index 5ce3d602461a1a8e3adab6b2927a0db654511d0e..7df08badc95efe0050a8213ea429cf494303eb0b 100755 (executable)
--- a/setting-language-and-input/src/setting-language-and-input-view.c
+++ b/setting-language-and-input/src/setting-language-and-input-view.c
@@ -24,8 +24,8 @@
 #include <pkgmgr-info.h>
 
 
-#define STR_INPUT_ASSISTANCE   "INPUT ASSISTANCE"
-#define STR_AUTOFILL_SERVICE   "Autofill service"
+#define STR_INPUT_ASSISTANCE   "IDS_ST_BODY_INPUT_ASSISTANCE"
+#define STR_AUTOFILL_SERVICE   "IDS_ST_BODY_AUTOFILL_SERVICE"
 
 static int _view_create(void *cb);
 static int _view_destroy(void *cb);
@@ -406,7 +406,7 @@ static int _view_update(void *cb)
        if (ad->data_title_inputassistance) {
                G_FREE(ad->data_title_inputassistance->keyStr);
                ad->data_title_inputassistance->keyStr = (char *)g_strdup(
-                               "INPUT ASSISTANCE");
+                               _(STR_INPUT_ASSISTANCE));
                elm_object_item_data_set(ad->data_title_inputassistance->item,
                                ad->data_title_inputassistance);
                elm_genlist_item_update(ad->data_title_inputassistance->item);

diff --git a/setting-language-and-input/src/setting-language-and-input.c b/setting-language-and-input/src/setting-language-and-input.c
index 940c25b479b4e819de3c98cc29f808ae29fdd17a..6645ada01718cf87e749162ce5e0bf72076aa98d 100755 (executable)
--- a/setting-language-and-input/src/setting-language-and-input.c
+++ b/setting-language-and-input/src/setting-language-and-input.c
@@ -250,6 +250,7 @@ static void _lang_changed(app_event_info_h event_info, void *priv)
                        && setting_language_and_input_view.is_create) {
                elm_genlist_realized_items_update(ad->md.genlist);
                __update_item(ad);
+               setting_view_update(&setting_language_and_input_view, ad);
        }
 
        setting_navi_items_update(ad->md.naviframe);

diff --git a/setting-storage/include/setting-storage-string.h b/setting-storage/include/setting-storage-string.h
index 0b588a6313599193be4aec7a1f01a79ee6f50b04..46c44a8078e5a3d46f712e9104b8fc8c9e22eb3b 100644 (file)
--- a/setting-storage/include/setting-storage-string.h
+++ b/setting-storage/include/setting-storage-string.h
@@ -76,6 +76,7 @@
 
 /* For default view */
 #define STORAGE_STR_SHARED_CONTENTS "IDS_ST_HEADER_SHARED_CONTENT"
+#define STORAGE_STR_APP_INSTALLATION "IDS_ST_HEADER_APP_INSTALLATION"
 #define STORAGE_STR_APP "IDS_ST_BODY_APPLICATION"
 
 /* For miscellaneous file view */

diff --git a/setting-storage/src/setting-storage-default.c b/setting-storage/src/setting-storage-default.c
index fd7fe6de044ae2e6a5ce9137ca12896632551f9c..856bc62b504684795af3f8c38cae07c9e9561474 100755 (executable)
--- a/setting-storage/src/setting-storage-default.c
+++ b/setting-storage/src/setting-storage-default.c
@@ -18,6 +18,7 @@
  */
 #include <glib.h>
 
+#include "setting-storage-string.h"
 #include "setting-storage-utils.h"
 #include "setting-storage-default.h"
 
@@ -169,7 +170,7 @@ static Setting_GenGroupItem_Data *storage_default_items_create(
                        storage_default_expand_item_sel,
                        NULL, SWALLOW_Type_1RADIO_1TEXT, rgd,
                        SETTING_DEF_MEMORY_PHONE,
-                       _("Storage"),
+                       _("IDS_ST_BODY_STORAGE"),
                        NULL);
 
        if (phone) {
@@ -334,10 +335,8 @@ static int storage_default_create(void *data)
                        INT_SLP_SETTING_DEFAULT_MEM_BLUETOOTH);
 
        /*Install application */
-       const char *grp_title = "App installation";
-
        it = setting_create_Gendial_field_titleItem(genlist, &itc_group_item,
-                       grp_title, NULL);
+                       STORAGE_STR_APP_INSTALLATION, NULL);
        elm_genlist_item_select_mode_set(it->item, ELM_OBJECT_SELECT_MODE_NONE);
 
        it = setting_create_Gendial_field_def(genlist, &(ad->itc_full),