From 9fd4c5d9142597241c0f186169b8208cf86dd1d9 Mon Sep 17 00:00:00 2001 From: hyun lee Date: Wed, 7 Aug 2013 20:53:51 +0900 Subject: [PATCH] Apply string localization Change-Id: I946ac59c1580e9ec48e954745c23e6352f13019c Signed-off-by: hyun lee --- src/controls/FWebCtrl_AuthConfirmPopup.cpp | 10 +++---- src/controls/FWebCtrl_CertificateConfirmPopup.cpp | 36 +++++++++++------------ src/controls/FWebCtrl_InputPickerPopup.cpp | 2 +- src/controls/FWebCtrl_PromptPopup.cpp | 4 +-- src/controls/FWebCtrl_SelectBox.cpp | 4 +-- src/controls/FWebCtrl_UserConfirmPopup.cpp | 6 ++-- src/controls/FWebCtrl_WebImpl.cpp | 2 +- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/controls/FWebCtrl_AuthConfirmPopup.cpp b/src/controls/FWebCtrl_AuthConfirmPopup.cpp index 5101ad1..de447c4 100755 --- a/src/controls/FWebCtrl_AuthConfirmPopup.cpp +++ b/src/controls/FWebCtrl_AuthConfirmPopup.cpp @@ -93,7 +93,7 @@ _AuthConfirmPopup::Construct(const String& host, const String& realm, Authentica r = _WebPopup::Construct(true, Dimension(rect.width, rect.height)); SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - SetTitleText(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_BODY_DESTINATIONS_AUTHENTICATION_REQUIRED")); + SetTitleText(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_HEADER_ENTER_CREDENTIALS_ABB")); //host realm label rect.height = 2*pPopupData->labelDim.height; @@ -127,7 +127,7 @@ _AuthConfirmPopup::Construct(const String& host, const String& realm, Authentica r = pIdEditField->Construct(rect, EDIT_FIELD_STYLE_NORMAL); SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - pIdEditField->SetGuideText(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_BODY_AUTHUSERNAME")); + pIdEditField->SetGuideText(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_WIFI_BODY_ENTER_YOUR_ID")); pIdEditField->SetGuideTextColor(Color::GetColor(COLOR_ID_GREY)); pIdEditField->SetTextSize(EDIT_TEXT_SIZE);; @@ -142,7 +142,7 @@ _AuthConfirmPopup::Construct(const String& host, const String& realm, Authentica r = pPwdEditField->Construct(rect, EDIT_FIELD_STYLE_PASSWORD); SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - pPwdEditField->SetGuideText(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_BODY_AUTHPASSWORD")); + pPwdEditField->SetGuideText(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BODY_ENTER_YOUR_PASSWORD_ABB")); pPwdEditField->SetGuideTextColor(Color::GetColor(COLOR_ID_GREY)); pPwdEditField->SetTextSize(EDIT_TEXT_SIZE);; @@ -165,8 +165,8 @@ _AuthConfirmPopup::Construct(const String& host, const String& realm, Authentica ArrayList titleList; r = titleList.Construct(); SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_COM_SK_CANCEL")))); - titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_COM_BUTTON_LOGIN")))); + titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BUTTON_CANCEL_ABB")))); + titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BUTTON_CONTINUE_ABB")))); r = CreateAndAddButtons(idList, titleList, pButtonPanel); SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); diff --git a/src/controls/FWebCtrl_CertificateConfirmPopup.cpp b/src/controls/FWebCtrl_CertificateConfirmPopup.cpp index d03d6e0..52d9ba9 100755 --- a/src/controls/FWebCtrl_CertificateConfirmPopup.cpp +++ b/src/controls/FWebCtrl_CertificateConfirmPopup.cpp @@ -111,18 +111,18 @@ _CertificateConfirmPopup::Construct(_CertificatePopupMode certPopupMode, Ewk_Cer if( __certPopupMode == CERTIFICATE_POPUP_MODE_VIEW ) { - titleText = pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_BODY_CERTIFICATES"); + titleText = pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_HEADER_SECURITY_CERTIFICATE_ABB"); popupMaxHeight = 4*pPopupData->labelDim.height + pPopupData->btnDim.height + 2*pPopupData->sideMargin; rect.height = 4*pPopupData->labelDim.height; rect.width = pPopupData->labelDim.width; idList.Add(*(new Integer(ID_BUTTON_CERTIFICATE_CLOSE))); - titleList.Add(*(new String(pSysResource->GetString("sys_string", "IDS_COM_BODY_DONE")))); + titleList.Add(*(new String(pSysResource->GetString("sys_string", "IDS_TPLATFORM_BUTTON_OK")))); } else // CERTIFICATE_POPUP_MODE_CONFIRM { - titleText = pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_SECURITY_WARNING"); + titleText = pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_HEADER_SECURITY_WARNING_ABB"); popupMaxHeight = 2*pPopupData->labelDim.height + pPopupData->btnDim.height + 2*pPopupData->sideMargin; rect.height = 2*pPopupData->labelDim.height; @@ -132,9 +132,9 @@ _CertificateConfirmPopup::Construct(_CertificatePopupMode certPopupMode, Ewk_Cer idList.Add(*(new Integer(ID_BUTTON_CERTIFICATE_VIEW))); idList.Add(*(new Integer(ID_BUTTON_CERTIFICATE_ALLOW))); - titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_OPT_CANCEL")))); - titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_OPT_VIEW")))); - titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_OPT_ALLOW")))); + titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BUTTON_CANCEL_ABB")))); + titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BUTTON2_VIEW_CERTIFICATE")))); + titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BUTTON_CONTINUE_ABB")))); } r = _WebPopup::Construct(true, Dimension(pPopupData->popupDim.width, popupMaxHeight)); @@ -178,7 +178,7 @@ _CertificateConfirmPopup::Construct(_CertificatePopupMode certPopupMode, Ewk_Cer SysTryReturnResult(NID_WEB_CTRL, pLabel.get(), E_OUT_OF_MEMORY, "Memory Allocation failed."); String message = L""; - message = pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_BODY_SECURITY_CERTIFICATE_PROBLEM_MSG"); + message = pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BODY_THERE_ARE_PROBLEMS_WITH_THE_SECURITY_CERTIFICATE_FOR_THIS_SITE_C"); message.Append(L"\n"); message.Append(ewk_certificate_policy_decision_url_get(__pCertificatePolicyData)); @@ -385,45 +385,45 @@ _CertificateConfirmPopup::GenerateCertifiate(String& certString) SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); //Issued to - certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_ISSUED_TO_C")); + certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BODY_ISSUED_TO_C")); certString.Append(L"\n\n"); String subject = certificate.GetSubject(); - certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_COMMON_NAME_C")); + certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BODY_COMMON_NAME_C")); certString.Append(L"\n"); certString.Append(GetStringOfToken(subject, L"/CN=") + L"\n"); - certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_ORGANIZATION_C")); + certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BODY_ORGANISATION_C")); certString.Append(L"\n"); certString.Append(GetStringOfToken(subject, L"/O=") + L"\n"); - certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP ,"IDS_BR_HEADER_ORGANIZATIONAL_UNIT_C")); + certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP ,"IDS_TPLATFORM_BODY_ORGANISATIONAL_UNIT_C")); certString.Append(L"\n"); certString.Append(GetStringOfToken(subject, L"/OU=") + L"\n"); - certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_BODY_CERTIFICATE_SERIAL_NUMBER")); + certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BODY_SERIAL_NUMBER_C")); certString.Append(L":\n"); certString.Append(certificate.GetSerialNumber() + L"\n\n\n"); //Issued by - certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_ISSUED_BY_C")); + certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BODY_ISSUED_BY_C")); certString.Append(L"\n\n"); String issuer = certificate.GetIssuer(); - certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_COMMON_NAME_C")); + certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BODY_COMMON_NAME_C")); certString.Append(L"\n"); certString.Append(GetStringOfToken(issuer, L"/CN=") + L"\n"); - certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_ORGANIZATION_C")); + certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BODY_ORGANISATION_C")); certString.Append(L"\n"); certString.Append(GetStringOfToken(issuer, L"/O=") + L"\n"); - certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_ORGANIZATIONAL_UNIT_C")); + certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BODY_ORGANISATIONAL_UNIT_C")); certString.Append(L"\n"); certString.Append(GetStringOfToken(issuer, L"/OU=") + L"\n\n"); //Validity - certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_VALIDITY_C")); + certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BODY_VALIDITY_C")); certString.Append(L"\n\n"); certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_POP_CERTI_VALID_FROM_C")); certString.Append(L"\n"); @@ -434,7 +434,7 @@ _CertificateConfirmPopup::GenerateCertifiate(String& certString) certString.Append(certificate.GetNotAfter() + L"\n\n\n"); //FingerPrints - certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_BODY_ROOTCERTIFICATES_FINGER_PRINT")); + certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_TPLATFORM_BODY_FINGERPRINTS_C")); certString.Append(L":\n\n"); certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_BODY_SIGNATURE_ALGORITHM_VODA")); certString.Append(L":\n"); diff --git a/src/controls/FWebCtrl_InputPickerPopup.cpp b/src/controls/FWebCtrl_InputPickerPopup.cpp index e4bcc5a..0826358 100755 --- a/src/controls/FWebCtrl_InputPickerPopup.cpp +++ b/src/controls/FWebCtrl_InputPickerPopup.cpp @@ -323,7 +323,7 @@ _InputPickerPopup::AddButton(_InputPickerButtonId buttonId) _SystemResource* pSysResource = _SystemResource::GetInstance(); SysAssertf(pSysResource != null, "Failed to get _SystemResource instance"); - buttonStr = pSysResource->GetString("sys_string", "IDS_COM_SK_OK"); + buttonStr = pSysResource->GetString("sys_string", "IDS_TPLATFORM_BUTTON_OK"); std::unique_ptr