Correct translation machanism in Settings

[Issue]    N/A
[Problem]  Bad mechanism
[Solution] Corrected mechanism
[Verify]   Open settings. Homepage should be
           translated.

Change-Id: I455cf3d54b1b04559cf7fb99efc87f516b7c25c2

diff --git a/core/Tools/SettingsEnums.h b/core/Tools/SettingsEnums.h
index ef036caaaf20ba8e5180ca4e14ba9f481438ae4c..ec32a2327ee621614295267e55b0efb3d1681588 100644 (file)
--- a/core/Tools/SettingsEnums.h
+++ b/core/Tools/SettingsEnums.h
@@ -39,51 +39,51 @@ namespace Translations {
     ADD_TRAN(Device,"IDS_BR_OPT_DEVICE")
     ADD_TRAN(SDCard,"IDS_BR_OPT_SD_CARD")
     ADD_TRAN(SettingsMainTitle,"IDS_BR_OPT_SETTINGS")
-    ADD_TRAN(SettingsMainHomePage, "IDS_BR_TMBODY_HOME_PAGE")
-    ADD_TRAN(SettingsMainHomePageDefault,"IDS_BR_MBODY_DEFAULT_M_PAGE")
+    ADD_TRAN(SettingsMainHomePage, "IDS_BR_BUTTON_HOMEPAGE_ABB")
+    ADD_TRAN(SettingsMainHomePageDefault,"IDS_BR_BODY_DEFAULT")
     ADD_TRAN(SettingsMainDefaultSearchEngine,"IDS_BR_TMBODY_DEFAULT_SEARCH_ENGINE")
-    ADD_TRAN(SettingsMainAutoFillProfiles,"IDS_BR_TMBODY_AUTO_FILL_PROFILES")
+    ADD_TRAN(SettingsMainAutoFillProfiles,"IDS_BR_BODY_AUTO_FILL_FORMS_T_TTS")
     ADD_TRAN(SettingsMainAutoFillProfilesSub,"IDS_BR_SBODY_MANAGE_DATA_USED_TO_FILL_IN_FORMS_ONLINE")
     ADD_TRAN(SettingsMainManualZoom,"IDS_BR_MBODY_MANUAL_ZOOM")
-    ADD_TRAN(SettingsMainManualZoomSub,"IDS_BR_SBODY_OVERRIDE_WEBSITE_REQUESTS_TO_CONTROL_THE_ZOOM_LEVEL")
-    ADD_TRAN(SettingsMainPrivacy,"IDS_BR_MBODY_PRIVACY")
-    ADD_TRAN(SettingsMainAdvanced,"IDS_BR_HEADER_ADVANCED")
+    ADD_TRAN(SettingsMainManualZoomSub,"IDS_BR_BODY_OVERRIDE_WEBSITES_REQUEST_TO_CONTROL_ZOOM")
+    ADD_TRAN(SettingsMainPrivacy,"IDS_BR_BODY_PRIVACY")
+    ADD_TRAN(SettingsMainAdvanced,"IDS_BR_BODY_ADVANCED")
     ADD_TRAN(SettingsDefaultSearchEngineTitle,"IDS_BR_TMBODY_DEFAULT_SEARCH_ENGINE")
-    ADD_TRAN(SettingsAdvancedTitle,"IDS_BR_HEADER_ADVANCED")
+    ADD_TRAN(SettingsAdvancedTitle,"IDS_BR_BODY_ADVANCED")
     ADD_TRAN(SettingsAdvancedEnableJavaScript,"IDS_BR_OPT_ENABLE_JAVASCRIPT")
-    ADD_TRAN(SettingsAdvancedEnableJavaScriptSub,"IDS_BR_SBODY_ALLOW_SITES_TO_RUN_JAVASCRIPT")
-    ADD_TRAN(SettingsAdvancedBlockPopups,"IDS_BR_MBODY_BLOCK_POP_UPS")
-    ADD_TRAN(SettingsAdvancedBlockPopupsSub,"IDS_BR_SBODY_BLOCK_POP_UPS_ON_WEBPAGES")
+    ADD_TRAN(SettingsAdvancedEnableJavaScriptSub,"IDS_BR_BODY_ALLOW_SITES_TO_RUN_JAVASCRIPT")
+    ADD_TRAN(SettingsAdvancedBlockPopups,"IDS_BR_BODY_BLOCK_POP_UPS")
+    ADD_TRAN(SettingsAdvancedBlockPopupsSub,"IDS_BR_BODY_BLOCK_POP_UPS_ON_WEBPAGES")
     ADD_TRAN(SettingsAdvancedSaveContent,"IDS_BR_HEADER_SAVE_CONTENT_TO_ABB")
     ADD_TRAN(SettingsAdvancedSaveContentTitle,"IDS_BR_HEADER_SAVE_CONTENT_TO_ABB")
     ADD_TRAN(SettingsAdvancedManageWebsiteData,"IDS_BR_TMBODY_MANAGE_WEBSITE_DATA")
     ADD_TRAN(SettingsAdvancedManageWebsiteDataSub,"IDS_BR_SBODY_SET_ADVANCED_SETTINGS_FOR_INDIVIDUAL_WEBSITES")
-    ADD_TRAN(SettingsPrivacyTitle,"IDS_BR_MBODY_PRIVACY");
-    ADD_TRAN(SettingsPrivacyAcceptCookies,"IDS_BR_MBODY_ACCEPT_COOKIES")
+    ADD_TRAN(SettingsPrivacyTitle,"IDS_BR_BODY_PRIVACY");
+    ADD_TRAN(SettingsPrivacyAcceptCookies,"IDS_BR_BODY_ACCEPT_COOKIES")
     ADD_TRAN(SettingsPrivacyAcceptCookiesSub,"IDS_BR_SBODY_ALLOW_SITES_TO_SAVE_AND_READ_COOKIES")
     ADD_TRAN(SettingsPrivacySuggestSearches,"IDS_BR_MBODY_SUGGEST_SEARCHES")
     ADD_TRAN(SettingsPrivacySuggestSearchesSub,"IDS_BR_SBODY_SET_THE_DEVICE_TO_SUGGEST_QUERIES_AND_SITES_IN_THE_WEB_ADDRESS_BAR_AS_YOU_TYPE")
     ADD_TRAN(SettingsPrivacySaveSigninInfo,"IDS_BR_MBODY_SAVE_SIGN_IN_INFO")
     ADD_TRAN(SettingsPrivacySaveSigninInfoSub,"IDS_BR_SBODY_SET_YOUR_DEVICE_TO_SHOW_A_POP_UP_WITH_THE_OPTION_MSG")
-    ADD_TRAN(SettingsPrivacyDeletePersonalData,"IDS_BR_HEADER_PERSONAL_DATA_ABB")
-    ADD_TRAN(SettingsDelPersDataTitle,"IDS_BR_HEADER_PERSONAL_DATA_ABB")
+    ADD_TRAN(SettingsPrivacyDeletePersonalData,"IDS_BR_BODY_DELETE_PERSONAL_DATA")
+    ADD_TRAN(SettingsDelPersDataTitle,"IDS_BR_BODY_DELETE_PERSONAL_DATA")
     ADD_TRAN(SettingsDelPersDataCancel,"IDS_TPLATFORM_ACBUTTON_DONE_ABB")
     ADD_TRAN(SettingsDelPersDataDelete,"IDS_TPLATFORM_ACBUTTON_DELETE_ABB")
     ADD_TRAN(SettingsDelPersDataSelectAll,"IDS_BR_OPT_SELECT_ALL_ABB")
     ADD_TRAN(SettingsDelPersDataBrowsingHistory,"IDS_BR_BODY_BROWSING_HISTORY")
     ADD_TRAN(SettingsDelPersDataCache,"IDS_BR_OPT_CACHE")
-    ADD_TRAN(SettingsDelPersDataCookies,"IDS_BR_MBODY_COOKIES_AND_SITE_DATA")
+    ADD_TRAN(SettingsDelPersDataCookies,"IDS_BR_BODY_COOKIES_AND_SITE_DATA_ABB")
     ADD_TRAN(SettingsDelPersDataPasswords,"IDS_BR_OPT_PASSWORDS")
     ADD_TRAN(SettingsDelPersDataAutoFillData,"IDS_BR_OPT_AUTO_FILL_DATA")
     ADD_TRAN(SettingsDelPersDataLocationData,"IDS_BR_OPT_LOCATION_ACCESS_DATA")
     ADD_TRAN(SettingsAutoFillProfileTitle,"IDS_BR_MBODY_MY_AUTO_FILL_PROFILE")
     ADD_TRAN(SettingsAutoFillProfileSetMyProfile,"IDS_BR_MBODY_SET_MY_PROFILE")
-    ADD_TRAN(SettingsHomePageTitle,"IDS_BR_HEADER_HOME_PAGE_ABB")
-    ADD_TRAN(SettingsHomePageCurrentPage,"IDS_BR_MBODY_CURRENT_PAGE")
-    ADD_TRAN(SettingsHomePageDefault,"IDS_BR_MBODY_DEFAULT_M_PAGE")
-    ADD_TRAN(SettingsHomePageOther,"IDS_BR_MBODY_OTHER_M_CUSTOM")
+    ADD_TRAN(SettingsHomePageTitle,"IDS_BR_BUTTON_HOMEPAGE_ABB")
+    ADD_TRAN(SettingsHomePageCurrentPage,"IDS_BR_BODY_CURRENT_PAGE")
+    ADD_TRAN(SettingsHomePageDefault,"IDS_BR_BODY_DEFAULT")
+    ADD_TRAN(SettingsHomePageOther,"IDS_BR_BODY_OTHER_ABB")
     ADD_TRAN(SettingsHomePageMostVisited,"IDS_BR_MBODY_MOST_VISITED_WEBSITES")
-    ADD_TRAN(SettingsHomePageQuickAccess,"IDS_BR_HEADER_QUICK_ACCESS")
+    ADD_TRAN(SettingsHomePageQuickAccess,"IDS_BR_HEADER_QUICK_ACCESS_ABB")
 };
 
 struct SearchEngineTranslation

