Remove Welsh language feature toggle (#2311)

lailien3 · web-flow · commit b75ad8ffdcfc · 2026-02-17T14:42:18.000Z
* Remove Welsh language feature toggle https://eaflood.atlassian.net/browse/IWTF-3776 Whilst developing the bilingual site, we had a feature toggle to hide it on production. Now it’s gone live, this feature toggle should be removed. * remove from server.js * remove from misc-routes * remove from readme * remove from env vars
diff --git a/docker/env/gafl_webapp.env.example b/docker/env/gafl_webapp.env.example
@@ -30,9 +30,6 @@ DEBUG=webapp:*
 # ANALYTICS_PRIMARY_PROPERTY=G-DJMSHRPMW8 // this is the non-prod tracking update as required
 # GTM_CONTAINER_ID=GTM-ABC1234
 
-# Welsh language feature switch
-SHOW_WELSH_CONTENT=true
-
 # Error handler feature switch
 ERROR_PAGE_ROUTE=false
 
diff --git a/packages/gafl-webapp-service/README.md b/packages/gafl-webapp-service/README.md
@@ -35,7 +35,6 @@ To run from this directory:
 | SERVICE_PAGE                      | GOV.UK service page                                              |    no    | https://www.gov.uk/fishing-licences/buy-a-fishing-licence |                               |
 | AIRBRAKE_HOST                     | URL of airbrake host                                             |    no    |                                                           |                               |
 | AIRBRAKE_PROJECT_KEY              | Project key for airbrake logging                                 |    no    |                                                           |                               |
-| SHOW_WELSH_CONTENT                | Display option to change to welsh language                       |    no    |                                                           |                               |
 | ENABLE_ANALYTICS_OPT_IN_DEBUGGING | Set log if analytics been checked in non-production              |    no    |                                                           |                               |
 | ERROR_PAGE_ROUTE                  | Display error pages to support welsh language                    |    no    |                                                           |                               |
 | SHOW_CANCELLATION_JOURNEY         | Display option to show recurring payments cancellation journey   |    no    |                                                           |                               |
diff --git a/packages/gafl-webapp-service/src/__tests__/__snapshots__/plugins.spec.js.snap b/packages/gafl-webapp-service/src/__tests__/__snapshots__/plugins.spec.js.snap
diff --git a/packages/gafl-webapp-service/src/__tests__/plugin.spec.js b/packages/gafl-webapp-service/src/__tests__/plugin.spec.js
diff --git a/packages/gafl-webapp-service/src/__tests__/plugins.spec.js b/packages/gafl-webapp-service/src/__tests__/plugins.spec.js
@@ -0,0 +1,33 @@
+import { getPlugins } from '../plugins'
+
+jest.mock('../constants', () => ({
+  CommonResults: {
+    OK: 'ok'
+  },
+  ShowDigitalLicencePages: {
+    YES: 'show-digital-licence-yes'
+  }
+}))
+
+jest.mock('../server.js', () => ({
+  getCsrfTokenCookieName: jest.fn()
+}))
+jest.mock('debug', () => jest.fn(() => jest.fn()))
+
+describe('plugins', () => {
+  describe('initialiseHapiI18nPlugin', () => {
+    it('should configure i18n for English and Welsh', () => {
+      const hapI18nPlugin = getPlugins().find(plugin => plugin?.plugin?.plugin?.name === 'hapi-i18n')
+
+      expect(hapI18nPlugin.options.locales).toStrictEqual(['en', 'cy'])
+      expect(hapI18nPlugin.options.queryParameter).toBe('lang')
+    })
+  })
+
+  describe('initialiseBlankiePlugin', () => {
+    it('should return expecetd src details', async () => {
+      const blankiePlugin = getPlugins().find(plugin => plugin?.plugin?.plugin?.pkg?.name === 'blankie')
+      expect(blankiePlugin.options).toMatchSnapshot()
+    })
+  })
+})
diff --git a/packages/gafl-webapp-service/src/__tests__/server.spec.js b/packages/gafl-webapp-service/src/__tests__/server.spec.js
@@ -164,21 +164,6 @@ describe('The server', () => {
       expect(request.response.source.context._uri.queryParams).toStrictEqual({ lang: 'cy' })
     })
 
-    it.each([
-      ['true', true],
-      ['TRUE', true],
-      ['false', false],
-      ['FALSE', false]
-    ])(
-      'if SHOW_WELSH_CONTENT is %s, it should set SHOW_WELSH_CONTENT to %s in the response',
-      (inputShowWelshContent, outputShowWelshContent) => {
-        process.env.SHOW_WELSH_CONTENT = inputShowWelshContent
-        const request = getSampleRequest()
-        layoutContextAmalgamation(request, {})
-        expect(request.response.source.context.SHOW_WELSH_CONTENT).toBe(outputShowWelshContent)
-      }
-    )
-
     it.each([
       ['cookies', 'cookies.url', 'COOKIES'],
       ['refunds', 'refunds.url', 'REFUND_POLICY'],
diff --git a/packages/gafl-webapp-service/src/pages/layout/layout.njk b/packages/gafl-webapp-service/src/pages/layout/layout.njk
@@ -142,17 +142,16 @@
                 </span>
             </p>
         </div>
-        {% if SHOW_WELSH_CONTENT %}
-            <div class="govuk-width-container govuk-!-display-none-print govuk-!-margin-top-2">
-                <p class="govuk-body-s right-align govuk-!-margin-0">
-                    {% if _uri.queryParams.lang == 'cy' %}
-                        <a class="govuk-link govuk-!-margin-2" href="?lang=en" hreflang="en" lang="en">English</a> | <span class="govuk-body-s govuk-!-margin-2">Cymraeg</span>
-                    {% else %}
-                        <span class="govuk-body-s govuk-!-margin-2">English</span> | <a class="govuk-link govuk-!-margin-2" href="?lang=cy" hreflang="cy" lang="cy" rel="alternate">Cymraeg</a>
-                    {% endif%}
-                </p>
-            </div>
-        {% endif%}
+
+        <div class="govuk-width-container govuk-!-display-none-print govuk-!-margin-top-2">
+            <p class="govuk-body-s right-align govuk-!-margin-0">
+                {% if _uri.queryParams.lang == 'cy' %}
+                    <a class="govuk-link govuk-!-margin-2" href="?lang=en" hreflang="en" lang="en">English</a> | <span class="govuk-body-s govuk-!-margin-2">Cymraeg</span>
+                {% else %}
+                    <span class="govuk-body-s govuk-!-margin-2">English</span> | <a class="govuk-link govuk-!-margin-2" href="?lang=cy" hreflang="cy" lang="cy" rel="alternate">Cymraeg</a>
+                {% endif %}
+            </p>
+        </div>
     {% endif %}
     {% if backRef %}
       {{ govukBackLink({
diff --git a/packages/gafl-webapp-service/src/plugins.js b/packages/gafl-webapp-service/src/plugins.js
@@ -66,13 +66,12 @@ const initialiseCrumbPlugin = () => ({
 })
 
 const initialiseHapiI18nPlugin = () => {
-  const showWelshContent = process.env.SHOW_WELSH_CONTENT?.toLowerCase() === 'true'
   return {
     plugin: HapiI18n,
     options: {
-      locales: ['en', ...(showWelshContent ? ['cy'] : [])],
+      locales: ['en', 'cy'],
       directory: path.join(Dirname, 'src/locales'),
-      ...(showWelshContent && { queryParameter: 'lang' })
+      queryParameter: 'lang'
     }
   }
 }
diff --git a/packages/gafl-webapp-service/src/routes/__tests__/misc-routes-handlers.spec.js b/packages/gafl-webapp-service/src/routes/__tests__/misc-routes-handlers.spec.js
@@ -318,26 +318,6 @@ describe('guidance page handlers', () => {
         )
       })
 
-      it.each([
-        ['true', true],
-        ['false', false],
-        [undefined, false]
-      ])('returns SHOW_WELSH_CONTENT correctly based on env variable', async (showWelsh, expected) => {
-        process.env.SHOW_WELSH_CONTENT = showWelsh
-
-        const request = getMockRequest()
-        const toolkit = getMockToolkit()
-
-        await cookiesPagePostHandler(request, toolkit)
-
-        expect(toolkit.view).toHaveBeenCalledWith(
-          expect.any(String),
-          expect.objectContaining({
-            SHOW_WELSH_CONTENT: expected
-          })
-        )
-      })
-
       it.each([['csrf_token_cookie_name'], ['any_name'], ['token_cookie']])(
         'sets CSRF_TOKEN_NAME to match process.env.CSRF_TOKEN_COOKIE_NAME',
         async csrf => {
diff --git a/packages/gafl-webapp-service/src/routes/misc-routes.js b/packages/gafl-webapp-service/src/routes/misc-routes.js
@@ -153,7 +153,6 @@ export default [
       return h.view(COOKIES.page, {
         ...cookiesView(request, analyticsCache),
         showNotification,
-        SHOW_WELSH_CONTENT: process.env.SHOW_WELSH_CONTENT?.toLowerCase() === 'true',
         CSRF_TOKEN_NAME: process.env.CSRF_TOKEN_COOKIE_NAME || CSRF_TOKEN_COOKIE_NAME_DEFAULT,
         CSRF_TOKEN_VALUE: csrfToken
       })
diff --git a/packages/gafl-webapp-service/src/server.js b/packages/gafl-webapp-service/src/server.js
@@ -90,7 +90,6 @@ export const layoutContextAmalgamation = (request, h) => {
       CSRF_TOKEN_NAME: getCsrfTokenCookieName(),
       CSRF_TOKEN_VALUE: response.source.context[getCsrfTokenCookieName()],
       TELESALES: process.env.CHANNEL && process.env.CHANNEL !== CHANNEL_DEFAULT,
-      SHOW_WELSH_CONTENT: process.env.SHOW_WELSH_CONTENT?.toLowerCase() === 'true',
       _uri: {
         cookies: `${COOKIES.uri}${queryString}`,
         refunds: `${REFUND_POLICY.uri}${queryString}`,

Original file line number	Diff line number	Diff line change
`@@ -66,13 +66,12 @@ const initialiseCrumbPlugin = () => ({`
`66`	`66`	`})`
`67`	`67`
`68`	`68`	`const initialiseHapiI18nPlugin = () => {`
`69`		`- const showWelshContent = process.env.SHOW_WELSH_CONTENT?.toLowerCase() === 'true'`
`70`	`69`	`return {`
`71`	`70`	`plugin: HapiI18n,`
`72`	`71`	`options: {`
`73`		`- locales: ['en', ...(showWelshContent ? ['cy'] : [])],`
	`72`	`+ locales: ['en', 'cy'],`
`74`	`73`	`directory: path.join(Dirname, 'src/locales'),`
`75`		`- ...(showWelshContent && { queryParameter: 'lang' })`
	`74`	`+ queryParameter: 'lang'`
`76`	`75`	`}`
`77`	`76`	`}`
`78`	`77`	`}`