Merge from tizen_2.1

[framework/osp/web.git] / src / controls / FWebCtrl_CertificateConfirmPopup.cpp

diff --git a/src/controls/FWebCtrl_CertificateConfirmPopup.cpp b/src/controls/FWebCtrl_CertificateConfirmPopup.cpp
index 8bfebb5..5a0dcd8 100755 (executable)
--- a/src/controls/FWebCtrl_CertificateConfirmPopup.cpp
+++ b/src/controls/FWebCtrl_CertificateConfirmPopup.cpp
@@ -34,6 +34,7 @@
 #include <FUiLayout.h>
 #include <FUiVerticalBoxLayout.h>
 #include <FIo_DatabaseImpl.h>
+#include <FSys_SystemResource.h>
 #include <FUi_ControlManager.h>
 #include <FUi_ResourceManager.h>
 #include "FWebCtrl_CertificateConfirmPopup.h"
@@ -47,6 +48,7 @@ using namespace Tizen::Base::Utility;
 using namespace Tizen::Graphics;
 using namespace Tizen::Io;
 using namespace Tizen::Security::Cert;
+using namespace Tizen::System;
 using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 
@@ -74,6 +76,9 @@ _CertificateConfirmPopup::Construct(_CertificatePopupMode certPopupMode, Ewk_Cer
        SysTryReturnResult(NID_WEB_CTRL, pPolicy, E_INVALID_ARG, "Certificate Policy pointer is null.");
        result r = E_SUCCESS;
 
+       _SystemResource* pSysResource = _SystemResource::GetInstance();
+       SysAssertf(pSysResource != null, "Failed to get _SystemResource instance");
+
        _WebPopupData* pPopupData = _WebPopup::GetPopupData();
        SysTryReturn(NID_WEB_CTRL, pPopupData, r = GetLastResult(), r, "[%s] Propagating.", GetErrorMessage(r));
 
@@ -93,18 +98,18 @@ _CertificateConfirmPopup::Construct(_CertificatePopupMode certPopupMode, Ewk_Cer
 
        if( __certPopupMode == CERTIFICATE_POPUP_MODE_VIEW )
        {
-               titleText = L"Certificate";
+               titleText = pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_BODY_CERTIFICATES");
                popupMaxHeight = pPopupData->popupDim.height;
 
                rect.height = pPopupData->popupDim.height - 4*pPopupData->sideMargin - 2*pPopupData->btnDim.height;
                rect.width = pPopupData->labelDim.width;
 
                idList.Add(*(new Integer(ID_BUTTON_CERTIFICATE_CLOSE)));
-               titleList.Add(*(new String(L"Close")));
+               titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_COM_SK_DONE"))));
        }
        else    // CERTIFICATE_POPUP_MODE_CONFIRM
        {
-               titleText = L"Security Warning";
+               titleText = pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_SECURITY_WARNING");
                popupMaxHeight = 2*pPopupData->labelDim.height + 2*pPopupData->btnDim.height + 6*pPopupData->sideMargin;
 
                rect.height = 2*pPopupData->labelDim.height;
@@ -114,9 +119,9 @@ _CertificateConfirmPopup::Construct(_CertificatePopupMode certPopupMode, Ewk_Cer
                idList.Add(*(new Integer(ID_BUTTON_CERTIFICATE_VIEW)));
                idList.Add(*(new Integer(ID_BUTTON_CERTIFICATE_CANCEL)));
 
-               titleList.Add(*(new String(L"Allow")));
-               titleList.Add(*(new String(L"View")));
-               titleList.Add(*(new String(L"Cancel")));
+               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_BR_OPT_VIEW"))));
+               titleList.Add(*(new String(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_OPT_CANCEL"))));
        }
 
        r = _WebPopup::Construct(true, Dimension(pPopupData->popupDim.width, popupMaxHeight));
@@ -160,7 +165,8 @@ _CertificateConfirmPopup::Construct(_CertificatePopupMode certPopupMode, Ewk_Cer
                SysTryReturnResult(NID_WEB_CTRL, pLabel.get(), E_OUT_OF_MEMORY, "Memory Allocation failed.");
 
                String message = L"";
-               message = L"There are problems with the security certificate of this site.\n";
+               message = pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_BODY_SECURITY_CERTIFICATE_PROBLEM_MSG");
+               message.Append(L"\n");
                message.Append(ewk_certificate_policy_decision_url_get(__pCertificatePolicyData));
 
                r = pLabel->Construct(rect, message);
@@ -289,6 +295,9 @@ _CertificateConfirmPopup::GenerateCertifiate(String& certString)
 {
        SysTryReturnResult(NID_WEB_CTRL, __pCertificatePolicyData, E_INVALID_ARG, "Certificate Policy pointer is null.");
 
+       _SystemResource* pSysResource = _SystemResource::GetInstance();
+       SysAssertf(pSysResource != null, "Failed to get _SystemResource instance");
+
        String pemString(ewk_certificate_policy_decision_certificate_pem_get(__pCertificatePolicyData));
        std::unique_ptr<ByteBuffer> pByteBuf(StringUtil::StringToUtf8N(pemString));
        SysTryReturnResult(NID_WEB_CTRL, pByteBuf.get(), E_INVALID_DATA, "Certificate pem information is Empty.");
@@ -298,45 +307,59 @@ _CertificateConfirmPopup::GenerateCertifiate(String& certString)
        SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
        //Issued to
-       certString.Append(L"ISSUED TO:\n\n");
+       certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_ISSUED_TO_C"));
+       certString.Append(L"\n\n");
        String subject = certificate.GetSubject();
 
-       certString.Append(L"Common Name:\n");
+       certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_COMMON_NAME_C"));
+       certString.Append(L"\n");
        certString.Append(GetStringOfToken(subject, L"/CN=") + L"\n");
 
-       certString.Append(L"Organization:\n");
+       certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_ORGANIZATION_C"));
+       certString.Append(L"\n");
        certString.Append(GetStringOfToken(subject, L"/O=") + L"\n");
 
-       certString.Append(L"Organizational Unit:\n");
+       certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP ,"IDS_BR_HEADER_ORGANIZATIONAL_UNIT_C"));
+       certString.Append(L"\n");
        certString.Append(GetStringOfToken(subject, L"/OU=") + L"\n");
 
-       certString.Append(L"Serial Number:\n");
+       certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_BODY_CERTIFICATE_SERIAL_NUMBER"));
+       certString.Append(L":\n");
        certString.Append(certificate.GetSerialNumber() + L"\n\n\n");
 
        //Issued by
-       certString.Append(L"ISSUER:\n\n");
+       certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_ISSUED_BY_C"));
+       certString.Append(L"\n\n");
        String issuer = certificate.GetIssuer();
 
-       certString.Append(L"Common Name:\n");
+       certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_COMMON_NAME_C"));
+       certString.Append(L"\n");
        certString.Append(GetStringOfToken(issuer, L"/CN=") + L"\n");
 
-       certString.Append(L"Organization:\n");
+       certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_ORGANIZATION_C"));
+       certString.Append(L"\n");
        certString.Append(GetStringOfToken(issuer, L"/O=") + L"\n");
 
-       certString.Append(L"Organizational Unit:\n");
+       certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_ORGANIZATIONAL_UNIT_C"));
+       certString.Append(L"\n");
        certString.Append(GetStringOfToken(issuer, L"/OU=") + L"\n\n");
 
        //Validity
-       certString.Append(L"VALIDITY:\n\n");
-       certString.Append(L"Valid From:\n");
+       certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_HEADER_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");
        certString.Append(certificate.GetNotBefore() + L"\n\n");
 
-       certString.Append(L"Valid Till:\n");
+       certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_BODY_CERTIFICATE_VALID_TILL"));
+       certString.Append(L":\n");
        certString.Append(certificate.GetNotAfter() + L"\n\n\n");
 
        //FingerPrints
-       certString.Append(L"FINGERPRINTS:\n\n");
-       certString.Append(L"Signature Algorithm:\n");
+       certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_BODY_ROOTCERTIFICATES_FINGER_PRINT"));
+       certString.Append(L":\n\n");
+       certString.Append(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_BODY_SIGNATURE_ALGORITHM_VODA"));
+       certString.Append(L":\n");
        certString.Append(certificate.GetSignatureAlgorithm() + L"\n\n");
 
        std::unique_ptr<ByteBuffer> pFingerPrint(certificate.GetFingerprintN());