Fix path bug in i18n-checker tool. Consolidate redundant entries in m…

…essages. Add check icon to plus promo modal. Modify plus promo modal css.

app/content-scripts/rewards/OfferCard.jsx

@@ -74,7 +74,7 @@ class OfferCard extends Component {
 				message: t('rewards_first_prompt_extended'),
 				textLink: {
 					href: 'https://www.ghostery.com/faqs/what-is-ghostery-rewards/',
-					text: t('rewards_learn_more'),
+					text: t('learn_more'),
 					callback: () => {
 						this.props.actions.sendSignal('offer_first_learn');
 						sendMessage('ping', 'rewards_first_learn_more');

app/hub/Views/CreateAccountView/CreateAccountView.jsx

@@ -73,7 +73,7 @@ const CreateAccountView = (props) => {
 				<div className="CreateAccountView--addPaddingTop row align-center-middle">
 					<div className="columns small-12 medium-5">
 						<label htmlFor="create-account-email" className="CreateAccountView__inputLabel">
-							{t('hub_create_account_label_email')}
+							{t('email_colon')}
 						</label>
 						<input
 							id="create-account-email"
@@ -87,13 +87,13 @@ const CreateAccountView = (props) => {
 						/>
 						{emailError && (
 							<div className="CreateAccountView__inputError">
-								{t('hub_create_account_label_email_invalid')}
+								{t('please_enter_a_valid_email')}
 							</div>
 						)}
 					</div>
 					<div className="columns small-12 medium-5">
 						<label htmlFor="create-account-confirmEmail" className="CreateAccountView__inputLabel">
-							{t('hub_create_account_label_email_confirm')}
+							{t('confirm_email_colon')}
 						</label>
 						<input
 							id="create-account-confirmEmail"
@@ -107,7 +107,7 @@ const CreateAccountView = (props) => {
 						/>
 						{confirmEmailError && (
 							<div className="CreateAccountView__inputError">
-								{t('hub_create_account_label_email_confirm_invalid')}
+								{t('your_emails_do_not_match')}
 							</div>
 						)}
 					</div>
@@ -147,7 +147,7 @@ const CreateAccountView = (props) => {
 				<div className="row align-center-middle">
 					<div className="columns small-12 medium-5">
 						<label htmlFor="create-account-password" className="CreateAccountView__inputLabel">
-							{t('hub_create_account_label_password')}
+							{t('password_colon')}
 						</label>
 						<input
 							id="create-account-password"
@@ -214,7 +214,7 @@ const CreateAccountView = (props) => {
 				<div className="CreateAccountView--addPaddingTop row align-center">
 					<div className="CreateAccountView__submit columns small-12 medium-10 flex-container flex-dir-row-reverse">
 						<button type="submit" className="CreateAccountView__button button success">
-							{ t('hub_create_account_button_submit') }
+							{ t('create_account') }
 						</button>
 					</div>
 				</div>

app/hub/Views/HomeView/HomeView.jsx

@@ -106,7 +106,7 @@ const HomeView = (props) => {
 						</a>
 					) : (
 						<NavLink to="/create-account">
-							{t('hub_home_subheader_create_account')}
+							{t('create_account')}
 						</NavLink>
 					)}
 				</div>
@@ -120,15 +120,15 @@ const HomeView = (props) => {
 							{t('hub_home_feature_tutorial_text')}
 						</div>
 						<NavLink to="/tutorial" className={tutorialButtonClassNames}>
-							{tutorial_complete ? t('hub_home_feature_tutorial_button_alt') : t('hub_home_feature_tutorial_button')}
+							{tutorial_complete ? t('hub_home_feature_tutorial_button_alt') : t('start')}
 						</NavLink>
 					</div>
 					<div className="HomeView__dividerVertical column shrink show-for-large" />
 					<div className="HomeView__dividerHorizontal hide-for-large" />
 					<div className={setupFeatureClassNames}>
 						<div className="HomeView__featureIcon" />
 						<div className="HomeView__featureTitle">
-							{t('hub_home_feature_setup_title')}
+							{t('customize_setup')}
 						</div>
 						<div className="HomeView__featureText flex-child-grow">
 							{t('hub_home_feature_setup_text')}
@@ -146,7 +146,7 @@ const HomeView = (props) => {
 					<div className="HomeView__featureIcon columns shrink feature-plus show-for-large" />
 					<div className="columns flex-container align-center-middle">
 						<NavLink to="/plus" className="HomeView__featureButton button primary">
-							{isPlus ? t('hub_home_feature_supporter_button_alt') : t('hub_home_feature_supporter_button')}
+							{isPlus ? t('Aready_Subscribed') : t('get_ghostery_plus')}
 						</NavLink>
 					</div>
 				</div>

app/hub/Views/HomeView/HomeView.scss

@@ -271,12 +271,21 @@
 	text-align: center;
 	color: #333333;
 
-	&.bold {
-		font-weight: bold;
-		color: #4a4a4a;
+	&.italic {
+		font-style: italic;
 	}
 }
 
+.PlusPromoModal__check-icon {
+	padding-right: 5px;
+	margin-top: -18px;
+}
+
+.PlusPromoModal__plus-option-description-item-container {
+	display: flex;
+	justify-content: center;
+}
+
 .PlusPromoModal__button {
 	margin: 0;
 	font-size: 11px;

app/hub/Views/HomeView/HomeViewContainer.jsx

@@ -72,50 +72,59 @@ class HomeViewContainer extends Component {
 		<div className="PlusPromoModal__content flex-container flex-dir-column align-middle">
 			<div className="PlusPromoModal__buttons-background" />
 			<div className="PlusPromoModal__thanks-for-download">
-				Thanks for downloading Ghostery!
+				{t('thanks_for_downloading_ghostery')}
 			</div>
 			<div className="PlusPromoModal__choose-your-plan">
-				Choose your privacy plan
+				{t('choose_your_privacy_plan')}
 			</div>
 			<div className="PlusPromoModal__options-container full-width">
 				<div className="PlusPromoModal__option-container">
 					<div className="PlusPromoModal__option-description-box basic">
-						<div className="PlusPromoModal__option-header basic">Ghostery Basic</div>
+						<div className="PlusPromoModal__option-header basic">{t('ghostery_basic')}</div>
 						<div className="PlusPromoModal__price-text basic">
-							<span className="PlusPromoModal__currency-sign">$</span>
+							<span className="PlusPromoModal__currency-sign">{t('locale_appropriate_currency_icon')}</span>
 							<span className="PlusPromoModal__amount">0</span>
 							<span> </span>
-							<span className="PlusPromoModal__per-month">per month</span>
+							<span className="PlusPromoModal__per-month">{t('per_month')}</span>
 						</div>
 						<div className="PlusPromoModal__option-description">
-							<p className="PlusPromoModal__option-description-item">Protection for this browser</p>
-							<p className="PlusPromoModal__option-description-item">Blocks Ads</p>
-							<p className="PlusPromoModal__option-description-item">Blocks Trackers</p>
-							<p className="PlusPromoModal__option-description-item">Fast Browsing</p>
+							<p className="PlusPromoModal__option-description-item no-capitalize">{t('protection_for_this_browser')}</p>
+							<p className="PlusPromoModal__option-description-item">{t('blocks_ads')}</p>
+							<p className="PlusPromoModal__option-description-item">{t('blocks_trackers')}</p>
+							<p className="PlusPromoModal__option-description-item">{t('fast_browsing')}</p>
 						</div>
 					</div>
 					<div className="PlusPromoModal__button basic button" onClick={this._dismissModal}>
-						<span>Select Basic</span>
+						<span>{t('select_basic')}</span>
 					</div>
 				</div>
 				<div className="PlusPromoModal__option-container">
 					<div className="PlusPromoModal__option-description-box plus">
 						<div className="PlusPromoModal__recommended-banner">
 							<img src="/app/images/hub/home/recommended-banner.svg" />
-							<div className="PlusPromoModal__recommended-banner-text">Recommended</div>
+							<div className="PlusPromoModal__recommended-banner-text">{t('recommended')}</div>
 						</div>
 						<div className="PlusPromoModal__option-header plus">Ghostery Plus</div>
 						<div className="PlusPromoModal__price-text plus">
-							<span className="PlusPromoModal__currency-sign">$</span>
-							<span className="PlusPromoModal__amount">2</span>
+							<span className="PlusPromoModal__currency-sign">{t('locale_appropriate_currency_icon')}</span>
+							<span className="PlusPromoModal__amount">{t('plus_monthly_subscription_price_number')}</span>
 							<span> </span>
 							<span className="PlusPromoModal__per-month">per month</span>
 						</div>
 						<div className="PlusPromoModal__option-description">
-							<p className="PlusPromoModal__option-description-item">All basic features, plus:</p>
-							<p className="PlusPromoModal__option-description-item bold">Historical Tracker Stats</p>
-							<p className="PlusPromoModal__option-description-item bold">Priority Support</p>
-							<p className="PlusPromoModal__option-description-item bold">New Color Themes</p>
+							<p className="PlusPromoModal__option-description-item italic">All basic features, plus:</p>
+							<div className="PlusPromoModal__plus-option-description-item-container">
+								<img className="PlusPromoModal__check-icon" src="/app/images/hub/home/check-icon.svg" />
+								<p className="PlusPromoModal__option-description-item">Historical Tracker Stats</p>
+							</div>
+							<div className="PlusPromoModal__plus-option-description-item-container">
+								<img className="PlusPromoModal__check-icon" src="/app/images/hub/home/check-icon.svg" />
+								<p className="PlusPromoModal__option-description-item">Priority Support</p>
+							</div>
+							<div className="PlusPromoModal__plus-option-description-item-container">
+								<img className="PlusPromoModal__check-icon" src="/app/images/hub/home/check-icon.svg" />
+								<p className="PlusPromoModal__option-description-item">New Color Themes</p>
+							</div>
 						</div>
 					</div>
 					<a href="http://signon.ghostery.com/en/subscribe/" target="_blank" rel="noopener noreferrer" className="PlusPromoModal__button plus button" onClick={this._dismissModal}>

app/hub/Views/LogInView/LogInView.jsx

@@ -56,7 +56,7 @@ const LogInView = (props) => {
 				<div className="columns small-12 medium-10 large-6">
 					<form onSubmit={handleSubmit}>
 						<label htmlFor="login-email" className="LogInView__inputLabel">
-							{t('hub_login_label_email')}
+							{t('email_colon')}
 						</label>
 						<input
 							id="login-email"
@@ -70,11 +70,11 @@ const LogInView = (props) => {
 						/>
 						{emailError && (
 							<div className="LogInView__inputError">
-								{t('hub_login_label_email_invalid')}
+								{t('please_enter_a_valid_email')}
 							</div>
 						)}
 						<label htmlFor="login-password" className="LogInView__inputLabel">
-							{t('hub_login_label_password')}
+							{t('password_colon')}
 						</label>
 						<input
 							id="login-password"
@@ -101,7 +101,7 @@ const LogInView = (props) => {
 						</div>
 						<div className="LogInView--addPaddingTop flex-container align-center">
 							<button type="submit" className="LogInView__button button success">
-								{ t('hub_login_button_submit') }
+								{ t('sign_in') }
 							</button>
 						</div>
 					</form>

app/hub/Views/PlusView/PlusView.jsx

@@ -36,11 +36,11 @@ class PlusView extends Component {
 
 		return isPlus ? (
 			<div className={buttonClassNames}>
-				{t('hub_supporter_button_text_alt')}
+				{t('already_subscribed')}
 			</div>
 		) : (
 			<a className={buttonClassNames} href={buttonHref} onClick={onPlusClick} target="_blank" rel="noopener noreferrer">
-				{t('hub_supporter_button_text')}
+				{t('get_ghostery_plus')}
 			</a>
 		);
 	}
@@ -74,7 +74,7 @@ class PlusView extends Component {
 					<div className="PlusView__perk columns text-center">
 						<div className="PlusView__perkIcon themes" />
 						<div className="PlusView__perkTitle">
-							{t('hub_supporter_perk_themes_title')}
+							{t('new_themes')}
 						</div>
 						<div className="PlusView__perkDescription">
 							{t('hub_supporter_perk_themes_description')}
@@ -83,7 +83,7 @@ class PlusView extends Component {
 					<div className="PlusView__perk columns text-center">
 						<div className="PlusView__perkIcon stats" />
 						<div className="PlusView__perkTitle">
-							{t('hub_supporter_perk_stats_title')}
+							{t('historical_blocking_stats')}
 						</div>
 						<div className="PlusView__perkDescription">
 							{t('hub_supporter_perk_stats_description')}
@@ -110,7 +110,7 @@ class PlusView extends Component {
 					<div className="row align-center">
 						<div className="PlusView__feature small-12 medium-6 large-5 large-offset-1 columns">
 							<div className="PlusView__headingTitle PlusView--addPaddingTop">
-								{t('hub_supporter_feature_theme_title')}
+								{t('new_themes')}
 							</div>
 							<div className="PlusView__headingDescription">
 								{t('hub_supporter_feature_theme_description')}
@@ -121,7 +121,7 @@ class PlusView extends Component {
 							<img
 								className="PlusView__featureImage theme"
 								src="/app/images/hub/plus/feature-theme.png"
-								alt={t('hub_supporter_feature_theme_title')}
+								alt={t('new_themes')}
 							/>
 						</div>
 					</div>
@@ -139,12 +139,12 @@ class PlusView extends Component {
 							<img
 								className="PlusView__featureImage stats"
 								src="/app/images/hub/plus/feature-stats.svg"
-								alt={t('hub_supporter_feature_stats_title')}
+								alt={t('historical_blocking_stats')}
 							/>
 						</div>
 						<div className="PlusView__feature small-12 medium-6 large-5 columns">
 							<div className="PlusView__headingTitle">
-								{t('hub_supporter_feature_stats_title')}
+								{t('historical_blocking_stats')}
 							</div>
 							<div className="PlusView__headingDescription">
 								{t('hub_supporter_feature_stats_description')}
@@ -155,7 +155,7 @@ class PlusView extends Component {
 							<img
 								className="PlusView__featureImage stats"
 								src="/app/images/hub/plus/feature-stats.svg"
-								alt={t('hub_supporter_feature_stats_title')}
+								alt={t('historical_blocking_stats')}
 							/>
 						</div>
 					</div>
@@ -171,7 +171,7 @@ class PlusView extends Component {
 					<div className="row align-center">
 						<div className="PlusView__feature small-12 medium-6 large-5 large-offset-1 columns">
 							<div className="PlusView__headingTitle">
-								{t('hub_supporter_feature_support_title')}
+								{t('priority_support')}
 							</div>
 							<div className="PlusView__headingDescription">
 								{t('hub_supporter_feature_support_description')}
@@ -182,7 +182,7 @@ class PlusView extends Component {
 							<img
 								className="PlusView__featureImage support"
 								src="/app/images/hub/plus/feature-support.svg"
-								alt={t('hub_supporter_feature_support_title')}
+								alt={t('priority_support')}
 							/>
 						</div>
 					</div>

app/hub/Views/RewardsView/RewardsView.jsx

@@ -46,7 +46,7 @@ class RewardsView extends Component {
 						</div>
 						<div className="RewardsView__buttonContainer">
 							<a className="RewardsView__button button success" href="https://www.ghostery.com/faqs/what-is-ghostery-rewards/" target="_blank" rel="noopener noreferrer">
-								{t('hub_rewards_header_learn_more')}
+								{t('learn_more')}
 							</a>
 						</div>
 					</div>

app/hub/Views/SetupViews/SetupAntiSuiteView/SetupAntiSuiteViewContainer.jsx

@@ -36,8 +36,8 @@ class SetupAntiSuiteViewContainer extends Component {
 			hrefPrev: `/setup/${index - 1}`,
 			hrefNext: `/setup/${index + 1}`,
 			hrefDone: '/',
-			textPrev: t('hub_setup_nav_previous'),
-			textNext: t('hub_setup_nav_next'),
+			textPrev: t('previous'),
+			textNext: t('next'),
 			textDone: t('hub_setup_exit_flow'),
 		});
 

app/hub/Views/SetupViews/SetupBlockingDropdown/SetupBlockingDropdown.jsx

@@ -80,7 +80,7 @@ class SetupBlockingDropdown extends Component {
 				<GlobalBlocking settingsData={settingsData} actions={actions} showToast={this._showToast} hideToast={this._hideToastDebounce} language={settingsData.language} />
 				<div className="SetupBlockingDropdown__buttonContainer flex-container flex-dir-row-reverse">
 					<div className="button success" onClick={handleDoneClick}>
-						{t('hub_setup_nav_done')}
+						{t('done')}
 					</div>
 				</div>
 			</div>

app/hub/Views/SetupViews/SetupBlockingView/SetupBlockingViewContainer.jsx

@@ -40,7 +40,7 @@ class SetupBlockingViewContainer extends Component {
 			hrefNext: `/setup/${index + 1}`,
 			hrefDone: '/',
 			textPrev: false,
-			textNext: t('hub_setup_nav_next'),
+			textNext: t('next'),
 			textDone: t('hub_setup_exit_flow'),
 		});
 

app/hub/Views/SetupViews/SetupDoneView/SetupDoneViewContainer.jsx

@@ -33,8 +33,8 @@ class SetupDoneViewContainer extends Component {
 			hrefPrev: `/setup/${index - 1}`,
 			hrefNext: '/',
 			hrefDone: '/',
-			textPrev: t('hub_setup_nav_previous'),
-			textNext: t('hub_setup_nav_done'),
+			textPrev: t('previous'),
+			textNext: t('done'),
 			textDone: t('hub_setup_exit_flow'),
 		});
 
@@ -56,14 +56,14 @@ class SetupDoneViewContainer extends Component {
 				id: 'tutorial',
 				title: t('hub_setup_feature_tutorial_title'),
 				description: t('hub_setup_feature_tutorial_description'),
-				buttonText: t('hub_setup_feature_tutorial_button'),
+				buttonText: t('start'),
 				buttonHref: '/tutorial/1',
 			},
 			{
 				id: 'plus',
-				title: t('hub_setup_feature_supporter_title'),
+				title: t('get_ghostery_plus'),
 				description: t('hub_setup_feature_supporter_description'),
-				buttonText: t('hub_setup_feature_supporter_button'),
+				buttonText: t('support'),
 				buttonHref: '/plus',
 			},
 			{