Commit 7167ed15 authored by jshin's avatar jshin Committed by Commit bot

Update the font preference for CJK

Noto Sans CJK {Japanese,Korean,Simplified Chinese,Traditional Chinese}
are renamed Noto Sans CJK {JP,KR,SC,TC} to make their names
future-proof (to work around the length restriction on another
platform).

We want to minimize the potential confusion (on the
part of developers) due to this name change
by adding the fonts with new names in the trunk and Chrome OS 38 branch
asap.

This CL will be landed  along with the corresponding Chrome OS CL to
actually update the font files and a Skia CL.

Skia CL: https://codereview.chromium.org/554943002/
CrOS CL: https://chromium-review.googlesource.com/217290

BUG=412151
TEST=Once the fonts are updated on Chrome OS, Noto Sans CJK {SC,JP,KR}
fonts are used in {zh,ja,ko}.wikipedia.org. They can be checked with
DOM Inspector.
TEST=`data:text/html,<span style="font-family:sans-serif;"
lang="ja">&#x4E00;</span>` uses 'Noto Sans CJK JP`.
TEST=Same as above with lang={ko,zh-CN,zh-TW} and font="Noto Sans CJK
{KR,SC,TC}" as indicated in the DOM Inspector.

Review URL: https://codereview.chromium.org/551963003

