Commit 375bd03d authored by Regan Hsu's avatar Regan Hsu Committed by Commit Bot

[CrOS Browser Settings] Fix Learn More link in browser language settings

Currently, there is an extra "Learn More" in the browser language
settings.  This error was introduced when replacing "Learn More" links
with settings-localized-link in os settings.  Since browser settings
is not using the settings-localized-link element, but shares the
same strings used by os settings, a new string that does not contain
"Learn More" in the sentence must be introduced.

Fixed: 1038878
Change-Id: Ib450994561e9ea9908543c60377448120361a6c1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1984377Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Commit-Queue: Regan Hsu <hsuregan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#728289}
parent a9c51e92
...@@ -2863,6 +2863,9 @@ ...@@ -2863,6 +2863,9 @@
Show language options Show language options
</message> </message>
<if expr="chromeos"> <if expr="chromeos">
<message name="IDS_SETTINGS_LANGUAGES_BROWSER_LANGUAGES_LIST_ORDERING_INSTRUCTIONS" desc="Explanatory message about ordering the list of languages.">
Add languages or reorder list.
</message>
<message name="IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_ORDERING_INSTRUCTIONS" desc="Explanatory message about ordering the list of languages."> <message name="IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_ORDERING_INSTRUCTIONS" desc="Explanatory message about ordering the list of languages.">
Add languages or reorder list. <ph name="BEGIN_LINK">&lt;a&gt;</ph>Learn more<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph> Add languages or reorder list. <ph name="BEGIN_LINK">&lt;a&gt;</ph>Learn more<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph>
</message> </message>
...@@ -2878,7 +2881,7 @@ ...@@ -2878,7 +2881,7 @@
</message> </message>
</if> </if>
<if expr="not chromeos"> <if expr="not chromeos">
<message name="IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_ORDERING_INSTRUCTIONS" desc="Explanatory message about ordering the list of languages."> <message name="IDS_SETTINGS_LANGUAGES_BROWSER_LANGUAGES_LIST_ORDERING_INSTRUCTIONS" desc="Explanatory message about ordering the list of languages.">
Order languages based on your preference Order languages based on your preference
</message> </message>
</if> </if>
......
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
<iron-collapse id="languagesCollapse" opened="[[languagesOpened_]]"> <iron-collapse id="languagesCollapse" opened="[[languagesOpened_]]">
<span class="settings-box first" <span class="settings-box first"
hidden="[[isHelpTextHidden_(languages.enabled.*)]]"> hidden="[[isHelpTextHidden_(languages.enabled.*)]]">
<span>$i18n{orderLanguagesInstructions}</span> <span>$i18n{orderBrowserLanguagesInstructions}</span>
<if expr="chromeos"> <if expr="chromeos">
<a href="$i18n{languagesLearnMoreURL}" target="_blank"> <a href="$i18n{languagesLearnMoreURL}" target="_blank">
$i18n{learnMore} $i18n{learnMore}
......
...@@ -1625,14 +1625,16 @@ void AddLanguagesStrings(content::WebUIDataSource* html_source) { ...@@ -1625,14 +1625,16 @@ void AddLanguagesStrings(content::WebUIDataSource* html_source) {
{"searchLanguages", IDS_SETTINGS_LANGUAGE_SEARCH}, {"searchLanguages", IDS_SETTINGS_LANGUAGE_SEARCH},
{"languagesExpandA11yLabel", {"languagesExpandA11yLabel",
IDS_SETTINGS_LANGUAGES_EXPAND_ACCESSIBILITY_LABEL}, IDS_SETTINGS_LANGUAGES_EXPAND_ACCESSIBILITY_LABEL},
{"orderLanguagesInstructions", {"orderBrowserLanguagesInstructions",
IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_ORDERING_INSTRUCTIONS}, IDS_SETTINGS_LANGUAGES_BROWSER_LANGUAGES_LIST_ORDERING_INSTRUCTIONS},
{"moveToTop", IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_MOVE_TO_TOP}, {"moveToTop", IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_MOVE_TO_TOP},
{"moveUp", IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_MOVE_UP}, {"moveUp", IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_MOVE_UP},
{"moveDown", IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_MOVE_DOWN}, {"moveDown", IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_MOVE_DOWN},
{"removeLanguage", IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_REMOVE}, {"removeLanguage", IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_REMOVE},
{"addLanguages", IDS_SETTINGS_LANGUAGES_LANGUAGES_ADD}, {"addLanguages", IDS_SETTINGS_LANGUAGES_LANGUAGES_ADD},
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
{"orderLanguagesInstructions",
IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_ORDERING_INSTRUCTIONS},
{"osLanguagesPageTitle", IDS_OS_SETTINGS_LANGUAGES_AND_INPUT_PAGE_TITLE}, {"osLanguagesPageTitle", IDS_OS_SETTINGS_LANGUAGES_AND_INPUT_PAGE_TITLE},
{"osLanguagesListTitle", IDS_OS_SETTINGS_LANGUAGES_LIST_TITLE}, {"osLanguagesListTitle", IDS_OS_SETTINGS_LANGUAGES_LIST_TITLE},
{"inputMethodsListTitle", IDS_SETTINGS_LANGUAGES_INPUT_METHODS_LIST_TITLE}, {"inputMethodsListTitle", IDS_SETTINGS_LANGUAGES_INPUT_METHODS_LIST_TITLE},
......
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