diff --git a/.env.authdev1 b/.env.authdev1 index 826e701bd..c6b9e5900 100644 --- a/.env.authdev1 +++ b/.env.authdev1 @@ -69,7 +69,6 @@ VTR=["Cl","Cl.Cm"] # SUPPORT_MFA_OPTIONS=1 SUPPORT_INTERNATIONAL_NUMBERS=1 -SUPPORT_LANGUAGE_CY=1 SUPPORT_ACCOUNT_RECOVERY=1 SUPPORT_AUTH_ORCH_SPLIT=1 SUPPORT_AUTHORIZE_CONTROLLER=1 diff --git a/.env.build b/.env.build index 181ffba1b..66e9aa668 100644 --- a/.env.build +++ b/.env.build @@ -70,7 +70,6 @@ VTR=["Cl","Cl.Cm"] # SUPPORT_MFA_OPTIONS=1 SUPPORT_INTERNATIONAL_NUMBERS=1 -SUPPORT_LANGUAGE_CY=1 SUPPORT_ACCOUNT_RECOVERY=1 SUPPORT_AUTH_ORCH_SPLIT=1 SUPPORT_AUTHORIZE_CONTROLLER=1 diff --git a/ci/tasks/deploy-frontend.yml b/ci/tasks/deploy-frontend.yml index e7ef15eea..1c90ac7e7 100644 --- a/ci/tasks/deploy-frontend.yml +++ b/ci/tasks/deploy-frontend.yml @@ -17,7 +17,6 @@ params: BASIC_AUTH_PASSWORD: ((no-basic-auth-password)) INCOMING_TRAFFIC_CIDR_BLOCKS: '["0.0.0.0/0"]' BASIC_AUTH_BYPASS_CIDR_BLOCKS: '[]' - SUPPORT_LANGUAGE_CY: "0" inputs: - name: frontend-src - name: frontend-image @@ -72,7 +71,6 @@ run: -var "sidecar_image_uri=${SIDECAR_IMAGE_URI}" \ -var "sidecar_image_tag=${SIDECAR_IMAGE_TAG}" \ -var "sidecar_image_digest=${SIDECAR_IMAGE_DIGEST}" \ - -var "support_language_cy=${SUPPORT_LANGUAGE_CY}" \ -var "basic_auth_username=${NORMALISED_BASIC_AUTH_USERNAME}" \ -var "basic_auth_password=${NORMALISED_BASIC_AUTH_PASSWORD}" \ -var "incoming_traffic_cidr_blocks=${INCOMING_TRAFFIC_CIDR_BLOCKS}" \ diff --git a/ci/terraform/authdev1.tfvars b/ci/terraform/authdev1.tfvars index fb70ad2e9..2d95416d4 100644 --- a/ci/terraform/authdev1.tfvars +++ b/ci/terraform/authdev1.tfvars @@ -9,7 +9,6 @@ service_domain = "authdev1.sandpit.account.gov.uk" zone_id = "Z062000928I8D7S9X1OVA" session_expiry = 300000 gtm_id = "" -support_language_cy = "1" support_account_recovery = "1" support_auth_orch_split = "1" support_authorize_controller = "1" diff --git a/ci/terraform/authdev2.tfvars b/ci/terraform/authdev2.tfvars index 12b014450..2626a4251 100644 --- a/ci/terraform/authdev2.tfvars +++ b/ci/terraform/authdev2.tfvars @@ -9,7 +9,6 @@ service_domain = "authdev2.sandpit.account.gov.uk" zone_id = "Z062000928I8D7S9X1OVA" session_expiry = 300000 gtm_id = "" -support_language_cy = "1" support_account_recovery = "1" support_auth_orch_split = "1" support_authorize_controller = "1" diff --git a/ci/terraform/build.tfvars b/ci/terraform/build.tfvars index 5003d4d9f..e6b68211e 100644 --- a/ci/terraform/build.tfvars +++ b/ci/terraform/build.tfvars @@ -7,7 +7,6 @@ frontend_task_definition_cpu = 512 frontend_task_definition_memory = 1024 support_international_numbers = "1" -support_language_cy = "1" support_account_recovery = "1" support_auth_orch_split = "1" support_authorize_controller = "1" diff --git a/ci/terraform/dev.tfvars b/ci/terraform/dev.tfvars index a59d5e7d4..b52bd2727 100644 --- a/ci/terraform/dev.tfvars +++ b/ci/terraform/dev.tfvars @@ -2,7 +2,6 @@ basic_auth_bypass_cidr_blocks = [] deployer_role_arn = "arn:aws:iam::761723964695:role/deployer-role-pipeline-dev" common_state_bucket = "digital-identity-dev-tfstate" incoming_traffic_cidr_blocks = ["0.0.0.0/0"] -support_language_cy = "1" support_account_recovery = "1" support_international_numbers = "1" diff --git a/ci/terraform/ecs.tf b/ci/terraform/ecs.tf index 26ab3cc46..441e99aa7 100644 --- a/ci/terraform/ecs.tf +++ b/ci/terraform/ecs.tf @@ -84,10 +84,6 @@ locals { name = "SUPPORT_INTERNATIONAL_NUMBERS" value = var.support_international_numbers }, - { - name = "SUPPORT_LANGUAGE_CY" - value = var.support_language_cy - }, { name = "SUPPORT_AUTH_ORCH_SPLIT" value = var.support_auth_orch_split diff --git a/ci/terraform/integration.tfvars b/ci/terraform/integration.tfvars index 14f4b317f..6cf893b4c 100644 --- a/ci/terraform/integration.tfvars +++ b/ci/terraform/integration.tfvars @@ -6,7 +6,6 @@ frontend_task_definition_cpu = 512 frontend_task_definition_memory = 1024 support_international_numbers = "1" -support_language_cy = "1" support_account_recovery = "1" support_account_interventions = "1" support_auth_orch_split = "1" diff --git a/ci/terraform/sandpit.tfvars b/ci/terraform/sandpit.tfvars index 48fbcd83b..ae678fd96 100644 --- a/ci/terraform/sandpit.tfvars +++ b/ci/terraform/sandpit.tfvars @@ -9,7 +9,6 @@ service_domain = "sandpit.account.gov.uk" zone_id = "Z1031735QZMC84WYW1TP" session_expiry = 300000 gtm_id = "" -support_language_cy = "1" support_account_recovery = "1" support_auth_orch_split = "1" support_authorize_controller = "1" diff --git a/ci/terraform/staging.tfvars b/ci/terraform/staging.tfvars index 3a8c67e24..a64e4495f 100644 --- a/ci/terraform/staging.tfvars +++ b/ci/terraform/staging.tfvars @@ -8,7 +8,6 @@ frontend_task_definition_memory = 2048 frontend_auto_scaling_min_count = 4 frontend_auto_scaling_max_count = 240 ecs_desired_count = 4 -support_language_cy = "1" support_international_numbers = "1" support_account_recovery = "1" support_account_interventions = "1" diff --git a/ci/terraform/variables.tf b/ci/terraform/variables.tf index 56ddb237e..22bad9b6e 100644 --- a/ci/terraform/variables.tf +++ b/ci/terraform/variables.tf @@ -29,10 +29,6 @@ variable "support_international_numbers" { type = string } -variable "support_language_cy" { - type = string -} - variable "support_auth_orch_split" { type = string default = "0" diff --git a/docker-compose.frontend.yml b/docker-compose.frontend.yml index a8a2e58f2..4bc8e7588 100644 --- a/docker-compose.frontend.yml +++ b/docker-compose.frontend.yml @@ -22,7 +22,6 @@ services: ANALYTICS_COOKIE_DOMAIN: localhost SUPPORT_INTERNATIONAL_NUMBERS: ${SUPPORT_INTERNATIONAL_NUMBERS:?this should be set in your .env file.} - SUPPORT_LANGUAGE_CY: ${SUPPORT_LANGUAGE_CY:?this should be set in your .env file.} SUPPORT_ACCOUNT_RECOVERY: ${SUPPORT_ACCOUNT_RECOVERY:?this should be set in your .env file.} SUPPORT_AUTH_ORCH_SPLIT: ${SUPPORT_AUTH_ORCH_SPLIT:?this should be set in your .env file.} diff --git a/src/components/prove-identity-welcome/index-existing-session.njk b/src/components/prove-identity-welcome/index-existing-session.njk index 16de316cb..7e7b2f024 100644 --- a/src/components/prove-identity-welcome/index-existing-session.njk +++ b/src/components/prove-identity-welcome/index-existing-session.njk @@ -17,24 +17,18 @@
  • {{ 'pages.proveIdentityWelcome.section2.listItem1_3' | translate }}
    • - {% if supportLanguageCY %} - {% set insetTextInnerHtml %} - {{ 'pages.proveIdentityWelcome.section1.insetAlternativeLanguage.start' | translate }} - {{ 'pages.proveIdentityWelcome.section1.insetAlternativeLanguage.linkText.inPageLanguage' | translate }} - {{ 'pages.proveIdentityWelcome.section1.insetAlternativeLanguage.linkText.inDestinationLanguage' | translate }}. - {{ 'pages.proveIdentityWelcome.section1.insetAlternativeLanguage.end' | translate }} - {% endset %} - - {{ govukInsetText({ - html: insetTextInnerHtml - }) }} - {% else %} - {{ govukInsetText({ - text: 'pages.proveIdentityWelcome.section1.insetTextEnglishOnly' | translate - }) }} - {% endif %} + {% set insetTextInnerHtml %} + {{ 'pages.proveIdentityWelcome.section1.insetAlternativeLanguage.start' | translate }} + {{ 'pages.proveIdentityWelcome.section1.insetAlternativeLanguage.linkText.inPageLanguage' | translate }} + {{ 'pages.proveIdentityWelcome.section1.insetAlternativeLanguage.linkText.inDestinationLanguage' | translate }}. + {{ 'pages.proveIdentityWelcome.section1.insetAlternativeLanguage.end' | translate }} + {% endset %} + + {{ govukInsetText({ + html: insetTextInnerHtml + }) }}
    diff --git a/src/components/prove-identity-welcome/index.njk b/src/components/prove-identity-welcome/index.njk index a465d0bd7..1fdd4e43a 100644 --- a/src/components/prove-identity-welcome/index.njk +++ b/src/components/prove-identity-welcome/index.njk @@ -19,25 +19,19 @@
  • {{ 'pages.proveIdentityWelcome.section2.listItem1_3' | translate }}
    • - {% if supportLanguageCY %} - {% set insetTextInnerHtml %} - {{ 'pages.proveIdentityWelcome.section1.insetAlternativeLanguage.start' | translate }} - {{ 'pages.proveIdentityWelcome.section1.insetAlternativeLanguage.linkText.inPageLanguage' | translate }} - {{ 'pages.proveIdentityWelcome.section1.insetAlternativeLanguage.linkText.inDestinationLanguage' | translate }}. - {{ 'pages.proveIdentityWelcome.section1.insetAlternativeLanguage.end' | translate }} - - {% endset %} - - {{ govukInsetText({ - html: insetTextInnerHtml - }) }} - {% else %} - {{ govukInsetText({ - text: 'pages.proveIdentityWelcome.section1.insetTextEnglishOnly' | translate - }) }} - {% endif %} + {% set insetTextInnerHtml %} + {{ 'pages.proveIdentityWelcome.section1.insetAlternativeLanguage.start' | translate }} + {{ 'pages.proveIdentityWelcome.section1.insetAlternativeLanguage.linkText.inPageLanguage' | translate }} + {{ 'pages.proveIdentityWelcome.section1.insetAlternativeLanguage.linkText.inDestinationLanguage' | translate }}. + {{ 'pages.proveIdentityWelcome.section1.insetAlternativeLanguage.end' | translate }} + + {% endset %} + + {{ govukInsetText({ + html: insetTextInnerHtml + }) }} diff --git a/src/components/prove-identity-welcome/prove-identity-welcome-controller.ts b/src/components/prove-identity-welcome/prove-identity-welcome-controller.ts index 9f3a34d79..4dc753e19 100644 --- a/src/components/prove-identity-welcome/prove-identity-welcome-controller.ts +++ b/src/components/prove-identity-welcome/prove-identity-welcome-controller.ts @@ -2,16 +2,12 @@ import { Request, Response } from "express"; import { getNextPathAndUpdateJourney } from "../common/constants"; import { USER_JOURNEY_EVENTS } from "../common/state-machine/state-machine"; import { PATH_NAMES } from "../../app.constants"; -import { supportLanguageCY } from "../../config"; export function proveIdentityWelcomeGet(req: Request, res: Response): void { res.render( req.session.user.isAuthenticated ? "prove-identity-welcome/index-existing-session.njk" - : "prove-identity-welcome/index.njk", - { - supportLanguageCY: supportLanguageCY() ? true : null, - } + : "prove-identity-welcome/index.njk" ); } diff --git a/src/components/sign-in-or-create/index.njk b/src/components/sign-in-or-create/index.njk index 8611cfad0..7f9a6c926 100644 --- a/src/components/sign-in-or-create/index.njk +++ b/src/components/sign-in-or-create/index.njk @@ -28,17 +28,15 @@
  • {{ 'pages.signInOrCreate.bullet2' | translate }}
    • {% endif %} - {% if supportLanguageCY %} - {% set altLangInsetHtml %} - {{ 'pages.signInOrCreate.insetAlternativeLanguage.paragraph1' | translate }} - - {{ 'pages.signInOrCreate.insetAlternativeLanguage.linkText.inPageLanguage' | translate }} - {{ 'pages.signInOrCreate.insetAlternativeLanguage.linkText.inDestinationLanguage' | translate }}. - {% endset %} - {{ govukInsetText({ - html: altLangInsetHtml - }) }} - {% endif %} + {% set altLangInsetHtml %} + {{ 'pages.signInOrCreate.insetAlternativeLanguage.paragraph1' | translate }} + + {{ 'pages.signInOrCreate.insetAlternativeLanguage.linkText.inPageLanguage' | translate }} + {{ 'pages.signInOrCreate.insetAlternativeLanguage.linkText.inDestinationLanguage' | translate }}. + {% endset %} + {{ govukInsetText({ + html: altLangInsetHtml + }) }} diff --git a/src/components/sign-in-or-create/sign-in-or-create-controller.ts b/src/components/sign-in-or-create/sign-in-or-create-controller.ts index 0beb07198..a139c3938 100644 --- a/src/components/sign-in-or-create/sign-in-or-create-controller.ts +++ b/src/components/sign-in-or-create/sign-in-or-create-controller.ts @@ -1,7 +1,7 @@ import { Request, Response } from "express"; import { getNextPathAndUpdateJourney } from "../common/constants"; import { USER_JOURNEY_EVENTS } from "../common/state-machine/state-machine"; -import { supportInternationalNumbers, supportLanguageCY } from "../../config"; +import { supportInternationalNumbers } from "../../config"; export function signInOrCreateGet(req: Request, res: Response): void { req.session.user.isAccountCreationJourney = false; @@ -13,7 +13,6 @@ export function signInOrCreateGet(req: Request, res: Response): void { res.render("sign-in-or-create/index.njk", { serviceType: req.session.client.serviceType, supportInternationalNumbers: supportInternationalNumbers() ? true : null, - supportLanguageCY: supportLanguageCY() ? true : null, }); } diff --git a/src/config.ts b/src/config.ts index 14e7dc883..1aaa4f516 100644 --- a/src/config.ts +++ b/src/config.ts @@ -51,10 +51,6 @@ export function supportInternationalNumbers(): boolean { return process.env.SUPPORT_INTERNATIONAL_NUMBERS === "1"; } -export function supportLanguageCY(): boolean { - return process.env.SUPPORT_LANGUAGE_CY === "1"; -} - export function supportAccountRecovery(): boolean { return process.env.SUPPORT_ACCOUNT_RECOVERY === "1"; } diff --git a/src/config/i18next.ts b/src/config/i18next.ts index 2cf85f211..dae2e5c55 100644 --- a/src/config/i18next.ts +++ b/src/config/i18next.ts @@ -1,5 +1,5 @@ import { LOCALE } from "../app.constants"; -import { getServiceDomain, supportLanguageCY } from "../config"; +import { getServiceDomain } from "../config"; export function i18nextConfigurationOptions( path: string @@ -8,7 +8,7 @@ export function i18nextConfigurationOptions( debug: false, fallbackLng: LOCALE.EN, preload: [LOCALE.EN], - supportedLngs: supportLanguageCY() ? [LOCALE.EN, LOCALE.CY] : [LOCALE.EN], + supportedLngs: [LOCALE.EN, LOCALE.CY], backend: { loadPath: path, allowMultiLoading: true, diff --git a/src/locales/cy/translation.json b/src/locales/cy/translation.json index bde49b371..7a358f044 100644 --- a/src/locales/cy/translation.json +++ b/src/locales/cy/translation.json @@ -2217,8 +2217,7 @@ }, "linkHref": "?lng=en", "end": "" - }, - "insetTextEnglishOnly": "This service is currently only available in English." + } }, "section2": { "paragraph1": "Byddwch angen:", diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json index 98d944cea..34968bffa 100644 --- a/src/locales/en/translation.json +++ b/src/locales/en/translation.json @@ -2217,8 +2217,7 @@ }, "linkHref": "?lng=cy", "end": "Not all ways to prove your identity are available in Welsh yet." - }, - "insetTextEnglishOnly": "This service is currently only available in English." + } }, "section2": { "paragraph1": "You’ll need:",