From 56b8f5dfb22c3b78f35bc90b84b96bc04ffbb76f Mon Sep 17 00:00:00 2001 From: Radek Kintop Date: Tue, 16 May 2017 11:52:20 +0200 Subject: [PATCH] Translations in menu buttons, popups and sliders Change-Id: I2594246ddd0c15802af20c6862ae400f90438663 Signed-off-by: Radek Kintop Signed-off-by: Kiseok Chang --- include/define.h | 7 ------- po/en.po | 25 +++++++++++++++++++++---- po/en_US.po | 4 ++-- po/ko_KR.po | 17 +++++++++++++++++ src/common/utils.c | 7 ++++--- src/layout/layout_picture.c | 8 ++++---- src/layout/layout_system.c | 8 ++++---- src/view/picture/view_picture_brightness.c | 2 +- src/view/picture/view_picture_color.c | 2 +- src/view/picture/view_picture_contrast.c | 2 +- src/view/picture/view_picture_slider_generic.c | 6 ++++-- src/view/picture/view_picture_tint.c | 2 +- src/view/system/view_language.c | 4 +--- src/view/system/view_reset.c | 8 +++++--- src/view/system/view_voice_control.c | 2 +- 15 files changed, 67 insertions(+), 37 deletions(-) mode change 100644 => 100755 po/ko_KR.po diff --git a/include/define.h b/include/define.h index 7b8e5e2..2fa0156 100644 --- a/include/define.h +++ b/include/define.h @@ -188,7 +188,6 @@ #define STR_CLOCK "Clock" #define STR_CLOCK_DES "If you set Clock Auto, You can set 24-hour format." -#define STR_RESET "Reset" #define STR_SETUP "Setup" #define STR_AUTO "Auto" @@ -199,14 +198,8 @@ #define STR_VOLUME "Volume" #define STR_SOURCE "Source" -#define STR_CONTRAST "Contrast" -#define STR_BRIGHTNESS "Brightness" -#define STR_COLOR "Color" -#define STR_TINT "Tint" #define STR_SCR_ADJ "Screen Adjustment" -#define STR_LANGUAGE "Language" - #define STR_SELECT_COUNTRY "Select your country." #define STR_OFF "Off" diff --git a/po/en.po b/po/en.po index a0400d5..39da0bd 100644 --- a/po/en.po +++ b/po/en.po @@ -836,7 +836,7 @@ msgid "IDS_ST_HEADER_RESET_RESULTS" msgstr "Reset results" msgid "IDS_ST_HEADER_RESET" -msgstr "Reset" +msgstr "RESET" msgid "IDS_ST_HEADER_PRIVILEGES" msgstr "Privileges" @@ -2270,7 +2270,7 @@ msgid "IDS_ST_HEADER_ENTER_PIN_ABB3" msgstr "Enter PIN" msgid "IDS_ST_HEADER_VOICE_CONTROL" -msgstr "Voice Control" +msgstr "VOICE CONTROL" msgid "IDS_ST_OPT_2G_ONLY" msgstr "2G only" @@ -2507,7 +2507,7 @@ msgid "IDS_ST_BODY_PIN_LOCK" msgstr "PIN lock" msgid "IDS_ST_BODY_RESET" -msgstr "Reset" +msgstr "RESET" msgid "IDS_ST_POP_NETWORKSERVICES_SEARCHING" msgstr "Searching..." @@ -2612,7 +2612,7 @@ msgid "IDS_ST_BODY_TTS" msgstr "TTS" msgid "IDS_ST_BODY_VOICE_CONTROL" -msgstr "Voice control" +msgstr "VOICE CONTROL" msgid "IDS_ST_BODY_ALLOW_OR_BLOCK_NOTIFICATIONS_FROM_INDIVIDUAL_APPLICATIONS" msgstr "Allow or block notifications from individual applications." @@ -2665,3 +2665,20 @@ msgstr "Status bar information" msgid "IDS_ACCS_SBODY_SELECT_WHICH_INFORMATION_FROM_INDICATORS_SHOWN_ON_THE_STATUS_BAR_WILL_BE_READ_OUT_WHEN_YOU_TRIPLE_TAP_THE_SCREEN_WITH_TWO_FINGERS_MSG" msgstr "Select which information will be read out from indicators shown on the status bar when you triple tap the screen with two fingers, for example, the time and date, the device's signal strength, Wi-Fi and Bluetooth connections, and the battery power." +msgid "IDS_ST_CONTRAST" +msgstr "CONTRAST" + +msgid "IDS_ST_BRIGHTNESS" +msgstr "BRIGHTNESS" + +msgid "IDS_ST_COLOR" +msgstr "COLOR" + +msgid "IDS_ST_TINT" +msgstr "TINT" + +msgid "IDS_ST_CLOCK" +msgstr "CLOCK" + +msgid "IDS_ST_LANGUAGE" +msgstr "LANGUAGE" diff --git a/po/en_US.po b/po/en_US.po index d170b14..9aa0c74 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -809,7 +809,7 @@ msgid "IDS_ST_HEADER_RESET_RESULTS" msgstr "Reset results" msgid "IDS_ST_HEADER_RESET" -msgstr "Reset" +msgstr "RESET" msgid "IDS_ST_HEADER_PRIVILEGES" msgstr "Privileges" @@ -2579,7 +2579,7 @@ msgid "IDS_ST_BODY_TTS" msgstr "TTS" msgid "IDS_ST_BODY_VOICE_CONTROL" -msgstr "Voice control" +msgstr "VOICE CONTROL" msgid "IDS_ST_BODY_ALLOW_OR_BLOCK_NOTIFICATIONS_FROM_INDIVIDUAL_APPLICATIONS" msgstr "Allow or block notifications from individual applications." diff --git a/po/ko_KR.po b/po/ko_KR.po old mode 100644 new mode 100755 index 38acbe2..71fcd21 --- a/po/ko_KR.po +++ b/po/ko_KR.po @@ -2635,3 +2635,20 @@ msgstr "상태표시줄 정보" msgid "IDS_ACCS_SBODY_SELECT_WHICH_INFORMATION_FROM_INDICATORS_SHOWN_ON_THE_STATUS_BAR_WILL_BE_READ_OUT_WHEN_YOU_TRIPLE_TAP_THE_SCREEN_WITH_TWO_FINGERS_MSG" msgstr "상태표시줄에 표시되는 정보 중, 두 손가락을 세 번 눌러 읽어주는 정보에 대하여 선택할 수 있습니다. 날짜, 시간, 신호 세기, Wi-Fi 및 블루투스 연결, 배터리 사용량 등의 정보가 있습니다." +msgid "IDS_ST_CONTRAST" +msgstr "명암" + +msgid "IDS_ST_BRIGHTNESS" +msgstr "밝기" + +msgid "IDS_ST_COLOR" +msgstr "색상" + +msgid "IDS_ST_TINT" +msgstr "색조" + +msgid "IDS_ST_CLOCK" +msgstr "시계" + +msgid "IDS_ST_LANGUAGE" +msgstr "언어" diff --git a/src/common/utils.c b/src/common/utils.c index a8c5346..8e68d63 100755 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -175,10 +175,11 @@ Evas_Object *utils_add_popup(Evas_Object *parent, const char *style, elm_object_style_set(popup, style); if (popup_title) - elm_object_part_text_set(popup, "title,text", popup_title); - + elm_object_domain_translatable_part_text_set(popup, "title,text", + SETTINGS_PACKAGE, popup_title); if (popup_text) - elm_object_text_set(popup, popup_text); + elm_object_domain_translatable_text_set(popup, + SETTINGS_PACKAGE, popup_text); return popup; } diff --git a/src/layout/layout_picture.c b/src/layout/layout_picture.c index eb1b6cb..86bd09c 100644 --- a/src/layout/layout_picture.c +++ b/src/layout/layout_picture.c @@ -63,7 +63,7 @@ static void _update(void *layout_data, int update_type, void *data); static struct menumgr_info menu_info[] = { { .id = MENU_CONTRAST, - .title = STR_CONTRAST, + .title = "IDS_ST_CONTRAST", .style = STYLE_STATUS_BTN, .disabled = EINA_FALSE, .status = _get_contrast, @@ -76,7 +76,7 @@ static struct menumgr_info menu_info[] = { }, { .id = MENU_BRIGHTNESS, - .title = STR_BRIGHTNESS, + .title = "IDS_ST_BRIGHTNESS", .style = STYLE_STATUS_BTN, .disabled = EINA_FALSE, .status = _get_brightness, @@ -89,7 +89,7 @@ static struct menumgr_info menu_info[] = { }, { .id = MENU_COLOR, - .title = STR_COLOR, + .title = "IDS_ST_COLOR", .style = STYLE_STATUS_BTN, .disabled = EINA_FALSE, .status = _get_color, @@ -102,7 +102,7 @@ static struct menumgr_info menu_info[] = { }, { .id = MENU_TINT, - .title = STR_TINT, + .title = "IDS_ST_TINT", .style = STYLE_DOUBLE_VALUE_PROGRESS_BTN, .disabled = EINA_FALSE, .status = _get_tint, diff --git a/src/layout/layout_system.c b/src/layout/layout_system.c index a677e79..e2932f5 100755 --- a/src/layout/layout_system.c +++ b/src/layout/layout_system.c @@ -65,7 +65,7 @@ static void _reg_data_change_cb(void *data); static struct menumgr_info menu_info[] = { { .id = MENU_CLOCK, - .title = STR_CLOCK, + .title = "IDS_ST_CLOCK", .style = "style.datetime.status.button", .disabled = EINA_FALSE, .status = _get_clock_mode, @@ -78,7 +78,7 @@ static struct menumgr_info menu_info[] = { }, { .id = MENU_LANGUAGE, - .title = STR_LANGUAGE, + .title = "IDS_ST_LANGUAGE", .style = STYLE_STATUS_BTN, .disabled = EINA_FALSE, .status = _get_language, @@ -91,7 +91,7 @@ static struct menumgr_info menu_info[] = { }, { .id = MENU_VOICE_CONTROL, - .title = "Voice control", + .title = "IDS_ST_BODY_VOICE_CONTROL", .style = STYLE_STATUS_BTN, .disabled = EINA_FALSE, .status = _get_voice_control_status, @@ -104,7 +104,7 @@ static struct menumgr_info menu_info[] = { }, { .id = MENU_RESET, - .title = STR_RESET, + .title = "IDS_ST_HEADER_RESET", .style = STYLE_NORMAL_BTN, .disabled = EINA_FALSE, .selected = _selected, diff --git a/src/view/picture/view_picture_brightness.c b/src/view/picture/view_picture_brightness.c index 0af6eef..2086fd6 100644 --- a/src/view/picture/view_picture_brightness.c +++ b/src/view/picture/view_picture_brightness.c @@ -47,7 +47,7 @@ static Evas_Object *_create(Evas_Object *win, void *data) return NULL; } - g_slider_attr.slider_title = STR_BRIGHTNESS; + g_slider_attr.slider_title = "IDS_ST_BRIGHTNESS"; g_slider_attr.slider_min_val = 0; g_slider_attr.slider_max_val = settings_picture_get_max_brightness(); g_slider_attr.slider_cur_val = settings_picture_get_brightness(); diff --git a/src/view/picture/view_picture_color.c b/src/view/picture/view_picture_color.c index c4923a7..b65cd47 100644 --- a/src/view/picture/view_picture_color.c +++ b/src/view/picture/view_picture_color.c @@ -47,7 +47,7 @@ static Evas_Object *_create(Evas_Object *win, void *data) return NULL; } - g_slider_attr.slider_title = STR_COLOR; + g_slider_attr.slider_title = "IDS_ST_COLOR"; g_slider_attr.slider_min_val = 0; g_slider_attr.slider_max_val = 100; g_slider_attr.slider_cur_val = 100; diff --git a/src/view/picture/view_picture_contrast.c b/src/view/picture/view_picture_contrast.c index 978abd0..2c225e2 100644 --- a/src/view/picture/view_picture_contrast.c +++ b/src/view/picture/view_picture_contrast.c @@ -47,7 +47,7 @@ static Evas_Object *_create(Evas_Object *win, void *data) return NULL; } - g_slider_attr.slider_title = STR_CONTRAST; + g_slider_attr.slider_title = "IDS_ST_CONTRAST"; g_slider_attr.slider_min_val = 0; g_slider_attr.slider_max_val = 100; g_slider_attr.slider_cur_val = 100; diff --git a/src/view/picture/view_picture_slider_generic.c b/src/view/picture/view_picture_slider_generic.c index 36eff2b..a2c6555 100644 --- a/src/view/picture/view_picture_slider_generic.c +++ b/src/view/picture/view_picture_slider_generic.c @@ -20,6 +20,7 @@ #include #include "app_debug.h" +#include "app_string.h" #include "define.h" #include "common/inputmgr.h" #include "common/utils.h" @@ -73,8 +74,9 @@ static Evas_Object *_create(Evas_Object *win, void *data) layout = elm_layout_add(priv->base); elm_layout_theme_set(layout, "layout", "popup", "content/function"); - elm_object_part_text_set(layout, "elm.text", attr->slider_title); - + elm_object_domain_translatable_part_text_set(layout, "elm.text", + SETTINGS_PACKAGE, + attr->slider_title); if (!layout) { _ERR("Adding layout failed."); free(priv); diff --git a/src/view/picture/view_picture_tint.c b/src/view/picture/view_picture_tint.c index 85fbf7e..71fe60d 100644 --- a/src/view/picture/view_picture_tint.c +++ b/src/view/picture/view_picture_tint.c @@ -57,7 +57,7 @@ static Evas_Object *_create(Evas_Object *win, void *data) return NULL; } - g_slider_attr.slider_title = STR_TINT; + g_slider_attr.slider_title = "IDS_ST_TINT"; g_slider_attr.slider_min_val = 0; g_slider_attr.slider_max_val = 100; g_slider_attr.slider_cur_val = 50; diff --git a/src/view/system/view_language.c b/src/view/system/view_language.c index d636010..14ad284 100644 --- a/src/view/system/view_language.c +++ b/src/view/system/view_language.c @@ -25,8 +25,6 @@ #include "data/system/settings_language.h" #include "view/system/view_language.h" -#define STR_LANGUAGE_DES "Select language." - struct _priv { Evas_Object *base; Evas_Object *popup_btn[LANG_TYPE_MAX]; @@ -88,7 +86,7 @@ static Evas_Object *_create(Evas_Object *win, void *data) return NULL; } - priv->base = utils_add_popup(win, STYLE_POPUP, STR_LANGUAGE, NULL); + priv->base = utils_add_popup(win, STYLE_POPUP, "IDS_ST_LANGUAGE", NULL); if (!priv->base) { _ERR("Add popup failed"); free(priv); diff --git a/src/view/system/view_reset.c b/src/view/system/view_reset.c index c2fa7ba..85dda5e 100644 --- a/src/view/system/view_reset.c +++ b/src/view/system/view_reset.c @@ -79,15 +79,17 @@ static Evas_Object *_create(Evas_Object *win, void *data) priv->win = win; - priv->popup = utils_add_popup(win, NULL, "Reset", + priv->popup = utils_add_popup(win, NULL, "IDS_ST_HEADER_RESET", "Are you sure you want to reset?"); if (!priv->popup) { free(priv); return NULL; } - priv->reset_btn = utils_add_button(priv->popup, NULL, NULL, "Reset"); - priv->cancel_btn = utils_add_button(priv->popup, NULL, NULL, "Cancel"); + priv->reset_btn = utils_add_button(priv->popup, NULL, NULL, + "IDS_ST_BUTTON_RESET"); + priv->cancel_btn = utils_add_button(priv->popup, NULL, NULL, + "IDS_ST_BUTTON_CANCEL"); if (!priv->reset_btn || !priv->cancel_btn) { evas_object_del(priv->popup); free(priv); diff --git a/src/view/system/view_voice_control.c b/src/view/system/view_voice_control.c index 672fb9e..3936989 100644 --- a/src/view/system/view_voice_control.c +++ b/src/view/system/view_voice_control.c @@ -80,7 +80,7 @@ static Evas_Object *_create(Evas_Object *win, void *data) return NULL; } - priv->base = utils_add_popup(win, NULL, _("IDS_ST_BODY_VOICE_CONTROL"), + priv->base = utils_add_popup(win, NULL, "IDS_ST_BODY_VOICE_CONTROL", NULL); if (!priv->base) { _ERR("Adding popup failed"); -- 2.7.4