diff --git a/pages/Auth.tsx b/components/Layout/Auth.tsx similarity index 100% rename from pages/Auth.tsx rename to components/Layout/Auth.tsx diff --git a/components/ResultsPage/WillBeEligible.tsx b/components/ResultsPage/WillBeEligible.tsx index f0cb47b3a..8bb88e75d 100644 --- a/components/ResultsPage/WillBeEligible.tsx +++ b/components/ResultsPage/WillBeEligible.tsx @@ -60,9 +60,9 @@ export const WillBeEligible: React.VFC<{ ? tsln.resultsPage.theyToReceive : tsln.resultsPage.partnerToReceive - const text = `${language === 'en' ? enStr : frStr} ${age}, ${ - partner ? partnerText : tsln.resultsPage.toReceive - }` + const text = `${language === 'en' ? enStr : frStr} ${age}${ + language === 'en' ? ',' : ' ans,' + } ${partner ? partnerText : tsln.resultsPage.toReceive}` const resultsArray: BenefitResult[] = Object.keys(resultObj[age]).map( (value) => resultObj[age][value] diff --git a/i18n/api/en.ts b/i18n/api/en.ts index 4650834df..7722feeca 100644 --- a/i18n/api/en.ts +++ b/i18n/api/en.ts @@ -332,7 +332,7 @@ const en: Translations = { sinceYouAreSixty: "Since you're {CURRENT_AGE}, you can start receiving your payments right away or wait for up to {WAIT_MONTHS} more {MONTH_MONTHS}.", futureDeferralOptions: - "You can start receving your payments at 65 or wait until you're 70.", + "You can start receiving your payments at 65 or wait until you're 70.", youCanAply: 'You can apply 11 months before the date you want your payments to start.', delayMonths: @@ -386,7 +386,7 @@ const en: Translations = { 'The Allowance for the Survivor is for widowed individuals between the ages of 60 and 64 who have not remarried or entered into a new common-law relationship.', alwsApply: 'You can apply for this benefit 1 month after you turn 59. ', autoEnrollTrue: - 'Based on what you told us, you do not need to apply to get this benefit. You will receive a letter in the mail letting you know of your automatic enrollment the month after you turn 64.', + 'Based on what you told us, you do not need to apply to get this benefit. You will receive a letter in the mail letting you know of your automatic enrolment the month after you turn 64.', autoEnrollFalse: 'Based on what you told us, you may have to apply for this benefit. We may not have enough information to enroll you automatically.', expectToReceive: diff --git a/pages/_app.tsx b/pages/_app.tsx index 4d9ba1651..b74a0fb7e 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -1,9 +1,7 @@ import type { AppProps } from 'next/app' import { SessionProvider } from 'next-auth/react' import '../styles/globals.css' -import Auth from './Auth' - -const PRIVATE_PATHS = ['/', '/questions', '/results', '/resultats'] +import Auth from '../components/Layout/Auth' function MyApp({ Component, @@ -11,20 +9,20 @@ function MyApp({ router: { route }, }: AppProps) { const AuthRequired = - process.env.APP_ENV !== 'production' && - process.env.APP_ENV !== 'alpha' && - PRIVATE_PATHS.some((path) => route.startsWith(path)) + process.env.APP_ENV !== 'production' && process.env.APP_ENV !== 'alpha' return ( - + <> {AuthRequired ? ( - - - + + + + + ) : ( )} - + ) }