summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-04 00:43:12 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-04 00:43:12 +0000
commitdbc9a6f44f68500fd1c8d2450ce800f042e69815 (patch)
tree1a45038c1fa39efcdb20afdacecaa4d141020318 /chrome/browser
parent24e4533e027c5fccf6c79966f73f67405ad5318d (diff)
downloadchromium_src-dbc9a6f44f68500fd1c8d2450ce800f042e69815.zip
chromium_src-dbc9a6f44f68500fd1c8d2450ce800f042e69815.tar.gz
chromium_src-dbc9a6f44f68500fd1c8d2450ce800f042e69815.tar.bz2
Localize the 11th hour popup window hack. Right before release, we made a change to the behaviour of constrained windows, where we hard coded English strings. Localize this now...
Review URL: http://codereview.chromium.org/427 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1702 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/views/constrained_window_impl.cc15
1 files changed, 5 insertions, 10 deletions
diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc
index 86f5677..3d0b0c3 100644
--- a/chrome/browser/views/constrained_window_impl.cc
+++ b/chrome/browser/views/constrained_window_impl.cc
@@ -930,16 +930,11 @@ std::wstring ConstrainedWindowImpl::GetWindowTitle() const {
std::wstring display_title;
bool title_set = false;
if (constrained_contents_) {
- // TODO(erg): This 11th hour hack is here because we decided we don't want
- // to give ANY room to people trying to advertise on the window title line,
- // but we don't have time to get a string translated into 40 languages at
- // T-5 days so just do this in English. This needs (NEEDS!) to be fixed
- // post beta.
- std::wstring locale = g_browser_process->GetApplicationLocale();
- if (locale == L"en-US" || locale == L"en-GB") {
- display_title = L"Blocked Popup";
- title_set = true;
- }
+ // TODO(erg): This is in the process of being translated now, but we need
+ // to do UI work so that display_title is "IDS_BLOCKED_POPUP - <page
+ // title>".
+ display_title = l10n_util::GetString(IDS_BLOCKED_POPUP);
+ title_set = true;
}
if (!title_set) {