diff --git a/services/SettingsUI/SettingsAFProfile.cpp b/services/SettingsUI/SettingsAFProfile.cpp
index b07eabe51b0829e05ef4ac6e95d3000822fd46df..2e57866510dceddba8f14a3feaa99bad6eb96de2 100644 (file)
--- a/services/SettingsUI/SettingsAFProfile.cpp
+++ b/services/SettingsUI/SettingsAFProfile.cpp
@@ -38,7 +38,7 @@ void SettingsAFProfile::updateButtonMap()
     ItemData profileName;
     m_profile = ewk_context_form_autofill_profile_get(ewk_context_default_get(), 1);
     if (!m_profile)
-        profileName.buttonText = Translations::SettingsAutoFillProfileSetMyProfile;
+        profileName.buttonText = _(Translations::SettingsAutoFillProfileSetMyProfile.c_str());
     else
         profileName.buttonText = ewk_autofill_profile_data_get(m_profile, EWK_PROFILE_NAME);
     m_buttonsMap[0] = profileName;
@@ -52,7 +52,7 @@ bool SettingsAFProfile::populateList(Evas_Object* genlist)
     m_naviframe->setLeftButtonVisible(false);
     m_naviframe->setRightButtonVisible(false);
     m_naviframe->setPrevButtonVisible(true);
