diff options
| author | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-17 14:20:11 +0000 |
|---|---|---|
| committer | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-17 14:20:11 +0000 |
| commit | 80b1adf2f2230b3dc5254b8838b1a80a9e70e431 (patch) | |
| tree | a1c01efd8e36fe9494fa82bd1e48d0a7f57addcc /tools/gritsettings | |
| parent | e2123b52e9189ad48d77fe67a41357f04d0c0bf2 (diff) | |
| download | chromium_src-80b1adf2f2230b3dc5254b8838b1a80a9e70e431.zip chromium_src-80b1adf2f2230b3dc5254b8838b1a80a9e70e431.tar.gz chromium_src-80b1adf2f2230b3dc5254b8838b1a80a9e70e431.tar.bz2 | |
Change the default values of WebPreferences for zh-* and ja.
For Google ChromeOS, set them to the licensed fonts.
For Chromium OS, set them to IPA fonts (ja) and Droid Sans fallback (zh-*).
Because 'grd' format does not support messages with the same id in multiple
branches when use_name_for_id is set [1], we add
locale_settings_{chromiumos,google_chromeos}.grd in place of locale_settings_cros.grd. However, xtb files included by them keep their old names (locale_settings_cros_{lang}.xtb ).
[1] http://code.google.com/p/grit-i18n/issues/detail?id=8
BUG=159456
TEST=In Google ChromeOS, go to http://www.w3.org/International/tests/tests-html-css/tests-fonts/generate-auto-assignment?test=1 and see if 'ja', 'zh-*', 'ko' use slightly differnet glyphs. Or, see http://i18nl10n.com/cros/cjkdeffont.html and make sure that the 3rd column matches in 4th column in ChromeOS and 5th column in Chromium OS.
Review URL: https://chromiumcodereview.appspot.com/11338052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/gritsettings')
| -rw-r--r-- | tools/gritsettings/resource_ids | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids index 1a80baa..656eacd 100644 --- a/tools/gritsettings/resource_ids +++ b/tools/gritsettings/resource_ids @@ -83,8 +83,11 @@ "messages": [10000], }, # These each start with the same resource id because we only use one - # file for each build (cros, linux, mac, or win). - "chrome/app/resources/locale_settings_cros.grd": { + # file for each build (chromiumos, google_chromeos, linux, mac, or win). + "chrome/app/resources/locale_settings_chromiumos.grd": { + "messages": [10500], + }, + "chrome/app/resources/locale_settings_google_chromeos.grd": { "messages": [10500], }, "chrome/app/resources/locale_settings_linux.grd": { |