From beffa891fab62c2654e05d64e10ac793ee08a2d2 Mon Sep 17 00:00:00 2001 From: "jshin@chromium.org" Date: Mon, 9 Nov 2009 22:59:31 +0000 Subject: Block Amharic on Windows XP for now. Win XP does not come with Amharic fonts. Even if a user install fonts supporting Amharic, Chrome's UI (including Omnibox) will not use it. BUG=NONE TEST=On Win XP, start chrome with '--lang=am' and Chrome's UI language matches your OS locale. Review URL: http://codereview.chromium.org/377020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31496 0039d316-1c4b-4281-b951-d872f2087c98 --- app/l10n_util_win.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/l10n_util_win.cc b/app/l10n_util_win.cc index b00ba44..0ffdad7 100644 --- a/app/l10n_util_win.cc +++ b/app/l10n_util_win.cc @@ -63,9 +63,10 @@ void HWNDSetRTLLayout(HWND hwnd) { } bool IsLocaleSupportedByOS(const std::string& locale) { - // Block Oriya on Windows XP. - return !(LowerCaseEqualsASCII(locale, "or") && - win_util::GetWinVersion() < win_util::WINVERSION_VISTA); + // Block Oriya and Amharic on Windows XP. + return win_util::GetWinVersion() >= win_util::WINVERSION_VISTA || + (!LowerCaseEqualsASCII(locale, "or") && + !LowerCaseEqualsASCII(locale, "am")); } bool NeedOverrideDefaultUIFont(std::wstring* override_font_family, -- cgit v1.1