-    m_naviframe->setTitle(Translations::SettingsAutoFillProfileTitle.c_str());
+    m_naviframe->setTitle(_(Translations::SettingsAutoFillProfileTitle.c_str()));
 
     elm_genlist_clear(genlist);
     appendGenlist(genlist, m_setting_item_class, &m_buttonsMap[0], _select_profile_cb);

diff --git a/services/SettingsUI/SettingsAdvanced.cpp b/services/SettingsUI/SettingsAdvanced.cpp
index 6239a0630ebb799b5998dd23f59d5c57ceda0427..f9febaa906ecade16a2d6ba07606fb4b290cc584 100644 (file)
--- a/services/SettingsUI/SettingsAdvanced.cpp
+++ b/services/SettingsUI/SettingsAdvanced.cpp
@@ -37,33 +37,33 @@ SettingsAdvanced::~SettingsAdvanced()
 void SettingsAdvanced::updateButtonMap()
 {
     ItemData enable_js;
-    enable_js.buttonText = Translations::SettingsAdvancedEnableJavaScript;
-    enable_js.subText = Translations::SettingsAdvancedEnableJavaScriptSub;
+    enable_js.buttonText = _(Translations::SettingsAdvancedEnableJavaScript.c_str());
+    enable_js.subText = _(Translations::SettingsAdvancedEnableJavaScriptSub.c_str());
     enable_js.sui = this;
     enable_js.id = ENABLE_JS;
 
     ItemData block_popups;
-    block_popups.buttonText = Translations::SettingsAdvancedBlockPopups;
-    block_popups.subText = Translations::SettingsAdvancedBlockPopupsSub;
+    block_popups.buttonText = _(Translations::SettingsAdvancedBlockPopups.c_str());
+    block_popups.subText = _(Translations::SettingsAdvancedBlockPopupsSub.c_str());
     block_popups.sui = this;
     block_popups.id = BLOCK_POPUPS;
 
     ItemData save_content;
-    save_content.buttonText = Translations::SettingsAdvancedSaveContent;
+    save_content.buttonText = _(Translations::SettingsAdvancedSaveContent.c_str());
     save_content.subText =  []() {
         auto sig =
             SPSC.getWebEngineSettingsParamString(
                 basic_webengine::WebEngineSettings::SAVE_CONTENT_LOCATION);
         return (sig && !sig->empty()) ?
-            *sig :
-            Translations::Device;
+            _(sig->c_str()) :
+            _(Translations::Device.c_str());
     }();
     save_content.sui = this;
     save_content.id = SAVE_CONTENT;
 
     ItemData manage_web_data;
-    manage_web_data.buttonText = Translations::SettingsAdvancedManageWebsiteData;
-    manage_web_data.subText = Translations::SettingsAdvancedManageWebsiteDataSub;
+    manage_web_data.buttonText = _(Translations::SettingsAdvancedManageWebsiteData.c_str());
+    manage_web_data.subText = _(Translations::SettingsAdvancedManageWebsiteDataSub.c_str());
     manage_web_data.sui = this;
     manage_web_data.id = MANAGE_WEB_DATA;
 
@@ -89,7 +89,7 @@ void SettingsAdvanced::changeGenlistStorage()
 
     if (mmc_mode == VCONFKEY_SYSMAN_MMC_REMOVED) {
         setContentDestination(
-            static_cast<std::underlying_type_t<RadioButtons>>(RadioButtons::DEVICE));
+            static_cast<std::underlying_type_t<RadioButtons> >(RadioButtons::DEVICE));
         elm_object_item_disabled_set(m_genlistItems[SettingsAdvancedOptions::SAVE_CONTENT], EINA_TRUE);
     } else
         elm_object_item_disabled_set(m_genlistItems[SettingsAdvancedOptions::SAVE_CONTENT], EINA_FALSE);
