commit e9651c3366520fcbc1fba6b3ee662cae95fcea7b
author Bill Napier <napier@google.com> Tue May 05 13:16:30 2009 -0700
committer Bill Napier <napier@google.com> Thu May 07 13:52:17 2009 -0700
tree 74c48ba34ee492a5c079a416c4cb15133e95be4c
parent d58235994a49b720cae95663bdda395f91a4b1c0

Update google_search_base for chinese language.

Changed default search base for china to be www.google.cn and changed the language param.

res/values-zh-rCN/strings.xml

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index d0368bb..c8fad06 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -15,6 +15,10 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Do not translate.  This string is an internal URI, not seen in the UI. -->
+    <string name="google_search_base" translatable="false">
+        http://www.google.cn/m?hl=%1$s&amp;gl=%2$s&amp;</string>
+
     <string name="application_name">"浏览器"</string>
     <string name="tab_bookmarks">"书签"</string>
     <string name="tab_most_visited">"访问最多的网站"</string>

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 9d5130f..a3a84fb 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -4487,9 +4487,26 @@
              * mcc-specific xml files.)
              */
             Locale l = Locale.getDefault();
+            String language = l.getLanguage();
+            String country = l.getCountry().toLowerCase();
+            // Chinese and Portuguese have two langauge variants.
+            if ("zh".equals(language)) {
+                if ("cn".equals(country)) {
+                    language = "zh-CN";
+                } else if ("tw".equals(country)) {
+                    language = "zh-TW";
+                }
+            } else if ("pt".equals(language)) {
+                if ("br".equals(country)) {
+                    language = "pt-BR";
+                } else if ("pt".equals(country)) {
+                    language = "pt-PT";
+                }
+            }
             QuickSearch_G = getResources().getString(
-                    R.string.google_search_base, l.getLanguage(),
-                    l.getCountry().toLowerCase())
+                    R.string.google_search_base,
+                    language,
+                    country)
                     + "client=ms-"
                     + Partner.getString(this.getContentResolver(), Partner.CLIENT_ID)
                     + "&source=android-" + GOOGLE_SEARCH_SOURCE_SUGGEST + "&q=%s";