Bug 964873 - Linkify the COPPA 'learn more' link. r=nalexander

This commit is contained in:
Richard Newman 2014-01-28 15:28:33 -08:00
Родитель 986638b5b4
Коммит 9a11e79fd2
2 изменённых файлов: 6 добавлений и 5 удалений

Просмотреть файл

@ -6,8 +6,10 @@ package org.mozilla.gecko.fxa.activities;
import org.mozilla.gecko.R;
import org.mozilla.gecko.background.common.log.Logger;
import org.mozilla.gecko.sync.setup.activities.ActivityUtils;
import android.os.Bundle;
import android.widget.TextView;
/**
* Activity which displays sign up/sign in screen to the user.
@ -28,7 +30,7 @@ public class FxAccountCreateAccountNotAllowedActivity extends FxAccountAbstractA
super.onCreate(icicle);
setContentView(R.layout.fxaccount_create_account_not_allowed);
linkifyTextViews(null, new int[] { R.id.learn_more_link });
TextView view = (TextView) findViewById(R.id.learn_more_link);
ActivityUtils.linkTextView(view, R.string.fxaccount_account_create_not_allowed_learn_more, R.string.fxaccount_link_create_not_allowed);
}
}

Просмотреть файл

@ -173,9 +173,8 @@
<string name="fxaccount_create_account_age_2006">&fxaccount.create.account.age.2006;</string>
<string name="fxaccount_create_account_age_2007">&fxaccount.create.account.age.2007;</string>
<!-- Temporary Firefox Accounts strings. -->
<!-- We haven't yet decided how to linkify, so to save translation
time we're holding this back. -->
<string name="fxaccount_account_create_not_allowed_learn_more">&lt;a href="http://www.ftc.gov/news-events/media-resources/protecting-consumer-privacy/kids-privacy-coppa"&gt;Learn more&lt;/a&gt;</string>
<string name="fxaccount_link_create_not_allowed">http://www.ftc.gov/news-events/media-resources/protecting-consumer-privacy/kids-privacy-coppa</string>
<string name="fxaccount_account_create_not_allowed_learn_more">Learn more</string>
<string name="fxaccount_sign_in_success">Account verified</string>
<string name="fxaccount_sign_in_success_description">You are now ready to use Sync!</string>
<string name="fxaccount_checkbox_contentDescription">Firefox Accounts checkbox graphic</string>