Improve wording for CA

This commit is contained in:
Rafael 2022-03-23 09:16:07 -03:00 committed by Thomas Zarebczan
parent 7477208c4e
commit dcb19a9f48
3 changed files with 19 additions and 2 deletions

View file

@ -1,11 +1,13 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { doSetLanguage, doSetHomepage } from 'redux/actions/settings'; import { doSetLanguage, doSetHomepage } from 'redux/actions/settings';
import { selectHomepageCode } from 'redux/selectors/settings'; import { selectHomepageCode } from 'redux/selectors/settings';
import { selectUserCountry } from 'redux/selectors/user';
import { doOpenModal } from 'redux/actions/app'; import { doOpenModal } from 'redux/actions/app';
import NagLocaleSwitch from './view'; import NagLocaleSwitch from './view';
const select = (state) => ({ const select = (state) => ({
homepageCode: selectHomepageCode(state), homepageCode: selectHomepageCode(state),
userCountry: selectUserCountry(state),
}); });
const perform = { const perform = {

View file

@ -19,13 +19,23 @@ type Props = {
onFrontPage: boolean, onFrontPage: boolean,
// redux // redux
homepageCode: string, homepageCode: string,
userCountry: ?string,
doSetLanguage: (string) => void, doSetLanguage: (string) => void,
doSetHomepage: (string) => void, doSetHomepage: (string) => void,
doOpenModal: (string, {}) => void, doOpenModal: (string, {}) => void,
}; };
export default function NagLocaleSwitch(props: Props) { export default function NagLocaleSwitch(props: Props) {
const { localeLangs, noLanguageSet, onFrontPage, homepageCode, doSetLanguage, doSetHomepage, doOpenModal } = props; const {
localeLangs,
noLanguageSet,
onFrontPage,
homepageCode,
userCountry,
doSetLanguage,
doSetHomepage,
doOpenModal,
} = props;
const [localeSwitchDismissed, setLocaleSwitchDismissed] = usePersistedState('locale-switch-dismissed', false); const [localeSwitchDismissed, setLocaleSwitchDismissed] = usePersistedState('locale-switch-dismissed', false);
@ -48,7 +58,7 @@ export default function NagLocaleSwitch(props: Props) {
if (localeSwitchDismissed || !optionToSwitch) return null; if (localeSwitchDismissed || !optionToSwitch) return null;
const message = __( let message = __(
// If no homepage, only suggest language switch // If no homepage, only suggest language switch
optionToSwitch === LOCALE_OPTIONS.LANG optionToSwitch === LOCALE_OPTIONS.LANG
? 'There are language translations available for your location! Do you want to switch from English?' ? 'There are language translations available for your location! Do you want to switch from English?'
@ -56,6 +66,9 @@ export default function NagLocaleSwitch(props: Props) {
? 'Homepage and language translations are available for your location! Do you want to switch?' ? 'Homepage and language translations are available for your location! Do you want to switch?'
: 'A homepage is available for your location! Do you want to switch?' : 'A homepage is available for your location! Do you want to switch?'
); );
// -- override for specific case due to feedback --
if (userCountry === 'CA') message = 'There are translations available in French, do you want to switch from English?';
// ------------------------------------------------
function dismissNag() { function dismissNag() {
setLocaleSwitchDismissed(true); setLocaleSwitchDismissed(true);

View file

@ -131,3 +131,5 @@ export const selectYouTubeImportVideosComplete = createSelector(selectState, (st
export const makeSelectUserPropForProp = (prop) => createSelector(selectUser, (user) => (user ? user[prop] : null)); export const makeSelectUserPropForProp = (prop) => createSelector(selectUser, (user) => (user ? user[prop] : null));
export const selectUserLocale = (state) => selectState(state).locale; export const selectUserLocale = (state) => selectState(state).locale;
export const selectUserCountry = createSelector(selectUserLocale, (locale) => locale?.country);