diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-14 00:17:05 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-14 00:17:05 +0000 |
| commit | 6baca1a4830679c30438cbd95de71f53676dec05 (patch) | |
| tree | 05be50678cbd13bc02696e499a5ebe943185fd6c | |
| parent | 401cb18c451d41541e8baf444e093daf74e8f5df (diff) | |
| download | chromium_src-6baca1a4830679c30438cbd95de71f53676dec05.zip chromium_src-6baca1a4830679c30438cbd95de71f53676dec05.tar.gz chromium_src-6baca1a4830679c30438cbd95de71f53676dec05.tar.bz2 | |
Noticed when I crashed while running in RTL mode that the crash string had its punctuation messed up.
BUG=none
TEST=Force a browser crash while running with --lang=he and look at the "Woah!" string in the popup
Review URL: http://codereview.chromium.org/3187001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56115 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/browser_main_win.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc index 32a7bb4..14cc95f 100644 --- a/chrome/browser/browser_main_win.cc +++ b/chrome/browser/browser_main_win.cc @@ -128,17 +128,17 @@ void PrepareRestartOnCrashEnviroment(const CommandLine &parsed_command_line) { // The encoding we use for the info is "title|context|direction" where // direction is either env_vars::kRtlLocale or env_vars::kLtrLocale depending // on the current locale. - std::wstring dlg_strings; - dlg_strings.append(l10n_util::GetString(IDS_CRASH_RECOVERY_TITLE)); - dlg_strings.append(L"|"); - dlg_strings.append(l10n_util::GetString(IDS_CRASH_RECOVERY_CONTENT)); - dlg_strings.append(L"|"); - if (base::i18n::IsRTL()) - dlg_strings.append(ASCIIToWide(env_vars::kRtlLocale)); - else - dlg_strings.append(ASCIIToWide(env_vars::kLtrLocale)); - - env->SetVar(env_vars::kRestartInfo, WideToUTF8(dlg_strings)); + string16 dlg_strings(l10n_util::GetStringUTF16(IDS_CRASH_RECOVERY_TITLE)); + dlg_strings.push_back('|'); + string16 adjusted_string; + base::i18n::AdjustStringForLocaleDirection( + l10n_util::GetStringUTF16(IDS_CRASH_RECOVERY_CONTENT), &adjusted_string); + dlg_strings.append(adjusted_string); + dlg_strings.push_back('|'); + dlg_strings.append(ASCIIToUTF16( + base::i18n::IsRTL() ? env_vars::kRtlLocale : env_vars::kLtrLocale)); + + env->SetVar(env_vars::kRestartInfo, UTF16ToUTF8(dlg_strings)); } // This method handles the --hide-icons and --show-icons command line options |