diff options
| author | cpu@google.com <cpu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-28 02:46:31 +0000 |
|---|---|---|
| committer | cpu@google.com <cpu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-28 02:46:31 +0000 |
| commit | 1120d84ba0ea0e06b982556c5b2f1c7b3899cce3 (patch) | |
| tree | f0c903db49e607a4e97f5c06ab18b6ec8c40d6b9 | |
| parent | 16b8085518a82444fac7c251356cdc87a5720c9a (diff) | |
| download | chromium_src-1120d84ba0ea0e06b982556c5b2f1c7b3899cce3.zip chromium_src-1120d84ba0ea0e06b982556c5b2f1c7b3899cce3.tar.gz chromium_src-1120d84ba0ea0e06b982556c5b2f1c7b3899cce3.tar.bz2 | |
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
| -rw-r--r-- | chrome/installer/setup/setup.rc | 21 | ||||
| -rw-r--r-- | chrome/installer/util/l10n_string_util.cc | 6 |
2 files changed, 15 insertions, 12 deletions
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); |