Skip to content

Commit

Permalink
Merge pull request #1106 from DTS-STN/develop
Browse files Browse the repository at this point in the history
Sync develop with Main for release candidate v1.4.3
  • Loading branch information
MarcoGoC authored Oct 1, 2024
2 parents 8847520 + b099fa6 commit dd45816
Show file tree
Hide file tree
Showing 6 changed files with 74 additions and 74 deletions.
2 changes: 1 addition & 1 deletion .azuredevops/dynamic-branches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ steps:
--resource-group $(webapp.resourceGroup) \
--name $(webapp.name) \
--slot pr-preview-$(webapp.slotName) \
--identities /subscriptions/400c5730-25f5-4ee6-a933-8b289b9ccb0d/resourcegroups/rg-eligibilityestimator-dev/providers/microsoft.managedidentity/userassignedidentities/id-eligibilityestimator-dev
# --identities /subscriptions/400c5730-25f5-4ee6-a933-8b289b9ccb0d/resourcegroups/rg-eligibilityestimator-dev/providers/microsoft.managedidentity/userassignedidentities/id-eligibilityestimator-dev
- task: AzureCLI@2
displayName: 'Deploy pr image to new slot'
Expand Down
10 changes: 5 additions & 5 deletions i18n/web/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ const en: WebTranslations = {
startBenefitsEstimator: 'Start benefits estimator',
estimatorTimeEstimate: 'It will take about 5 to 10 minutes to complete.',
whatBenefitsIncluded: 'Benefits included in the estimator',
inflationInfo: `This estimator uses current benefit rates. Future benefit amounts may be higher due to inflation.`,
inflationInfo: `This estimator uses October to December 2024 benefit rates. Future benefit amounts may be higher due to inflation.`,
notIncludeCPP:
'This estimator does not include the Canada Pension Plan retirement pension.',
learnMoreAboutCpp: `<a className="underline text-default-text" href="${apiEn.links.cpp.url}" target="_blank">Learn more about the Canada Pension Plan</a>`,
Expand All @@ -241,13 +241,13 @@ const en: WebTranslations = {
usingSharedDeviceInfo:
'Others who use this device may be able to see your answers. To avoid this, clear your Internet browser history after using the estimator.',
homePageP3:
"The Old Age Security pension is a monthly payment you can get if you're 65 and older. In most cases, Service Canada will be able to automatically enroll you. In other cases, you will have to apply. Service Canada will inform you if you have been automatically enrolled.",
"The Old Age Security pension is a monthly payment you can get if you're 65 and older. In most cases, Service Canada will be able to automatically enroll you. In other cases, you will have to apply. Service Canada will inform you if you have been automatically enrolled.",
homePageP4:
'The Guaranteed Income Supplement is a monthly non-taxable benefit for Old Age Security pension recipients aged 65 and older who have a low income and are living in Canada.',
'The Guaranteed Income Supplement is a monthly non-taxable benefit for Old Age Security pension recipients aged 65 and older who have a low income and are living in Canada.',
homePageP5:
'The Allowance is a monthly benefit available to low-income individuals aged 60 to 64 whose spouse or common-law partner receives the Guaranteed Income Supplement.',
'The Allowance is a monthly benefit available to low-income individuals aged 60 to 64 whose spouse or common-law partner receives the Guaranteed Income Supplement.',
homePageP6:
'The Allowance for the Survivor is a monthly benefit available to individuals aged 60 to 64 who have a low income, who are living in Canada, and whose spouse or common-law partner has passed away.',
'The Allowance for the Survivor is a monthly benefit available to individuals aged 60 to 64 who have a low income, who are living in Canada, and whose spouse or common-law partner has passed away.',
dateModified: 'Date modified:',
footerlink1: 'Contact Us',
footerlink2: 'Prime Minister',
Expand Down
10 changes: 5 additions & 5 deletions i18n/web/fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,9 @@ const fr: WebTranslations = {
timeToCompleteText: 'Temps requis pour obtenir une estimation',
startBenefitsEstimator: "Démarrer l'estimateur de prestations",
estimatorTimeEstimate:
'Il vous faudra environ 5 à 10 minutes pour obtenir une estimation.',
'Il vous faudra environ 5 à 10 minutes pour obtenir une estimation.',
whatBenefitsIncluded: "Prestations incluses dans l'estimateur",
inflationInfo: `Cet estimateur utilise les taux des prestations actuelles. Les montants des prestations futures pourraient être plus élevés en raison de l’inflation.`,
inflationInfo: `Cet estimateur utilise les taux des prestations d’octobre à décembre 2024. Les montants des prestations futures pourraient être plus élevés en raison de l’inflation.`,
notIncludeCPP: `Cet estimateur n'inclut pas la pension de retraite du Régime de pensions du Canada.`,
learnMoreAboutCpp: `<a className="underline text-default-text" href="${apiFr.links.cpp.url}" target="_blank">En savoir plus sur le Régime de pensions du Canada</a>`,
aboutResultText: 'À propos des résultats',
Expand All @@ -248,11 +248,11 @@ const fr: WebTranslations = {
homePageP3:
"La pension de la Sécurité de la vieillesse est un paiement mensuel que vous pouvez recevoir si vous avez 65 ans et plus. Dans la plupart des cas, Service Canada sera en mesure de vous inscrire automatiquement. Dans d'autres cas, vous devrez présenter une demande. Service Canada vous informera si vous avez été inscrit automatiquement.",
homePageP4:
'Le Supplément de revenu garanti est une prestation mensuelle non imposable destinée aux bénéficiaires de la pension de la Sécurité de la vieillesse âgées de 65 et plus qui ont un faible revenu et qui vivent au Canada.',
'Le Supplément de revenu garanti est une prestation mensuelle non imposable destinée aux bénéficiaires de la pension de la Sécurité de la vieillesse âgées de 65 et plus qui ont un faible revenu et qui vivent au Canada.',
homePageP5:
"L'Allocation est une prestation mensuelle offerte aux personnes à faible revenu âgées de 60 à 64 ans dont l'époux ou le conjoint de fait reçoit le Supplément de revenu garanti.",
"L'Allocation est une prestation mensuelle offerte aux personnes à faible revenu âgées de 60 à 64 ans dont l'époux ou le conjoint de fait reçoit le Supplément de revenu garanti.",
homePageP6:
"L'Allocation au survivant est une prestation mensuelle offerte aux personnes âgées de 60 à 64 ans qui ont un faible revenu, qui vivent au Canada et dont l'époux ou le conjoint de fait est décédé.",
"L'Allocation au survivant est une prestation mensuelle offerte aux personnes âgées de 60 à 64 ans qui ont un faible revenu, qui vivent au Canada et dont l'époux ou le conjoint de fait est décédé.",
dateModified: 'Date de modification :',
footerlink1: 'Contactez-nous',
footerlink2: 'Premier ministre',
Expand Down
Empty file.
76 changes: 38 additions & 38 deletions utils/api/scrapers/data/oas-amounts-en.json
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
{
"lastupdatedYear": "2023",
"lastupdatedQuarter": "July to September 2024",
"renewalYearGIS": "2024",
"oas": {
"average": "718.33",
"average75": "790.16",
"maximum": "142,609",
"maximum75": "148,179",
"clawback": "86,912"
},
"gis": {
"single-amount": "1,072.93",
"single-limit": "21,768",
"spouse-oas-amount": "645.84",
"spouse-oas-limit": "28,752",
"spouse-no-oas-amount": "1,072.93",
"spouse-no-oas-limit": "52,176",
"spouse-allowance-amount": "645.84",
"spouse-allowance-limit": "40,272"
},
"allowance": {
"spouse-gis-amount": "1,364.17",
"spouse-gis-limit": "40,272",
"survivor-amount": "1,626.20",
"survivor-limit": "29,328"
},
"topup": {
"single": "166.20",
"married": "47.09"
},
"delay": {
"oas66": "770.05",
"oas67": "821.77",
"oas68": "873.49",
"oas69": "925.21",
"oas70": "976.93"
}
}
"lastupdatedYear": "2023",
"lastupdatedQuarter": "October to December 2024",
"renewalYearGIS": "2024",
"oas": {
"average": "727.67",
"average75": "800.44",
"maximum": "148,451",
"maximum75": "154,196",
"clawback": "90,997"
},
"gis": {
"single-amount": "1,086.88",
"single-limit": "22,056",
"spouse-oas-amount": "654.23",
"spouse-oas-limit": "29,136",
"spouse-no-oas-amount": "1,086.88",
"spouse-no-oas-limit": "52,848",
"spouse-allowance-amount": "654.23",
"spouse-allowance-limit": "40,800"
},
"allowance": {
"spouse-gis-amount": "1,381.90",
"spouse-gis-limit": "40,800",
"survivor-amount": "1,647.34",
"survivor-limit": "29,712"
},
"topup": {
"single": "168.36",
"married": "47.70"
},
"delay": {
"oas66": "780.06",
"oas67": "832.45",
"oas68": "884.85",
"oas69": "937.24",
"oas70": "989.63"
}
}
50 changes: 25 additions & 25 deletions utils/api/scrapers/output/legalValuesJson.json
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
{
"lastUpdatedYear": 2023,
"lastUpdatedQuarter": "July to September 2024",
"lastUpdatedQuarter": "October to December 2024",
"renewalYearGIS": 2024,
"oas": {
"amount": 718.33,
"amount75": 790.16,
"incomeLimit": 142609,
"incomeLimit75": 148179,
"clawbackIncomeLimit": 86912
"amount": 727.67,
"amount75": 800.44,
"incomeLimit": 148451,
"incomeLimit75": 154196,
"clawbackIncomeLimit": 90997
},
"gis": {
"singleAmount": 1072.93,
"singleIncomeLimit": 21768,
"spouseOasAmount": 645.84,
"spouseOasIncomeLimit": 28752,
"spouseNoOasAmount": 1072.93,
"spouseNoOasIncomeLimit": 52176,
"spouseAlwAmount": 645.84,
"spouseAlwIncomeLimit": 40272
"singleAmount": 1086.88,
"singleIncomeLimit": 22056,
"spouseOasAmount": 654.23,
"spouseOasIncomeLimit": 29136,
"spouseNoOasAmount": 1086.88,
"spouseNoOasIncomeLimit": 52848,
"spouseAlwAmount": 654.23,
"spouseAlwIncomeLimit": 40800
},
"alw": {
"alwAmount": 1364.17,
"alwIncomeLimit": 40272,
"afsAmount": 1626.2,
"afsIncomeLimit": 29328
"alwAmount": 1381.9,
"alwIncomeLimit": 40800,
"afsAmount": 1647.34,
"afsIncomeLimit": 29712
},
"topUp": {
"single": 166.2,
"married": 47.09
"single": 168.36,
"married": 47.7
},
"delay": {
"oas66": 770.05,
"oas67": 821.77,
"oas68": 873.49,
"oas69": 925.21,
"oas70": 976.93
"oas66": 780.06,
"oas67": 832.45,
"oas68": 884.85,
"oas69": 937.24,
"oas70": 989.63
}
}

0 comments on commit dd45816

Please sign in to comment.