Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added utility method to resolve locale supplied and fallback #2430

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Added utility method to resolve locale supplied and fallback #2430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f79fde7
Added utility method to resolve locale supplied and fallback
rajkeshwar Dec 12, 2024
82d05d9
Added the changeset
rajkeshwar Dec 12, 2024
0c9ea8c
fixed eslint
rajkeshwar Dec 16, 2024
6f43a92
Removed console.log
rajkeshwar Dec 16, 2024
93d2f74
Merge branch 'master' into feature/i18-dynamic-imports
rajkeshwar Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/lucky-crews-drop.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@lion/ui': minor
---

Added utility method to resolve locale supplied and fallback
65 changes: 3 additions & 62 deletions packages/ui/components/calendar/src/LionCalendar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
getWeekdayNames,
LocalizeMixin,
normalizeDateTime,
resolveLocaleConfig,
} from '@lion/ui/localize-no-side-effects.js';

import { calendarStyle } from './calendarStyle.js';
Expand Down Expand Up @@ -39,68 +40,8 @@ function isDisabledDayButton(el) {
*/
export class LionCalendar extends LocalizeMixin(LitElement) {
static get localizeNamespaces() {
return [
{
'lion-calendar': /** @param {string} locale */ locale => {
switch (locale) {
case 'bg-BG':
case 'bg':
return import('@lion/ui/calendar-translations/bg.js');
case 'cs-CZ':
case 'cs':
return import('@lion/ui/calendar-translations/cs.js');
case 'de-AT':
case 'de-DE':
case 'de':
return import('@lion/ui/calendar-translations/de.js');
case 'en-AU':
case 'en-GB':
case 'en-PH':
case 'en-US':
case 'en':
return import('@lion/ui/calendar-translations/en.js');
case 'es-ES':
case 'es':
return import('@lion/ui/calendar-translations/es.js');
case 'fr-FR':
case 'fr-BE':
case 'fr':
return import('@lion/ui/calendar-translations/fr.js');
case 'hu-HU':
case 'hu':
return import('@lion/ui/calendar-translations/hu.js');
case 'it-IT':
case 'it':
return import('@lion/ui/calendar-translations/it.js');
case 'nl-BE':
case 'nl-NL':
case 'nl':
return import('@lion/ui/calendar-translations/nl.js');
case 'pl-PL':
case 'pl':
return import('@lion/ui/calendar-translations/pl.js');
case 'ro-RO':
case 'ro':
return import('@lion/ui/calendar-translations/ro.js');
case 'ru-RU':
case 'ru':
return import('@lion/ui/calendar-translations/ru.js');
case 'sk-SK':
case 'sk':
return import('@lion/ui/calendar-translations/sk.js');
case 'uk-UA':
case 'uk':
return import('@lion/ui/calendar-translations/uk.js');
case 'zh-CN':
case 'zh':
return import('@lion/ui/calendar-translations/zh.js');
default:
return import('@lion/ui/calendar-translations/en.js');
}
},
},
...super.localizeNamespaces,
];
const localePath = new URL('../translations', import.meta.url);
return [resolveLocaleConfig('lion-calendar', localePath), ...super.localizeNamespaces];
}

static get properties() {
Expand Down
66 changes: 3 additions & 63 deletions packages/ui/components/combobox/src/LionCombobox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { browserDetection } from '@lion/ui/core.js';
import { Unparseable } from '@lion/ui/form-core.js';
import { LionListbox } from '@lion/ui/listbox.js';
import { LocalizeMixin } from '@lion/ui/localize-no-side-effects.js';
import { LocalizeMixin, resolveLocaleConfig } from '@lion/ui/localize-no-side-effects.js';
import { OverlayMixin, withDropdownConfig } from '@lion/ui/overlays.js';
import { css, html } from 'lit';
import { makeMatchingTextBold, unmakeMatchingTextBold } from './utils/makeMatchingTextBold.js';
Expand Down Expand Up @@ -88,68 +88,8 @@ export class LionCombobox extends LocalizeMixin(OverlayMixin(CustomChoiceGroupMi
}

static get localizeNamespaces() {
return [
{
'lion-combobox': /** @param {string} locale */ locale => {
switch (locale) {
case 'bg-BG':
case 'bg':
return import('@lion/ui/combobox-translations/bg.js');
case 'cs-CZ':
case 'cs':
return import('@lion/ui/combobox-translations/cs.js');
case 'de-AT':
case 'de-DE':
case 'de':
return import('@lion/ui/combobox-translations/de.js');
case 'en-AU':
case 'en-GB':
case 'en-PH':
case 'en-US':
case 'en':
return import('@lion/ui/combobox-translations/en.js');
case 'es-ES':
case 'es':
return import('@lion/ui/combobox-translations/es.js');
case 'fr-FR':
case 'fr-BE':
case 'fr':
return import('@lion/ui/combobox-translations/fr.js');
case 'hu-HU':
case 'hu':
return import('@lion/ui/combobox-translations/hu.js');
case 'it-IT':
case 'it':
return import('@lion/ui/combobox-translations/it.js');
case 'nl-BE':
case 'nl-NL':
case 'nl':
return import('@lion/ui/combobox-translations/nl.js');
case 'pl-PL':
case 'pl':
return import('@lion/ui/combobox-translations/pl.js');
case 'ro-RO':
case 'ro':
return import('@lion/ui/combobox-translations/ro.js');
case 'ru-RU':
case 'ru':
return import('@lion/ui/combobox-translations/ru.js');
case 'sk-SK':
case 'sk':
return import('@lion/ui/combobox-translations/sk.js');
case 'uk-UA':
case 'uk':
return import('@lion/ui/combobox-translations/uk.js');
case 'zh-CN':
case 'zh':
return import('@lion/ui/combobox-translations/zh.js');
default:
return import('@lion/ui/combobox-translations/en.js');
}
},
},
...super.localizeNamespaces,
];
const localePath = new URL('../translations', import.meta.url);
return [resolveLocaleConfig('lion-combobox', localePath), ...super.localizeNamespaces];
}

/**
Expand Down
75 changes: 0 additions & 75 deletions packages/ui/components/form-core/src/localizeNamespaceLoader.js
View file
Open in desktop

This file was deleted.

13 changes: 6 additions & 7 deletions packages/ui/components/form-core/src/validate/LionValidationFeedback.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { css, html, LitElement, nothing } from 'lit';
import { LocalizeMixin } from '@lion/ui/localize-no-side-effects.js';
import { localizeNamespaceLoader } from '../localizeNamespaceLoader.js';
import { css, html, LitElement } from 'lit';
import { LocalizeMixin, resolveLocaleConfig } from '@lion/ui/localize-no-side-effects.js';

/**
* @typedef {import('./Validator.js').Validator} Validator
Expand All @@ -24,10 +23,10 @@ export class LionValidationFeedback extends LocalizeMixin(LitElement) {
};
}

static localizeNamespaces = [
{ 'lion-form-core': localizeNamespaceLoader },
...super.localizeNamespaces,
];
static get localizeNamespaces() {
const localePath = new URL('../../translations', import.meta.url);
return [resolveLocaleConfig('lion-form-core', localePath), ...super.localizeNamespaces];
}

static get styles() {
return [
Expand Down
11 changes: 8 additions & 3 deletions packages/ui/components/input-datepicker/src/LionInputDatepicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ import {
withModalDialogConfig,
ArrowMixin,
} from '@lion/ui/overlays.js';
import { LocalizeMixin } from '@lion/ui/localize-no-side-effects.js';
import { LocalizeMixin, resolveLocaleConfig } from '@lion/ui/localize-no-side-effects.js';
import { ScopedElementsMixin } from '../../core/src/ScopedElementsMixin.js';
import { localizeNamespaceLoader } from './localizeNamespaceLoader.js';

/**
* @typedef {import('../../form-core/src/validate/Validator.js').Validator} Validator
Expand Down Expand Up @@ -110,7 +109,13 @@ export class LionInputDatepicker extends ScopedElementsMixin(
}

static get localizeNamespaces() {
return [{ 'lion-input-datepicker': localizeNamespaceLoader }, ...super.localizeNamespaces];
const datepickerLocalePath = new URL('../translations', import.meta.url);
const overlayLocalePath = new URL('../../overlays/translations', import.meta.url);

return [
resolveLocaleConfig('lion-input-datepicker', [overlayLocalePath, datepickerLocalePath]),
...super.localizeNamespaces,
];
}

/**
Expand Down
Loading
Loading