@@ -112,7 +112,7 @@ bool SettingsAdvanced::populateList(Evas_Object* genlist)
     m_naviframe->setLeftButtonVisible(false);
     m_naviframe->setRightButtonVisible(false);
     m_naviframe->setPrevButtonVisible(true);
-    m_naviframe->setTitle(Translations::SettingsAdvancedTitle.c_str());
+    m_naviframe->setTitle(_(Translations::SettingsAdvancedTitle.c_str()));
 
     m_genlistItems[SettingsAdvancedOptions::ENABLE_JS] =
         appendGenlist(genlist, m_setting_check_on_of_item_class, &m_buttonsMap[SettingsAdvancedOptions::ENABLE_JS], _enable_js_cb);
@@ -240,20 +240,22 @@ void SettingsAdvanced::setContentDestination(int button)
 
     switch (static_cast<RadioButtons>(button)) {
         case RadioButtons::DEVICE:
-            m_buttonsMap[SettingsAdvancedOptions::SAVE_CONTENT].subText = Translations::Device;
+            m_buttonsMap[SettingsAdvancedOptions::SAVE_CONTENT].subText = _(Translations::Device.c_str());
             setStorageType(SettingsStorageType::DEVICE);
+            SPSC.setWebEngineSettingsParamString(
+                basic_webengine::WebEngineSettings::SAVE_CONTENT_LOCATION,
+                Translations::Device);
             break;
         case RadioButtons::SD_CARD:
-            m_buttonsMap[SettingsAdvancedOptions::SAVE_CONTENT].subText = Translations::SDCard;
+            m_buttonsMap[SettingsAdvancedOptions::SAVE_CONTENT].subText = _(Translations::SDCard.c_str());
             setStorageType(SettingsStorageType::SD_CARD);
+            SPSC.setWebEngineSettingsParamString(
+                basic_webengine::WebEngineSettings::SAVE_CONTENT_LOCATION,
+                Translations::SDCard);
             break;
         default:
             return;
     }
