diff options
| author | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 05:37:01 +0000 |
|---|---|---|
| committer | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 05:37:01 +0000 |
| commit | 3192f317a0a16560a3367cabdc098613124ffcb7 (patch) | |
| tree | 3d3541aadf568846356baa9b3da14b5363942d2a /chrome/browser | |
| parent | 061b2cd4cb133fb5ff1e4adf9c19cbe112cb1fdb (diff) | |
| download | chromium_src-3192f317a0a16560a3367cabdc098613124ffcb7.zip chromium_src-3192f317a0a16560a3367cabdc098613124ffcb7.tar.gz chromium_src-3192f317a0a16560a3367cabdc098613124ffcb7.tar.bz2 | |
Make the localized product name 'ungarbled'.
BUG=4456
TEST=Change the UI languge to Japanese and log out. At the lower-left corner
of the login screen, there's no more sequence of 'black question marks'.
Review URL: http://codereview.chromium.org/2864033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52448 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/chromeos/login/background_view.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/login/background_view.cc b/chrome/browser/chromeos/login/background_view.cc index eb85f61..5487c8a 100644 --- a/chrome/browser/chromeos/login/background_view.cc +++ b/chrome/browser/chromeos/login/background_view.cc @@ -8,6 +8,7 @@ #include "app/resource_bundle.h" #include "app/x11_util.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/login/helper.h" #include "chrome/browser/chromeos/status/clock_menu_button.h" #include "chrome/browser/chromeos/status/feedback_menu_button.h" @@ -202,12 +203,13 @@ void BackgroundView::UpdateWindowType() { void BackgroundView::OnVersion( VersionLoader::Handle handle, std::string version) { + // TODO(jungshik): Is string concatenation OK here? std::string version_text = l10n_util::GetStringUTF8(IDS_PRODUCT_NAME); version_text += ' '; version_text += l10n_util::GetStringUTF8(IDS_VERSION_FIELD_PREFIX); version_text += ' '; version_text += version; - os_version_label_->SetText(ASCIIToWide(version_text)); + os_version_label_->SetText(UTF8ToWide(version_text)); } void BackgroundView::OnBootTimes( @@ -239,6 +241,7 @@ void BackgroundView::OnBootTimes( boot_times.pre_startup, boot_times.system); } + // Use UTF8ToWide once this string is localized. boot_times_label_->SetText(ASCIIToWide(boot_times_text)); } |