From 1120d84ba0ea0e06b982556c5b2f1c7b3899cce3 Mon Sep 17 00:00:00 2001
From: "cpu@google.com" <cpu@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 28 Jan 2009 02:46:31 +0000
Subject: Adds the localized oem html resources to setup - Only the ones
required at this point - Requires official build
BUG=1468838
Review URL: http://codereview.chromium.org/19416
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8791 0039d316-1c4b-4281-b951-d872f2087c98
---
chrome/installer/setup/setup.rc | 21 ++++++++++++---------
chrome/installer/util/l10n_string_util.cc | 6 +++---
2 files changed, 15 insertions(+), 12 deletions(-)
(limited to 'chrome')
diff --git a/chrome/installer/setup/setup.rc b/chrome/installer/setup/setup.rc
index 0f1b7c3..d37774c 100644
--- a/chrome/installer/setup/setup.rc
+++ b/chrome/installer/setup/setup.rc
@@ -70,15 +70,18 @@ IDR_EULA_ICO.PNG EULA "..\\..\\app\\theme\\google_chrome\\eula_icon.png"
// HTML
//
-IDR_EULA_CSS.CSS HTML "eula\\oem.css"
-IDR_EULA_JSC.JS HTML "eula\\oem.js"
-
-IDR_OEMPG_EN.HTML HTML "eula\\oem_en.html"
-
-IDR_TERMS_EN.HTML HTML "..\\..\\app\\resources\\terms\\terms_en.html"
-IDR_TERMS_ES.HTML HTML "..\\..\\app\\resources\\terms\\terms_es.html"
-IDR_TERMS_FR.HTML HTML "..\\..\\app\\resources\\terms\\terms_fr.html"
-IDR_TERMS_BR.HTML HTML "..\\..\\app\\resources\\terms\\terms_pt-BR.html"
+IDR_EULA_CSS.CSS HTML "eula\\oem.css"
+IDR_EULA_JSC.JS HTML "eula\\oem.js"
+
+IDR_OEMPG_EN.HTML HTML "eula\\oem_en.html"
+IDR_OEMPG_ES_419.HTML HTML "eula\\oem_es-419.html"
+IDR_OEMPG_FR.HTML HTML "eula\\oem_fr.html"
+IDR_OEMPG_PT_BR.HTML HTML "eula\\oem_pt-BR.html"
+
+IDR_TERMS_EN.HTML HTML "..\\..\\app\\resources\\terms\\terms_en.html"
+IDR_TERMS_ES_419.HTML HTML "..\\..\\app\\resources\\terms\\terms_es-419.html"
+IDR_TERMS_FR.HTML HTML "..\\..\\app\\resources\\terms\\terms_fr.html"
+IDR_TERMS_PT_BR.HTML HTML "..\\..\\app\\resources\\terms\\terms_pt-BR.html"
#endif // defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/installer/util/l10n_string_util.cc b/chrome/installer/util/l10n_string_util.cc
index 343a474..c2d339b 100644
--- a/chrome/installer/util/l10n_string_util.cc
+++ b/chrome/installer/util/l10n_string_util.cc
@@ -166,10 +166,10 @@ std::wstring GetLocalizedEulaResource() {
const wchar_t* resource = L"IDR_OEMPG_EN.HTML";
if (language == L"fr")
resource = L"IDR_OEMPG_FR.HTML";
- else if (language == L"es")
- resource = L"IDR_OEMPG_ES.HTML";
+ else if (language == L"es-419")
+ resource = L"IDR_OEMPG_ES_419.HTML";
else if (language == L"pt-br")
- resource = L"IDR_OEMPG_BR.HTML";
+ resource = L"IDR_OEMPG_PT_BR.HTML";
// Spaces and DOS paths must be url encoded.
std::wstring url_path =
StringPrintf(L"res://%ls/#23/%ls", full_exe_path, resource);
--
cgit v1.1