-
-    SPSC.setWebEngineSettingsParamString(
-        basic_webengine::WebEngineSettings::SAVE_CONTENT_LOCATION,
-        m_buttonsMap[SettingsAdvancedOptions::SAVE_CONTENT].subText);
     elm_genlist_item_update(m_genlistItems[SAVE_CONTENT]);
 }
 }

diff --git a/services/SettingsUI/SettingsDelPersData.cpp b/services/SettingsUI/SettingsDelPersData.cpp
index 8e10479861df0a86aca43c2402b6db09e50f4439..8e91b76ca58f461878ad630611b80f47f3dfbd59 100644 (file)
--- a/services/SettingsUI/SettingsDelPersData.cpp
+++ b/services/SettingsUI/SettingsDelPersData.cpp
@@ -35,37 +35,37 @@ void SettingsDelPersData::updateButtonMap()
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     // TODO Missing translations
     ItemData selectAll;
-    selectAll.buttonText = Translations::SettingsDelPersDataSelectAll;
+    selectAll.buttonText = _(Translations::SettingsDelPersDataSelectAll.c_str());
     selectAll.sui = this;
     selectAll.id = SELECT_ALL;
 
     ItemData browsHistory;
-    browsHistory.buttonText = Translations::SettingsDelPersDataBrowsingHistory;
+    browsHistory.buttonText = _(Translations::SettingsDelPersDataBrowsingHistory.c_str());
     browsHistory.sui = this;
     browsHistory.id = BROWSING_HISTORY;
 
     ItemData cache;
-    cache.buttonText = Translations::SettingsDelPersDataCache;
+    cache.buttonText = _(Translations::SettingsDelPersDataCache.c_str());
     cache.sui = this;
     cache.id = CACHE;
 
     ItemData cookies;
-    cookies.buttonText = Translations::SettingsDelPersDataCookies;
+    cookies.buttonText = _(Translations::SettingsDelPersDataCookies.c_str());
     cookies.sui = this;
     cookies.id = COOKIES_AND_SITE;
 
     ItemData pass;
-    pass.buttonText = Translations::SettingsDelPersDataPasswords;
+    pass.buttonText = _(Translations::SettingsDelPersDataPasswords.c_str());
     pass.sui = this;
     pass.id = PASSWORDS;
 
     ItemData autofill;
-    autofill.buttonText = Translations::SettingsDelPersDataAutoFillData;
+    autofill.buttonText = _(Translations::SettingsDelPersDataAutoFillData.c_str());
     autofill.sui = this;
     autofill.id = DEL_PERS_AUTO_FILL;
 
     ItemData loc;
-    loc.buttonText = Translations::SettingsDelPersDataLocationData;
+    loc.buttonText = _(Translations::SettingsDelPersDataLocationData.c_str());
     loc.sui = this;
     loc.id = LOCATION;
 
