Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync develop with Main for release candidate v1.4.2 #1099

Merged
merged 6 commits into from
Jul 15, 2024
Merged

Sync develop with Main for release candidate v1.4.2 #1099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b5e2d9
removing request for testers link
MarcoGoC Jul 4, 2024
99f36ee
added security word
MarcoGoC Jul 4, 2024
0f1220f
Merge pull request #1095 from DTS-STN/221321-social
MarcoGoC Jul 10, 2024
df9d1f8
added e
MarcoGoC Jul 11, 2024
3f055a8
Merge pull request #1094 from DTS-STN/216146-link
MarcoGoC Jul 11, 2024
fb4cef5
Merge pull request #1098 from DTS-STN/221321-social
MarcoGoC Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion i18n/api/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ const en: Translations = {
[FieldKey.YEARS_IN_CANADA_SINCE_18]: 'Years lived in Canada',
[FieldKey.YEARS_IN_CANADA_SINCE_OAS]: 'Years lived in Canada',
[FieldKey.EVER_LIVED_SOCIAL_COUNTRY]:
'Lived in country with social agreement',
'Lived in country with social security agreement',
[FieldKey.MARITAL_STATUS]: 'Marital status',
[FieldKey.INV_SEPARATED]: 'Involuntarily separated',
[FieldKey.PARTNER_INCOME_AVAILABLE]: "Partner's net income",
Expand Down
2 changes: 1 addition & 1 deletion i18n/api/fr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ const fr: Translations = {
[FieldKey.YEARS_IN_CANADA_SINCE_18]: 'Années vécues au Canada',
[FieldKey.YEARS_IN_CANADA_SINCE_OAS]: 'Années vécues au Canada',
[FieldKey.EVER_LIVED_SOCIAL_COUNTRY]:
'A vécu dans un pays avec un accord social',
'A vécu dans un pays avec un accord de sécurité sociale',
[FieldKey.MARITAL_STATUS]: 'État matrimonial',
[FieldKey.INV_SEPARATED]: 'Séparation involontaire',
[FieldKey.PARTNER_INCOME_AVAILABLE]: 'Revenu du conjoint fourni',
Expand Down
2 changes: 1 addition & 1 deletion i18n/web/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ const en: WebTranslations = {
required: '(required)',
workInProgress: 'This estimator is a work in progress',
workInProgressBody:
'You can help improve it by: <ul class="list-disc" style="margin-left: 2rem;")><li><a class="underline text-default-text generatedLink" href="https://srv217.services.gc.ca/ihst4/Intro.aspx?cid=74938e05-8e91-42a9-8e9d-29daf79f6fe0&lc=eng" target="_blank">giving your feedback</a></li><li><a class="underline text-default-text generatedLink" href="https://forms-formulaires.alpha.canada.ca/en/id/clwi90pv301hsx883ffit057r" target="_blank">trying our next version</a></li></ul>',
'You can help improve it by giving your <a class="underline text-default-text generatedLink" href="https://srv217.services.gc.ca/ihst4/Intro.aspx?cid=74938e05-8e91-42a9-8e9d-29daf79f6fe0&lc=eng" target="_blank">feedback</a>.',
homePageP1:
'Use this estimator to find out how much money you could get from Old Age Security benefits. This is not an application for benefits.',
homePageHeader1: 'Who these benefits are for',
Expand Down
2 changes: 1 addition & 1 deletion i18n/web/fr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ const fr: WebTranslations = {
required: '(obligatoire)',
workInProgress: 'Cet estimateur est un travail en cours',
workInProgressBody:
'Vous pouvez aider à l’améliorer en : <ul class="list-disc" style="margin-left: 2rem;")><li><a class="underline text-default-text generatedLink" href="https://srv217.services.gc.ca/ihst4/Intro.aspx?cid=74938e05-8e91-42a9-8e9d-29daf79f6fe0&lc=fra" target="_blank">donnant votre rétroaction</a></li><li><a class="underline text-default-text generatedLink" href="https://forms-formulaires.alpha.canada.ca/fr/id/clwi90pv301hsx883ffit057r" target="_blank">essayant notre prochaine version</a></li></ul>',
'Vous pouvez aider à l’améliorer en donnant votre <a class="underline text-default-text generatedLink" href="https://srv217.services.gc.ca/ihst4/Intro.aspx?cid=74938e05-8e91-42a9-8e9d-29daf79f6fe0&lc=fra" target="_blank">rétroaction</a>.',
homePageP1:
"Utilisez cet outil pour déterminer le montant que vous pourriez recevoir des prestations de la Sécurité de la vieillesse. Il ne s'agit pas d'une demande de prestations.",
homePageHeader1: 'Qui peut recevoir ces prestations',
Expand Down
Loading