Cr-Commit-Position: refs/heads/master@{#294294}
parent 3626f120
......@@ -208,7 +208,7 @@
<!-- The default value for |WebPreference::standard_font_family_map| for
Japanese script. -->
<message name="IDS_STANDARD_FONT_FAMILY_JAPANESE" use_name_for_id="true">
Noto Sans CJK Japanese
Noto Sans CJK JP
</message>
<!-- The default value for |WebPreference::fixed_font_family_map| for
......@@ -226,13 +226,13 @@
<!-- The default value for |WebPreference::sans_serif_font_family_map| for
Japanese script. -->
<message name="IDS_SANS_SERIF_FONT_FAMILY_JAPANESE" use_name_for_id="true">
Noto Sans CJK Japanese
Noto Sans CJK JP
</message>
<!-- The default value for |WebPreference::standard_font_family_map| for
Korean script. -->
<message name="IDS_STANDARD_FONT_FAMILY_KOREAN" use_name_for_id="true">
Noto Sans CJK Korean
Noto Sans CJK KR
</message>
<!-- The default value for |WebPreference::fixed_font_family_map| for
......@@ -250,55 +250,55 @@
<!-- The default value for |WebPreference::sans_serif_font_family_map| for
Korean script. -->
<message name="IDS_SANS_SERIF_FONT_FAMILY_KOREAN" use_name_for_id="true">
Noto Sans CJK Korean
Noto Sans CJK KR
</message>
<!-- The default value for |WebPreference::standard_font_family_map| for
Simplified Chinese script. -->
<message name="IDS_STANDARD_FONT_FAMILY_SIMPLIFIED_HAN" use_name_for_id="true">
Noto Sans CJK Simplified Chinese
Noto Sans CJK SC
</message>
<!-- The default value for |WebPreference::fixed_font_family_map| for
Simplified Chinese script. -->
<message name="IDS_FIXED_FONT_FAMILY_SIMPLIFIED_HAN" use_name_for_id="true">
Noto Sans CJK Simplfieid Chinese
Noto Sans CJK SC
</message>
<!-- The default value for |WebPreference::serif_font_family_map| for
Simplified Chinese script. -->
<message name="IDS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN" use_name_for_id="true">
Noto Sans CJK Simplfieid Chinese
Noto Sans CJK SC
</message>
<!-- The default value for |WebPreference::sans_serif_font_family_map| for
Simplified Chinese script. -->
<message name="IDS_SANS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN" use_name_for_id="true">
Noto Sans CJK Simplfieid Chinese
Noto Sans CJK SC
</message>
<!-- The default value for |WebPreference::standard_font_family_map| for
Traditional Chinese script. -->
<message name="IDS_STANDARD_FONT_FAMILY_TRADITIONAL_HAN" use_name_for_id="true">
Noto Sans CJK Traditional Chinese
Noto Sans CJK TC
</message>
<!-- The default value for |WebPreference::fixed_font_family_map| for
Traditional Chinese script. -->
<message name="IDS_FIXED_FONT_FAMILY_TRADITIONAL_HAN" use_name_for_id="true">
Noto Sans CJK Traditional Chinese
Noto Sans CJK TC
</message>
<!-- The default value for |WebPreference::serif_font_family_map| for
Traditional Chinese script. -->
<message name="IDS_SERIF_FONT_FAMILY_TRADITIONAL_HAN" use_name_for_id="true">
Noto Sans CJK Traditional Chinese
Noto Sans CJK TC
</message>
<!-- The default value for |WebPreference::sans_serif_font_family_map| for
Traditional Chinese script. -->
<message name="IDS_SANS_SERIF_FONT_FAMILY_TRADITIONAL_HAN" use_name_for_id="true">
Noto Sans CJK Traditional Chinese
Noto Sans CJK TC
</message>
<!-- The default value for |WebPreference::default_font_size| -->
......
......@@ -208,7 +208,7 @@
<!-- The default value for |WebPreference::standard_font_family_map| for
Japanese script. -->
<message name="IDS_STANDARD_FONT_FAMILY_JAPANESE" use_name_for_id="true">
Noto Sans CJK Japanese
Noto Sans CJK JP
</message>
<!-- The default value for |WebPreference::fixed_font_family_map| for
......@@ -226,13 +226,13 @@
<!-- The default value for |WebPreference::sans_serif_font_family_map| for
Japanese script. -->
<message name="IDS_SANS_SERIF_FONT_FAMILY_JAPANESE" use_name_for_id="true">
Noto Sans CJK Japanese
Noto Sans CJK JP
</message>
<!-- The default value for |WebPreference::standard_font_family_map| for
Korean script. -->
<message name="IDS_STANDARD_FONT_FAMILY_KOREAN" use_name_for_id="true">
Noto Sans CJK Korean
Noto Sans CJK KR
</message>
<!-- The default value for |WebPreference::fixed_font_family_map| for
......@@ -250,19 +250,19 @@
<!-- The default value for |WebPreference::sans_serif_font_family_map| for
Korean script. -->
<message name="IDS_SANS_SERIF_FONT_FAMILY_KOREAN" use_name_for_id="true">
Noto Sans CJK Korean
Noto Sans CJK KR
</message>
<!-- The default value for |WebPreference::standard_font_family_map| for
Simplified Chinese script. -->
<message name="IDS_STANDARD_FONT_FAMILY_SIMPLIFIED_HAN" use_name_for_id="true">
Noto Sans CJK Simplified Chinese
Noto Sans CJK SC
</message>
<!-- The default value for |WebPreference::fixed_font_family_map| for
Simplified Chinese script. -->
<message name="IDS_FIXED_FONT_FAMILY_SIMPLIFIED_HAN" use_name_for_id="true">
Noto Sans CJK Simplified Chinese
Noto Sans CJK SC
</message>
<!-- The default value for |WebPreference::serif_font_family_map| for
......@@ -274,19 +274,19 @@
<!-- The default value for |WebPreference::sans_serif_font_family_map| for
Simplified Chinese script. -->
<message name="IDS_SANS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN" use_name_for_id="true">
Noto Sans CJK Simplified Chinese
Noto Sans CJK SC
</message>
<!-- The default value for |WebPreference::standard_font_family_map| for
Traditional Chinese script. -->
<message name="IDS_STANDARD_FONT_FAMILY_TRADITIONAL_HAN" use_name_for_id="true">
Noto Sans CJK Traditional Chinese
Noto Sans CJK TC
</message>
<!-- The default value for |WebPreference::fixed_font_family_map| for
Traditional Chinese script. -->
<message name="IDS_FIXED_FONT_FAMILY_TRADITIONAL_HAN" use_name_for_id="true">
Noto Sans CJK Traditional Chinese
Noto Sans CJK TC
</message>
<!-- The default value for |WebPreference::serif_font_family_map| for
......@@ -298,7 +298,7 @@
<!-- The default value for |WebPreference::sans_serif_font_family_map| for
Traditional Chinese script. -->
<message name="IDS_SANS_SERIF_FONT_FAMILY_TRADITIONAL_HAN" use_name_for_id="true">
Noto Sans CJK Traditional Chinese
Noto Sans CJK TC
</message>
<!-- The default value for |WebPreference::default_font_size| -->
......
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="ja">
<translation id="IDS_STANDARD_FONT_FAMILY">Noto Sans CJK Japanese</translation>
<translation id="IDS_SANS_SERIF_FONT_FAMILY">Noto Sans CJK Japanese</translation>
<translation id="IDS_STANDARD_FONT_FAMILY">Noto Sans CJK JP</translation>
<translation id="IDS_SANS_SERIF_FONT_FAMILY">Noto Sans CJK JP</translation>
<if expr="_google_chrome">
<translation id="IDS_FIXED_FONT_FAMILY">MotoyaG04GothicMono</translation>
<translation id="IDS_SERIF_FONT_FAMILY">MotoyaG04Mincho</translation>
......
......@@ -2,10 +2,10 @@
<!DOCTYPE translationbundle>
<translationbundle lang="ko">
<!-- TODO(jungshik): remove this line once we fix bug 14691 -->
<translation id="IDS_STANDARD_FONT_FAMILY">Noto Sans CJK Korean</translation>
<translation id="IDS_STANDARD_FONT_FAMILY">Noto Sans CJK KR</translation>
<translation id="IDS_FIXED_FONT_FAMILY">Monospace</translation>
<translation id="IDS_SERIF_FONT_FAMILY">NanumMyeongjo</translation>
<translation id="IDS_SANS_SERIF_FONT_FAMILY">Noto Sans CJK Korean</translation>
<translation id="IDS_SANS_SERIF_FONT_FAMILY">Noto Sans CJK KR</translation>
<translation id="IDS_MINIMUM_FONT_SIZE">10</translation>
<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">10</translation>
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="zh-CN">
<translation id="IDS_STANDARD_FONT_FAMILY">Noto Sans CJK Simplified Chinese</translation>
<translation id="IDS_FIXED_FONT_FAMILY">Noto Sans CJK Simplified Chinese</translation>
<translation id="IDS_SANS_SERIF_FONT_FAMILY">Noto Sans CJK Simplified Chinese</translation>
<translation id="IDS_STANDARD_FONT_FAMILY">Noto Sans CJK SC</translation>
<translation id="IDS_FIXED_FONT_FAMILY">Noto Sans CJK SC</translation>
<translation id="IDS_SANS_SERIF_FONT_FAMILY">Noto Sans CJK SC</translation>
<if expr="_google_chrome">
<translation id="IDS_SERIF_FONT_FAMILY">MSung GB18030</translation>
</if>
<if expr="not _google_chrome">
<translation id="IDS_SERIF_FONT_FAMILY">Noto Sans CJK Simplified Chinese</translation>
<translation id="IDS_SERIF_FONT_FAMILY">Noto Sans CJK SC</translation>
</if>
<translation id="IDS_MINIMUM_FONT_SIZE">12</translation>
<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">12</translation>
......
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="zh-TW">
<translation id="IDS_STANDARD_FONT_FAMILY">Noto Sans CJK Traditional Chinese</translation>
<translation id="IDS_FIXED_FONT_FAMILY">Noto Sans CJK Traditional Chinese</translation>
<translation id="IDS_SANS_SERIF_FONT_FAMILY">Noto Sans CJK Traditional Chinese</translation>
<translation id="IDS_STANDARD_FONT_FAMILY">Noto Sans CJK TC</translation>
<translation id="IDS_FIXED_FONT_FAMILY">Noto Sans CJK TC</translation>
<translation id="IDS_SANS_SERIF_FONT_FAMILY">Noto Sans CJK TC</translation>
<if expr="_google_chrome">
<translation id="IDS_SERIF_FONT_FAMILY">MSung B5HK</translation>
</if>
<if expr="not _google_chrome">
<translation id="IDS_SERIF_FONT_FAMILY">Noto Sans CJK Traditional Chinese</translation>
<translation id="IDS_SERIF_FONT_FAMILY">Noto Sans CJK TC</translation>
</if>
<translation id="IDS_MINIMUM_FONT_SIZE">12</translation>
<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">12</translation>
......
......@@ -2,7 +2,7 @@
<!DOCTYPE translationbundle>
<translationbundle lang="ja">
<translation id="IDS_MINIMUM_UI_FONT_SIZE">10</translation>
<translation id="IDS_UI_FONT_FAMILY_CROS">Noto Sans UI,Noto Sans CJK Japanese,ui-sans, 13px</translation>
<translation id="IDS_UI_FONT_FAMILY_CROS">Noto Sans UI,Noto Sans CJK JP,ui-sans, 13px</translation>
<if expr="is_win">
<translation id="IDS_WEB_FONT_FAMILY">'Segoe UI',Arial,Meiryo,'MS PGothic',sans-serif</translation>
<translation id="IDS_WEB_FONT_FAMILY_XP">Arial,Meiryo,'MS PGothic',sans-serif</translation>
......@@ -14,6 +14,6 @@
<translation id="IDS_WEB_FONT_FAMILY">VL PGothic,Sazanami Gothic,Kochi Gothic,sans-serif</translation>
</if>
<if expr="chromeos and _google_chrome">
<translation id="IDS_WEB_FONT_FAMILY">Noto Sans UI, Noto Sans CJK Japanese, sans-serif</translation>
<translation id="IDS_WEB_FONT_FAMILY">Noto Sans UI, Noto Sans CJK JP, sans-serif</translation>
</if>
</translationbundle>
......@@ -2,7 +2,7 @@
<!DOCTYPE translationbundle>
<translationbundle lang="ko">
<translation id="IDS_MINIMUM_UI_FONT_SIZE">10</translation>
<translation id="IDS_UI_FONT_FAMILY_CROS">Noto Sans UI,Noto Sans CJK Korean,ui-sans, 13px</translation>
<translation id="IDS_UI_FONT_FAMILY_CROS">Noto Sans UI,Noto Sans CJK KR,ui-sans, 13px</translation>
<if expr="is_win">
<translation id="IDS_WEB_FONT_FAMILY">'Segoe UI',Arial,'Malgun Gothic',Gulim,sans-serif</translation>
<translation id="IDS_WEB_FONT_FAMILY_XP">Arial,'Malgun Gothic',Gulim,sans-serif</translation>
......@@ -14,6 +14,6 @@
<translation id="IDS_WEB_FONT_FAMILY">NanumGothic,UnDotum,Baekmuk Gulim,sans-serif</translation>
</if>
<if expr="chromeos">
<translation id="IDS_WEB_FONT_FAMILY">Noto Sans UI, Noto Sans CJK Korean, sans-serif</translation>
<translation id="IDS_WEB_FONT_FAMILY">Noto Sans UI, Noto Sans CJK KR, sans-serif</translation>
</if>
</translationbundle>
......@@ -2,7 +2,7 @@
<!DOCTYPE translationbundle>
<translationbundle lang="zh-CN">
<translation id="IDS_MINIMUM_UI_FONT_SIZE">10</translation>
<translation id="IDS_UI_FONT_FAMILY_CROS">Noto Sans UI,Noto Sans CJK Simplified Chinese,ui-sans, 13px</translation>
<translation id="IDS_UI_FONT_FAMILY_CROS">Noto Sans UI,Noto Sans CJK SC,ui-sans, 13px</translation>
<if expr="is_win">
<translation id="IDS_WEB_FONT_FAMILY">'Segoe UI',Arial,'Microsoft Yahei',Simsun,sans-serif</translation>
<translation id="IDS_WEB_FONT_FAMILY_XP">Arial,'Microsoft Yahei',Simsun,sans-serif</translation>
......@@ -11,6 +11,6 @@
<translation id="IDS_WEB_FONT_FAMILY">Helvetica,STHeiti,sans-serif</translation>
</if>
<if expr="chromeos">
<translation id="IDS_WEB_FONT_FAMILY">Noto Sans UI, Noto Sans CJK Simplified Chinese, sans-serif</translation>
<translation id="IDS_WEB_FONT_FAMILY">Noto Sans UI, Noto Sans CJK SC, sans-serif</translation>
</if>
</translationbundle>
......@@ -2,7 +2,7 @@
<!DOCTYPE translationbundle>
<translationbundle lang="zh-TW">
<translation id="IDS_MINIMUM_UI_FONT_SIZE">10</translation>
<translation id="IDS_UI_FONT_FAMILY_CROS">Noto Sans UI,Noto Sans CJK Traditional Chinese,ui-sans, 13px</translation>
<translation id="IDS_UI_FONT_FAMILY_CROS">Noto Sans UI,Noto Sans CJK TC,ui-sans, 13px</translation>
<if expr="is_win">
<translation id="IDS_WEB_FONT_FAMILY">'Segoe UI',Arial,'Microsoft Jhenghei',PMingLiu,sans-serif</translation>
<translation id="IDS_WEB_FONT_FAMILY_XP">Arial,'Microsoft Jhenghei',PMingLiu,sans-serif</translation>
......@@ -11,6 +11,6 @@
<translation id="IDS_WEB_FONT_FAMILY">Helvetica,Heiti TC,sans-serif</translation>
</if>
<if expr="chromeos and _google_chrome">
<translation id="IDS_WEB_FONT_FAMILY">Noto Sans UI, Noto Sans CJK Traditional Chinese, sans-serif</translation>
<translation id="IDS_WEB_FONT_FAMILY">Noto Sans UI, Noto Sans CJK TC, sans-serif</translation>
</if>
</translationbundle>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment