Fix tips in OS X to respect system language settings instead of locale....

chrome/browser/web_resource/web_resource_service.cc

 // Copyright (c) 2009 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 "chrome/browser/web_resource/web_resource_service.h"
 
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
@@ skipping 187 matching lines @@
     in_fetch_(false) {
   Init();
 }
 
 WebResourceService::~WebResourceService() { }
 
 void WebResourceService::Init() {
   resource_dispatcher_host_ = g_browser_process->resource_dispatcher_host();
   web_resource_fetcher_ = new WebResourceFetcher(this);
   prefs_->RegisterStringPref(prefs::kNTPTipsCacheUpdate, L"0");
-  std::wstring locale = ASCIIToWide(g_browser_process->GetApplicationLocale());
+  std::wstring language = WebResourceService::GetWebResourceLanguage(prefs_);
 
   if (prefs_->HasPrefPath(prefs::kNTPTipsServer)) {
      web_resource_server_ = prefs_->GetString(prefs::kNTPTipsServer);
      // If we are in the correct locale, initialization is done.
-     if (EndsWith(web_resource_server_, locale, false))
+     if (EndsWith(web_resource_server_, language, false))
        return;
   }
 
   // If we have not yet set a server, or if the tips server is set to the wrong
   // locale, reset the server and force an immediate update of tips.
   web_resource_server_ = kDefaultResourceServer;
-  web_resource_server_.append(locale);
+  web_resource_server_.append(language);
   prefs_->SetString(prefs::kNTPTipsCacheUpdate, L"");
 }
 
 void WebResourceService::EndFetch() {
   in_fetch_ = false;
 }
 
 void WebResourceService::OnWebResourceUnpacked(
   const DictionaryValue& parsed_json) {
   // Get dictionary of cached preferences.
@@ skipping 58 matching lines @@
 
 void WebResourceService::UpdateResourceCache(const std::string& json_data) {
   UnpackerClient* client = new UnpackerClient(this, json_data);
   client->Start();
 
   // Update resource server and cache update time in preferences.
   prefs_->SetString(prefs::kNTPTipsCacheUpdate,
       DoubleToWString(base::Time::Now().ToDoubleT()));
   prefs_->SetString(prefs::kNTPTipsServer, web_resource_server_);
 }
+
+// static
+std::wstring WebResourceService::GetWebResourceLanguage(PrefService* prefs) {
+#if defined OS_MACOSX

[Nico, 2009/10/07 14:56:21]

On second thought, shouldn't the os x version of this work on all platforms?

[Miranda Callahan, 2009/10/07 16:22:00]

Well, the tips need to always be in the same language as the Chrome UI, but in
the Windows version, the preferred languages and the UI language are two
different settings (unlike the Mac side, which is, as you noticed, hard-coded to
values determined by the system language) -- so if we use the strategy for
Windows that we are using for the Mac side, we could, again, have the tips in a
different language from the UI.

One way to unify these two might be to have the Chrome UI language always be the
most preferred language on the Windows side, just as it is on the Mac side --
but I don't know if that makes sense for Windows.

On 2009/10/07 14:56:21, Nico wrote:

+  // OS X derives the language for the Chrome UI from the list of accepted
+  // languages, which can be different from the locale.
+  std::wstring languageList = prefs->GetString(prefs::kAcceptLanguages);
+  int pos = languageList.find(L",");
+  pos = pos >= 0 ? pos : languageList.length();
+  return languageList.substr(0, pos);
+#else
+  return ASCIIToWide(g_browser_process->GetApplicationLocale());
+#endif

[TVL, 2009/10/07 12:02:48]

drive by: since we're forking what is done here, I'm wondering what other places
call GetApplicationLocale and will be wrong?  ie-should we be looking at these
lower levels to change what the mac is returning so make sure the expectations
are right in all places?  and/or should the apis in question get comments added
about what they return why it differs on platforms.

[Miranda Callahan, 2009/10/07 16:22:00]

Good point. I think a source of confusion is that on Windows,
GetApplicationLocale returns whatever the user sets as their Chrome UI Language
-- but on Mac, it returns the [NSLocale currentLocale], which can be set to be
different from the Chrome UI language.  

Perhaps there should be two different calls in l10n_util -- GetApplicationLocale
and GetApplicationLanguage; on the Windows side, they would both call the same
code (for now?), but on the Mac side, they would call the two different system
settings.  This way we could tease apart the two different meanings of "Locale"
in Mac, while allowing them to remain conflated in Windows. What do you think?

On 2009/10/07 12:02:48, TVL wrote:

+}
+