@@ -80,15 +80,15 @@ void SettingsDelPersData::updateButtonMap()
 
 bool SettingsDelPersData::populateList(Evas_Object* genlist)
 {
-    m_naviframe->setTitle(Translations::SettingsDelPersDataTitle.c_str());
+    m_naviframe->setTitle(_(Translations::SettingsDelPersDataTitle.c_str()));
 
     m_naviframe->addLeftButton(__cancel_button_cb, this);
     m_naviframe->addRightButton(__delete_button_cb, this);
     m_naviframe->setPrevButtonVisible(false);
     m_naviframe->setLeftButtonVisible(true);
     m_naviframe->setRightButtonVisible(true);
-    m_naviframe->setRightButtonText(Translations::SettingsDelPersDataDelete.c_str());
-    m_naviframe->setLeftButtonText(Translations::SettingsDelPersDataCancel.c_str());
+    m_naviframe->setRightButtonText(_(Translations::SettingsDelPersDataDelete.c_str()));
+    m_naviframe->setLeftButtonText(_(Translations::SettingsDelPersDataCancel.c_str()));
 
     appendGenlist(genlist, m_setting_check_normal_item_class, &m_buttonsMap[SettingsDelPersDataOptions::SELECT_ALL], nullptr);
     appendGenlist(genlist, m_setting_check_normal_item_class, &m_buttonsMap[SettingsDelPersDataOptions::BROWSING_HISTORY], nullptr);

diff --git a/services/SettingsUI/SettingsHomePage.cpp b/services/SettingsUI/SettingsHomePage.cpp
index 6583bc943ca135b7dbd60b93c58e99d9b8e1befd..35676deec68f494c87b1f2af89bfc22e77892756 100644 (file)
--- a/services/SettingsUI/SettingsHomePage.cpp
+++ b/services/SettingsUI/SettingsHomePage.cpp
@@ -20,10 +20,10 @@ namespace tizen_browser{
 namespace base_ui{
 
 const std::string SettingsHomePage::DEF_HOME_PAGE = Translations::SamsungPage;
-const std::string SettingsHomePage::QUICK_PAGE = Translations::QuickPage;
-const std::string SettingsHomePage::MOST_VISITED_PAGE = Translations::MostVisitedPage;
-const std::string SettingsHomePage::OTHER_PAGE = Translations::OtherPage;
-const std::string SettingsHomePage::CURRENT_PAGE = Translations::CurrentPage;
+const std::string SettingsHomePage::QUICK_PAGE = _(Translations::QuickPage.c_str());
+const std::string SettingsHomePage::MOST_VISITED_PAGE = _(Translations::MostVisitedPage.c_str());
+const std::string SettingsHomePage::OTHER_PAGE = _(Translations::OtherPage.c_str());
+const std::string SettingsHomePage::CURRENT_PAGE = _(Translations::CurrentPage.c_str());
 
 SettingsHomePage::SettingsHomePage(Evas_Object* parent)
 {
@@ -49,33 +49,33 @@ void SettingsHomePage::updateButtonMap()
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     ItemData defaultPage;
-    defaultPage.buttonText = Translations::SettingsHomePageDefault;
+    defaultPage.buttonText = _(Translations::SettingsHomePageDefault.c_str());
     defaultPage.subText = DEF_HOME_PAGE;
     defaultPage.sui = this;
     defaultPage.id = DEFAULT;
 
     ItemData current;
-    current.buttonText = Translations::SettingsHomePageCurrentPage;
+    current.buttonText = _(Translations::SettingsHomePageCurrentPage.c_str());
     current.subText = getCurrentPage();
     current.sui = this;
     current.id = CURRENT;
 
     ItemData quick;
-    quick.buttonText = Translations::SettingsHomePageQuickAccess;
+    quick.buttonText = _(Translations::SettingsHomePageQuickAccess.c_str());
     quick.sui = this;
     quick.id = QUICK_ACCESS;
 
     ItemData most;
-    most.buttonText = Translations::SettingsHomePageMostVisited;
+    most.buttonText = _(Translations::SettingsHomePageMostVisited.c_str());
     most.sui = this;
     most.id = MOST_VIS;
 
     ItemData other;
-    other.buttonText = Translations::SettingsHomePageOther;
+    other.buttonText = _(Translations::SettingsHomePageOther.c_str());
     other.subText = [this]() -> std::string {
         auto sig = SPSC.getWebEngineSettingsParamString(
             basic_webengine::WebEngineSettings::CURRENT_HOME_PAGE);
-        auto otherPage = (sig && !sig->empty()) ? *sig : Translations::SamsungPage;
+        auto otherPage = (sig && !sig->empty()) ? *sig : _(Translations::SamsungPage.c_str());
 
         if (!otherPage.compare(QUICK_PAGE) ||
             !otherPage.compare(MOST_VISITED_PAGE) ||
@@ -125,7 +125,7 @@ bool SettingsHomePage::populateList(Evas_Object* genlist)
     m_naviframe->setLeftButtonVisible(false);
     m_naviframe->setRightButtonVisible(false);
     m_naviframe->setPrevButtonVisible(true);
-    m_naviframe->setTitle(Translations::SettingsHomePageTitle.c_str());
+    m_naviframe->setTitle(_(Translations::SettingsHomePageTitle.c_str()));
 
     updateButtonMap();
     m_itemsMap[SettingsHomePageOptions::DEFAULT] =

diff --git a/services/SettingsUI/SettingsMain.cpp b/services/SettingsUI/SettingsMain.cpp
index 8dc8e0802193c15707d1817da91cfa603fbb8a46..0772908d59be532c86e36d2b7df67ae86b1ae4d1 100644 (file)
--- a/services/SettingsUI/SettingsMain.cpp
+++ b/services/SettingsUI/SettingsMain.cpp
@@ -34,13 +34,13 @@ SettingsMain::~SettingsMain()
 void SettingsMain::updateButtonMap()
 {
     ItemData homePage;
-    homePage.buttonText = Translations::SettingsMainHomePage;
-    homePage.subText = Translations::SettingsMainHomePageDefault;
+    homePage.buttonText = _(Translations::SettingsMainHomePage.c_str());
+    homePage.subText = _(Translations::SettingsMainHomePageDefault.c_str());
     homePage.sui = this;
     homePage.id = HOME;
 
     ItemData search;
-    search.buttonText = Translations::SettingsMainDefaultSearchEngine;
+    search.buttonText = _(Translations::SettingsMainDefaultSearchEngine.c_str());
     search.subText =  []() -> std::string {
         auto sig =
             SPSC.getWebEngineSettingsParamString(
@@ -53,24 +53,24 @@ void SettingsMain::updateButtonMap()
     search.id = SEARCH;
 
     ItemData autofill;
-    autofill.buttonText = Translations::SettingsMainAutoFillProfiles;
-    autofill.subText = Translations::SettingsMainAutoFillProfilesSub;
+    autofill.buttonText = _(Translations::SettingsMainAutoFillProfiles.c_str());
+    autofill.subText = _(Translations::SettingsMainAutoFillProfilesSub.c_str());
     autofill.sui = this;
     autofill.id = AUTO_FILL_PROFILE;
 
     ItemData zoom;
-    zoom.buttonText = Translations::SettingsMainManualZoom;
-    zoom.subText = Translations::SettingsMainManualZoomSub;
+    zoom.buttonText = _(Translations::SettingsMainManualZoom.c_str());
+    zoom.subText = _(Translations::SettingsMainManualZoomSub.c_str());
     zoom.sui = this;
     zoom.id = ZOOM;
 
     ItemData privacy;
-    privacy.buttonText = Translations::SettingsMainPrivacy;
+    privacy.buttonText = _(Translations::SettingsMainPrivacy.c_str());
     privacy.sui = this;
     privacy.id = PRIVACY;
 
     ItemData advanced;
-    advanced.buttonText = Translations::SettingsMainAdvanced;
+    advanced.buttonText = _(Translations::SettingsMainAdvanced.c_str());
     advanced.sui = this;
     advanced.id = ADVANCED;
 
@@ -91,7 +91,7 @@ bool SettingsMain::populateList(Evas_Object* genlist)
     m_naviframe->setLeftButtonVisible(false);
     m_naviframe->setRightButtonVisible(false);
     m_naviframe->setPrevButtonVisible(true);
-    m_naviframe->setTitle(Translations::SettingsMainTitle.c_str());
+    m_naviframe->setTitle(_(Translations::SettingsMainTitle.c_str()));
 
     updateButtonMap();
     m_genlistItems[SettingsMainOptions::HOME] =

diff --git a/services/SettingsUI/SettingsPrivacy.cpp b/services/SettingsUI/SettingsPrivacy.cpp
index 2740bd681c573b14079ead8777a8ed268e0c5d9f..f7757de53a532ef11874d0d203772426e588788c 100644 (file)
--- a/services/SettingsUI/SettingsPrivacy.cpp
+++ b/services/SettingsUI/SettingsPrivacy.cpp
@@ -35,22 +35,22 @@ SettingsPrivacy::~SettingsPrivacy()
 void SettingsPrivacy::updateButtonMap()
 {
     ItemData cookies;
-    cookies.buttonText = Translations::SettingsPrivacyAcceptCookies;
-    cookies.subText = Translations::SettingsPrivacyAcceptCookiesSub;
+    cookies.buttonText = _(Translations::SettingsPrivacyAcceptCookies.c_str());
+    cookies.subText = _(Translations::SettingsPrivacyAcceptCookiesSub.c_str());
     cookies.sui = this;
 
     ItemData suggestions;
-    suggestions.buttonText = Translations::SettingsPrivacySuggestSearches;
-    suggestions.subText = Translations::SettingsPrivacySuggestSearchesSub;
+    suggestions.buttonText = _(Translations::SettingsPrivacySuggestSearches.c_str());
+    suggestions.subText = _(Translations::SettingsPrivacySuggestSearchesSub.c_str());
     suggestions.sui = this;
 
     ItemData signIn;
-    signIn.buttonText = Translations::SettingsPrivacySaveSigninInfo;
-    signIn.subText = Translations::SettingsPrivacySaveSigninInfo;
+    signIn.buttonText = _(Translations::SettingsPrivacySaveSigninInfo.c_str());
+    signIn.subText = _(Translations::SettingsPrivacySaveSigninInfo.c_str());
     signIn.sui = this;
 
     ItemData delPerData;
-    delPerData.buttonText = Translations::SettingsPrivacyDeletePersonalData;
+    delPerData.buttonText = _(Translations::SettingsPrivacyDeletePersonalData.c_str());
     delPerData.sui = this;
 
     m_buttonsMap[SettingsPrivacyOptions::COOKIES] = cookies;
@@ -64,7 +64,7 @@ bool SettingsPrivacy::populateList(Evas_Object* genlist)
     m_naviframe->setLeftButtonVisible(false);
     m_naviframe->setRightButtonVisible(false);
     m_naviframe->setPrevButtonVisible(true);
-    m_naviframe->setTitle(Translations::SettingsPrivacyTitle.c_str());
+    m_naviframe->setTitle(_(Translations::SettingsPrivacyTitle.c_str()));
 
     appendGenlist(genlist, m_setting_check_on_of_item_class, &m_buttonsMap[SettingsPrivacyOptions::COOKIES], _cookies_cb);
     appendGenlist(genlist, m_setting_check_on_of_item_class, &m_buttonsMap[SettingsPrivacyOptions::SUGGESTIONS], _suggestions_cb);

diff --git a/services/SimpleUI/SimpleUI.cpp b/services/SimpleUI/SimpleUI.cpp
index c2670decb5e682a842826a64dd236517f67f75a6..d4e0d9a7fa011d14e1bc4997d53a6ecbff23f007 100755 (executable)
--- a/services/SimpleUI/SimpleUI.cpp
+++ b/services/SimpleUI/SimpleUI.cpp
@@ -1490,7 +1490,7 @@ void SimpleUI::onDefSearchEngineClicked()
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
 
     auto popup = RadioPopup::createPopup(m_viewManager.getContent());
-    popup->setTitle(Translations::SettingsDefaultSearchEngineTitle);
+    popup->setTitle(_(Translations::SettingsDefaultSearchEngineTitle.c_str()));
     popup->addRadio(RadioButtons::GOOGLE);
     popup->addRadio(RadioButtons::YAHOO);
     popup->addRadio(RadioButtons::BING);
@@ -1521,7 +1521,7 @@ void SimpleUI::onSaveContentToClicked()
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
 
     auto popup = RadioPopup::createPopup(m_viewManager.getContent());
-    popup->setTitle(Translations::SettingsAdvancedSaveContentTitle);
+    popup->setTitle(_(Translations::SettingsAdvancedSaveContentTitle.c_str()));
     popup->addRadio(RadioButtons::DEVICE);
     popup->addRadio(RadioButtons::SD_CARD);
     auto stateString = []() -> std::string {