Merge branch 'ghostery-browser-intro-hub' into dawn-toast-fixes

_locales/en/messages.json

@@ -1740,10 +1740,10 @@
 	"hub_create_account_toast_error": {
 		"message": "That email address is already in use. Please choose another."
 	},
-	"ghostery_browser_hub_onboarding_toast_fix_errors": {
+	"ghostery_dawn_onboarding_toast_fix_errors": {
 		"message": "Please fix errors before proceeding."
 	},
-	"ghostery_browser_hub_onboarding_install_heading": {
+	"ghostery_dawn_onboarding_install_heading": {
 		"message": "Ghostery Dawn now installing..."
 	},
 	"ghostery_dawn_onboarding_page_title": {
@@ -1929,7 +1929,7 @@
 	"ghostery_dawn_onboarding_info_smart_browsing": {
 		"message": "Smart-browsing adjusts your blocking settings to decrease page breakage and accelerate page loads."
 	},
-	"ghostery_browser_hub__onboarding_choose_your_default_search": {
+	"ghostery_dawn_hub__onboarding_choose_your_default_search": {
 		"message": "Choose your default search"
 	},
 	"ghostery_dawn_onboarding_pick_a_default_search_engine": {
@@ -1962,10 +1962,10 @@
 	"ghostery_dawn_onboarding_other": {
 		"message": "Other"
 	},
-	"ghostery_browser_hub_onboarding_toast_success": {
+	"ghostery_dawn_onboarding_toast_success": {
 		"message": "Success: "
 	},
-	"ghostery_browser_hub_onboarding_toast_alert": {
+	"ghostery_dawn_onboarding_toast_alert": {
 		"message": "Error: "
 	},
 	"enable_when_paused": {
@@ -2421,7 +2421,7 @@
   	"pick_a_default_search_engine": {
 	  "message": "Pick a default engine for all your searches."
 	},
-  	"ghostery_browser_hub_blocking_settings_view_toast_error_message": {
+  	"ghostery_dawn_hub_blocking_settings_view_toast_error_message": {
 	  "message": "Please answer all questions"
 	}
 }

app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/Step1_CreateAccountFormContainer.jsx

@@ -147,7 +147,7 @@ class CreateAccountFormContainer extends Component {
 		const { actions } = this.props;
 		if (!emailIsValid || !confirmIsValid || !legalConsentChecked || !passwordIsValid || confirmPasswordError) {
 			actions.setToast({
-				toastMessage: t('ghostery_browser_hub_onboarding_toast_fix_errors'),
+				toastMessage: t('ghostery_dawn_onboarding_toast_fix_errors'),
 				toastClass: 'alert'
 			});
 			return;

app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.jsx

@@ -105,7 +105,7 @@ class BlockSettingsView extends Component {
 			history.push('/onboarding/3');
 		} else {
 			setToast({
-				toastMessage: t('ghostery_browser_hub_blocking_settings_view_toast_error_message'),
+				toastMessage: t('ghostery_dawn_hub_blocking_settings_view_toast_error_message'),
 				toastClass: 'alert'
 			});
 		}

app/shared-components/ToastMessage/ToastMessage.jsx

@@ -27,7 +27,7 @@ const ToastMessage = ({
 	const dawnHubClass = dawnHub ? 'dawn-hub' : '';
 	const dawnLayout = dawnHub ? 'align-justify align-middle' : 'align-center-middle';
 
-	const dawnToastText = dawnHub ? t(`ghostery_browser_hub_onboarding_toast_${toastClass}`) : '';
+	const dawnToastText = dawnHub ? t(`ghostery_dawn_onboarding_toast_${toastClass}`) : '';
 
 	return (
 		<div className={`ToastMessage full-width ${dawnHubClass}`}>