Add support for IDS string mapping.

Change-Id: Ib98e52ef987be07a61ea9d40a8e142f2232378c4
Signed-off-by: k2.nagaraju <k2.nagaraju@samsung.com>

diff --git a/atom/app/atom_main_delegate.cc b/atom/app/atom_main_delegate.cc
index 4bcafba22419fd8f0ff4fe8214c488743a962eda..96cd2fe5ff262bb5d809976ad44de04bf8c84fc7 100644 (file)
--- a/atom/app/atom_main_delegate.cc
+++ b/atom/app/atom_main_delegate.cc
@@ -27,6 +27,7 @@
 
 #if defined(OS_TIZEN)
 #include "atom/common/atom_command_line.h"
+#include "tizen_src/chromium_impl/content/common/locale_efl.h"
 #endif
 
 namespace atom {
@@ -121,6 +122,9 @@ bool AtomMainDelegate::BasicStartupComplete(int* exit_code) {
 }
 
 void AtomMainDelegate::PreSandboxStartup() {
+#if defined(OS_TIZEN)
+  LocaleEfl::Initialize();
+#endif
   brightray::MainDelegate::PreSandboxStartup();
 
   PathService::Override(base::FILE_EXE, base::FilePath("/usr/bin/wrt"));

diff --git a/atom/browser/atom_javascript_dialog_manager_efl.cc b/atom/browser/atom_javascript_dialog_manager_efl.cc
index 36cfe2c0d8044ada4436f39bf2ee57f53c8ff100..13a8bf3303a808761546d1c71aead9c097b06172 100644 (file)
--- a/atom/browser/atom_javascript_dialog_manager_efl.cc
+++ b/atom/browser/atom_javascript_dialog_manager_efl.cc
@@ -80,7 +80,7 @@ void AtomJavaScriptDialogManagerEfl::RunBeforeUnloadDialog(
   dialog_.reset(AtomJavaScriptModalDialogEfl::CreateDialogAndShow(
       web_contents, GURL(), AtomJavaScriptModalDialogEfl::NAVIGATION,
       base::UTF8ToUTF16(
-          std::string(dgettext("WebKit", "POP LEAVE"))),
+          std::string(dgettext("WebKit", "IDS_WEBVIEW_POP_LEAVE_THIS_PAGE_Q"))),
       base::string16(), callback));
 }
 

diff --git a/atom/browser/atom_javascript_modal_dialog_efl.cc b/atom/browser/atom_javascript_modal_dialog_efl.cc
index 3343de0a4e85839fcea484ff408ab0ae8161d386..83d1626f6a316f75533413c1d4bb144837ee97ae 100644 (file)
--- a/atom/browser/atom_javascript_modal_dialog_efl.cc
+++ b/atom/browser/atom_javascript_modal_dialog_efl.cc
@@ -206,10 +206,10 @@ bool AtomJavaScriptModalDialogEfl::CreatePromptLayout() {
   elm_object_part_content_set(layout, "prompt_container", prompt_entry_);
 
   elm_object_content_set(popup_, layout);
-  Evas_Object* cancel_btn = AddButton("CANCEL",
+  Evas_Object* cancel_btn = AddButton("IDS_WEBVIEW_BUTTON_CANCEL_ABB4",
                                       "button1", CancelButtonCallback);
   Evas_Object* ok_btn =
-      AddButton("OK", "button2", OkButtonCallback);
+      AddButton("IDS_WEBVIEW_BUTTON_OK_ABB4", "button2", OkButtonCallback);
   if (!cancel_btn || !ok_btn)
     return false;
 
@@ -223,7 +223,7 @@ bool AtomJavaScriptModalDialogEfl::CreateNavigationLayout() {
                              UTF16ToUTF8(message_text_).c_str());
   }
 
-  std::string question(dgettext("WebKit", "POP LEAVE"));
+  std::string question(dgettext("WebKit", "IDS_WEBVIEW_POP_LEAVE_THIS_PAGE_Q"));
   std::string message;
   if (default_prompt_text_.c_str()) {
     message = std::string(UTF16ToUTF8(default_prompt_text_).c_str()) + ("\n") +
@@ -236,9 +236,9 @@ bool AtomJavaScriptModalDialogEfl::CreateNavigationLayout() {
         GetPopupMessage(UTF16ToUTF8(message_text_)).c_str());
   }
   Evas_Object* cancel_btn =
-      AddButton("CANCEL", "button1", CancelButtonCallback);
+      AddButton("IDS_WEBVIEW_BUTTON_STAY", "button1", CancelButtonCallback);
   Evas_Object* ok_btn =
-      AddButton("OK", "button2", OkButtonCallback);
+      AddButton("IDS_WEBVIEW_BUTTON_LEAVE", "button2", OkButtonCallback);
   if (!cancel_btn || !ok_btn)
     return false;
 
@@ -255,7 +255,7 @@ bool AtomJavaScriptModalDialogEfl::CreateAlertLayout() {
   }
 
   Evas_Object* ok_btn =
-      AddButton("OK", "button1", OkButtonCallback);
+      AddButton("IDS_WEBVIEW_BUTTON_OK_ABB4", "button1", OkButtonCallback);
   if (!ok_btn)
     return false;
 
@@ -269,10 +269,10 @@ bool AtomJavaScriptModalDialogEfl::CreateConfirmLayout() {
         GetPopupMessage(UTF16ToUTF8(message_text_)).c_str());
   }
 
-  Evas_Object* cancel_btn = AddButton("CANCEL",
+  Evas_Object* cancel_btn = AddButton("IDS_WEBVIEW_BUTTON_CANCEL_ABB4",
                                       "button1", CancelButtonCallback);
   Evas_Object* ok_btn =
-      AddButton("OK", "button2", OkButtonCallback);
+      AddButton("IDS_WEBVIEW_BUTTON_OK_ABB4", "button2", OkButtonCallback);
   if (!cancel_btn || !ok_btn)
     return false;
 
@@ -284,7 +284,7 @@ bool AtomJavaScriptModalDialogEfl::CreateConfirmLayout() {
 std::string AtomJavaScriptModalDialogEfl::GetTitle() {
 
   std::string title =
-      dgettext("WebKit", "HEADER MESSAGE");
+      dgettext("WebKit", "IDS_WEBVIEW_HEADER_MESSAGE_FROM_PS_M_WEBSITE");
 
   const std::string replaceStr("%s");
   size_t pos = title.find(replaceStr);

diff --git a/atom/browser/browser.cc b/atom/browser/browser.cc
index d429a0a261a25abe6ac5c501ab11438e7871410f..9305135e07025820077be763c6b73d0dac5fb229 100644 (file)
--- a/atom/browser/browser.cc
+++ b/atom/browser/browser.cc
@@ -330,7 +330,7 @@ void Browser::Launch(std::unique_ptr<common::AppControl> appcontrol) {
   std::unique_ptr<common::ResourceManager::Resource> res =
       resource_manager_->GetStartResource(appcontrol.get());
   if (res)
-    start_url_ = resource_manager_->GetLocalizedPath(res->uri());
+    start_url_ = res->uri();
 
   tizen::NativeWebRuntime::GetInstance().StartApplication();
 }

diff --git a/tizen/browser/tizen_browser_parts.cc b/tizen/browser/tizen_browser_parts.cc
index 9be83b2235828ebb2f4948c48396f618373d208f..e87d34d81512ad0ff41a14e9e8e534d459e07dac 100644 (file)
--- a/tizen/browser/tizen_browser_parts.cc
+++ b/tizen/browser/tizen_browser_parts.cc
@@ -89,6 +89,11 @@ void TizenBrowserParts::Initialize() {
   } else {
     security_model_version_ = 1;
   }
+  if (app_data_->widget_info() != NULL &&
+      !app_data_->widget_info()->default_locale().empty()) {
+    locale_manager_->SetDefaultLocale(
+        app_data_->widget_info()->default_locale());
+  }
 
   std::unique_ptr<char, decltype(std::free)*> path{app_get_data_path(),
                                                    std::free};