From 1fcf35c89e3f9529fda5c9c727034d3e3466d6f9 Mon Sep 17 00:00:00 2001 From: Jaimyn Mayer Date: Mon, 25 Sep 2023 11:16:03 +1000 Subject: [PATCH] made translation strings more consistent --- src-frontend/src/components/Billing/PlanCard.vue | 4 +--- src-frontend/src/components/Billing/SelectTier.vue | 6 +----- src-frontend/src/components/Billing/TierCard.vue | 6 +----- src-frontend/src/i18n/en-AU/index.ts | 10 ++++------ 4 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src-frontend/src/components/Billing/PlanCard.vue b/src-frontend/src/components/Billing/PlanCard.vue index 9d5a8869..348fa8fb 100644 --- a/src-frontend/src/components/Billing/PlanCard.vue +++ b/src-frontend/src/components/Billing/PlanCard.vue @@ -11,9 +11,7 @@ amount: $n(plan.cost / 100, 'currency', siteLocaleCurrency), intervalCount: plan.intervalAmount, interval: $tc( - `paymentPlans.${ - plan.intervalAmount > 1 ? 'intervalPlurals' : 'interval' - }.${plan.interval.toLowerCase()}` + `paymentPlans.interval.${plan.interval.toLowerCase()}` ), }) }} diff --git a/src-frontend/src/components/Billing/SelectTier.vue b/src-frontend/src/components/Billing/SelectTier.vue index 9e6019b6..3583a4e0 100644 --- a/src-frontend/src/components/Billing/SelectTier.vue +++ b/src-frontend/src/components/Billing/SelectTier.vue @@ -159,11 +159,7 @@ ), intervalCount: selectedPlan.intervalCount, interval: $tc( - `paymentPlans.${ - selectedPlan.intervalCount > 1 - ? 'intervalPlurals' - : 'interval' - }.${selectedPlan.interval.toLowerCase()}` + `paymentPlans.interval.${selectedPlan.interval.toLowerCase()}` ), }), }) diff --git a/src-frontend/src/components/Billing/TierCard.vue b/src-frontend/src/components/Billing/TierCard.vue index c35f843b..04a9830c 100644 --- a/src-frontend/src/components/Billing/TierCard.vue +++ b/src-frontend/src/components/Billing/TierCard.vue @@ -16,11 +16,7 @@ ), intervalCount: minPrice.intervalAmount, interval: $tc( - `paymentPlans.${ - minPrice.intervalAmount > 1 - ? 'intervalPlurals' - : 'interval' - }.${minPrice.interval.toLowerCase()}` + `paymentPlans.interval.${minPrice.interval.toLowerCase()}` ), }), }) diff --git a/src-frontend/src/i18n/en-AU/index.ts b/src-frontend/src/i18n/en-AU/index.ts index f35915f2..879d4814 100644 --- a/src-frontend/src/i18n/en-AU/index.ts +++ b/src-frontend/src/i18n/en-AU/index.ts @@ -479,12 +479,10 @@ export default { week: 'week', month: 'month', year: 'year', - }, - intervalPlurals: { - day: 'days', - week: 'weeks', - month: 'months', - year: 'years', + days: 'days', + weeks: 'weeks', + months: 'months', + years: 'years', }, signupFailed: 'Signup failed', signupSuccess: 'Signup success',