Mac language/locale cleanup...

app/l10n_util.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "app/l10n_util.h"
 
 #include <cstdlib>
 #include "app/app_paths.h"
 #include "app/app_switches.h"
 #include "app/gfx/canvas.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "build/build_config.h"
 #include "unicode/uscript.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif
 
+#if defined(OS_MACOSX)
+#include "app/l10n_util_mac.h"
+#endif
+
 // TODO(playmobil): remove this undef once SkPostConfig.h is fixed.
 // skia/include/corecg/SkPostConfig.h #defines strcasecmp() so we can't use
 // base::strcasecmp() without #undefing it here.
 #undef strcasecmp
 
 namespace {
 
 #if defined(OS_WIN)
 static const FilePath::CharType kLocaleFileExtension[] = L".dll";
 #elif defined(OS_POSIX)
@@ skipping 377 matching lines @@
 }
 #endif
 
 }  // namespace
 
 namespace l10n_util {
 
 // Represents the locale-specific text direction.
 static TextDirection g_text_direction = UNKNOWN_DIRECTION;
 
-// On the Mac, we don't want to test preferences or ICU for the language,
-// we want to use whatever Cocoa is using when it loaded the main nib file.
-// It handles all the mapping and fallbacks for us, we just need to ask.
-// See l10n_util_mac for that implementation.
+std::string GetApplicationLocale(const std::wstring& pref_locale) {
 #if !defined(OS_MACOSX)
-std::string GetApplicationLocale(const std::wstring& pref_locale) {
+
   FilePath locale_path;
   PathService::Get(app::DIR_LOCALES, &locale_path);
   std::string resolved_locale;
   std::vector<std::string> candidates;
   const std::string system_locale = GetSystemLocale();
 
-  // We only use --lang and the app pref on Windows.  On Linux/Mac, we only
+  // We only use --lang and the app pref on Windows.  On Linux, we only
   // look at the LC_*/LANG environment variables.  We do, however, pass --lang
   // to renderer and plugin processes so they know what language the parent
   // process decided to use.
 #if defined(OS_WIN)
   // First, check to see if there's a --lang flag.
   const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
   const std::string& lang_arg = WideToASCII(
       parsed_command_line.GetSwitchValue(switches::kLang));
   if (!lang_arg.empty())
     candidates.push_back(lang_arg);
@@ skipping 27 matching lines @@
 
   // Fallback on en-US.
   const std::string fallback_locale("en-US");
   if (IsLocaleAvailable(fallback_locale, locale_path))
     return fallback_locale;
 
   // No locale data file was found; we shouldn't get here.
   NOTREACHED();
 
   return std::string();
+
+#else  // !defined(OS_MACOSX)
+
+  // Use any override (Cocoa for the browser), otherwise use the command line
+  // argument.
+  std::string app_locale = l10n_util::GetLocaleOverride();
+  if (app_locale.empty()) {
+    const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
+    app_locale = parsed_command_line.GetSwitchValueASCII(switches::kLang);
+  }
+
+  // The above should handle all of the cases Chrome normally hits, but for some
+  // unit tests, we need something to fall back too.
+  if (app_locale.empty())
+    app_locale = "en-US";
+
+  // Windows/Linux call CheckAndResolveLocale which calls IsLocaleAvailable
+  // which calls SetICUDefaultLocale to let ICU use the same locale.  Mac
+  // doesn't use a locale directory tree of resources (it uses Mac style
+  // resources), so mirror that ICU behavior by calling SetICUDefaultLocale
+  // directly.
+  UBool icu_set = SetICUDefaultLocale(app_locale);
+  DCHECK(icu_set);
+  return app_locale;
+#endif  // !defined(OS_MACOSX)
 }
-#endif  // !defined(OS_MACOSX)
 
 string16 GetDisplayNameForLocale(const std::string& locale_code,
                                  const std::string& display_locale,
                                  bool is_for_ui) {
   UErrorCode error = U_ZERO_ERROR;
   const int buffer_size = 1024;
 
   string16 display_name;
   int actual_size = uloc_getDisplayName(locale_code.c_str(),
       display_locale.c_str(),
@@ skipping 538 matching lines @@
 }
 
 void BiDiLineIterator::GetLogicalRun(int start,
                                      int* end,
                                      UBiDiLevel* level) {
   DCHECK(bidi_ != NULL);
   ubidi_getLogicalRun(bidi_, start, end, level);
 }
 
 }  // namespace l10n_util