From cead23d2b36a29a16be08661bef59576c71c0d56 Mon Sep 17 00:00:00 2001 From: Romaric Date: Mon, 3 Oct 2022 15:39:24 +0100 Subject: [PATCH] Remove configuration of locale via JavaScript --- .../character-count/character-count.mjs | 3 +- .../character-count.unit.test.mjs | 34 ------------------- 2 files changed, 1 insertion(+), 36 deletions(-) diff --git a/src/govuk/components/character-count/character-count.mjs b/src/govuk/components/character-count/character-count.mjs index 8f6f4cc888..cb22c1e7a9 100644 --- a/src/govuk/components/character-count/character-count.mjs +++ b/src/govuk/components/character-count/character-count.mjs @@ -93,10 +93,9 @@ function CharacterCount ($module, config) { datasetConfig ) - console.log(this.$module) this.i18n = new I18n(extractConfigByNamespace(this.config, 'i18n'), { // Read the fallback if necessary rather than have it set in the defaults - locale: this.config.i18nLocale || closestAttributeValue($module, 'lang') + locale: closestAttributeValue($module, 'lang') }) // Determine the limit attribute (characters or words) diff --git a/src/govuk/components/character-count/character-count.unit.test.mjs b/src/govuk/components/character-count/character-count.unit.test.mjs index 02ef8d308b..fd8a5a3a53 100644 --- a/src/govuk/components/character-count/character-count.unit.test.mjs +++ b/src/govuk/components/character-count/character-count.unit.test.mjs @@ -64,13 +64,6 @@ describe('CharacterCount', () => { // Other keys remain untouched expect(component.formatCountMessage(10, 'characters')).toEqual('You have 10 characters remaining') }) - - it('overrides the default locale', () => { - const component = new CharacterCount(createElement('div'), { - i18nLocale: 'de' - }) - expect(component.formatCountMessage(10000, 'words')).toEqual('You have 10.000 words remaining') - }) }) describe('lang attribute configuration', () => { @@ -102,13 +95,6 @@ describe('CharacterCount', () => { expect(component.formatCountMessage(10, 'characters')).toEqual('You have 10 characters remaining') }) - it('overrides the default locale', () => { - const component = new CharacterCount(createElement('div', { - 'data-i18n-locale': 'de' - })) - expect(component.formatCountMessage(10000, 'words')).toEqual('You have 10.000 words remaining') - }) - describe('precedence over JavaScript configuration', () => { it('overrides translation keys', () => { const $div = createElement('div', { 'data-i18n.characters-under-limit-one': 'Custom text. Count: %{count}' }) @@ -121,26 +107,6 @@ describe('CharacterCount', () => { // Other keys remain untouched expect(component.formatCountMessage(10, 'characters')).toEqual('You have 10 characters remaining') }) - - it('overrides the default locale', () => { - const $div = createElement('div', { - 'data-i18n-locale': 'de' // Dot as thousand separator - }) - const component = new CharacterCount($div, { - i18nLocale: 'fr' // Space as thousand separator - }) - expect(component.formatCountMessage(10000, 'words')).toEqual('You have 10.000 words remaining') - }) - - it('overrides the locale in lang attribute', () => { - const $div = createElement('div', { - 'data-i18n-locale': 'de', - lang: 'fr' - }) - const component = new CharacterCount($div) - - expect(component.formatCountMessage(10000, 'words')).toEqual('You have 10.000 words remaining') - }) }) }) })