Commit 1a3d7cbb authored by jhawkins@chromium.org's avatar jhawkins@chromium.org

Help: Fix a crash because of using only a $2 paramter in a string.

The strings system doesn't work the way I thought it should.

BUG=112953
TEST=none
R=csilv

Review URL: https://chromiumcodereview.appspot.com/9348012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120799 0039d316-1c4b-4281-b951-d872f2087c98
parent 5df454c5
......@@ -234,7 +234,7 @@ be available for now. -->
</if>
<if expr="pp_ifdef('chromeos')">
<message name="IDS_ABOUT_VERSION_LICENSE" desc="The label below the copyright message, containing the URLs.">
Chromium OS is made possible by additional <ph name="BEGIN_LINK_OSS">&lt;a target="_blank" href="$2"&gt;</ph>open source software<ph name="END_LINK_OSS">&lt;/a&gt;</ph>.
Chromium OS is made possible by additional <ph name="BEGIN_LINK_OSS">&lt;a target="_blank" href="$1"&gt;</ph>open source software<ph name="END_LINK_OSS">&lt;/a&gt;</ph>.
</message>
<message name="IDS_ABOUT_CROS_VERSION_LICENSE" desc="Additional text displayed beneath the Chromium open source URLs for Chromium OS.">
Chromium OS is made possible by additional <ph name="BEGIN_LINK_CROS_OSS">BEGIN_LINK_CROS_OSS</ph>open source software<ph name="END_LINK_CROS_OSS">END_LINK_CROS_OSS</ph>.
......
......@@ -219,7 +219,7 @@ Chrome supports. -->
</if>
<if expr="pp_ifdef('chromeos')">
<message name="IDS_ABOUT_VERSION_LICENSE" desc="The label below the copyright message, containing the URLs.">
Chrome OS is made possible by additional <ph name="BEGIN_LINK_OSS">&lt;a target="_blank" href="$2"&gt;</ph>open source software<ph name="END_LINK_OSS">&lt;/a&gt;</ph>.
Chrome OS is made possible by additional <ph name="BEGIN_LINK_OSS">&lt;a target="_blank" href="$1"&gt;</ph>open source software<ph name="END_LINK_OSS">&lt;/a&gt;</ph>.
</message>
<message name="IDS_ABOUT_CROS_VERSION_LICENSE" desc="Additional text displayed beneath the Chromium open source URLs for Chrome OS.">
Chrome OS is made possible by additional <ph name="BEGIN_LINK_CROS_OSS">BEGIN_LINK_CROS_OSS</ph>open source software<ph name="END_LINK_CROS_OSS">END_LINK_CROS_OSS</ph>.
......
......@@ -92,8 +92,10 @@ void HelpHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
string16 license = l10n_util::GetStringFUTF16(
IDS_ABOUT_VERSION_LICENSE,
#if !defined(OS_CHROMEOS)
UTF8ToUTF16(google_util::StringAppendGoogleLocaleParam(
chrome::kChromiumProjectURL)),
#endif
ASCIIToUTF16(chrome::kChromeUICreditsURL));
localized_strings->SetString("productLicense", license);
......
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