summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-16 17:42:38 +0000
committerstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-16 17:42:38 +0000
commite8552034f762cf76a28c7407a05276f6dfbbd9d0 (patch)
treef25df981ff03d74ad849c82f5a09b77176e06dfd
parent0a0554502c87277323e1438a6ab5b50acb9aab46 (diff)
downloadchromium_src-e8552034f762cf76a28c7407a05276f6dfbbd9d0.zip
chromium_src-e8552034f762cf76a28c7407a05276f6dfbbd9d0.tar.gz
chromium_src-e8552034f762cf76a28c7407a05276f6dfbbd9d0.tar.bz2
WifiConfigView::Init(): Fetch the localized string for the cert
button, rather than using the cert button ID directly, which produces garbage. BUG=http://crosbug.com/4490 TEST=Click network dropdown and select a 802.1x network that has not been configured by the system (google-A when logged in to a non-corp account, for example). Check that the button to the right of the "Certificate:" label contains text ("Select certificate file"), rather than the not-a-character glyph. Review URL: http://codereview.chromium.org/2952006 Patch from Nathan Williams <njw@chromium.org>. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52700 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/options/wifi_config_view.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc
index 8c7d95f..6486672 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.cc
+++ b/chrome/browser/chromeos/options/wifi_config_view.cc
@@ -268,7 +268,8 @@ void WifiConfigView::Init() {
if (!certificate_path_.empty())
label = UTF8ToWide(certificate_path_);
else
- label = IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_BUTTON;
+ label = l10n_util::GetString(
+ IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_BUTTON);
certificate_browse_button_ = new views::NativeButton(this, label);
layout->AddView(certificate_browse_button_);
}