From 9ec13816e552cd32a981d5b836b4cb95935d824d Mon Sep 17 00:00:00 2001 From: ST-DDT Date: Wed, 5 Apr 2023 21:05:38 +0200 Subject: [PATCH] chore: ST-DDT's suggestions --- src/definitions/definitions.ts | 2 +- src/definitions/metadata.ts | 44 +++++++++++++++++++++-------- src/locales/af_ZA/metadata.ts | 4 +-- src/locales/ar/metadata.ts | 4 +-- src/locales/az/metadata.ts | 4 +-- src/locales/cs_CZ/metadata.ts | 4 +-- src/locales/de/metadata.ts | 4 +-- src/locales/de_AT/metadata.ts | 4 +-- src/locales/de_CH/metadata.ts | 4 +-- src/locales/dv/metadata.ts | 4 +-- src/locales/el/metadata.ts | 4 +-- src/locales/en/metadata.ts | 4 +-- src/locales/en_AU/metadata.ts | 4 +-- src/locales/en_AU_ocker/metadata.ts | 4 +-- src/locales/en_BORK/metadata.ts | 4 +-- src/locales/en_CA/metadata.ts | 4 +-- src/locales/en_GB/metadata.ts | 4 +-- src/locales/en_GH/metadata.ts | 4 +-- src/locales/en_IE/metadata.ts | 4 +-- src/locales/en_IN/metadata.ts | 4 +-- src/locales/en_NG/metadata.ts | 4 +-- src/locales/en_US/metadata.ts | 4 +-- src/locales/en_ZA/metadata.ts | 4 +-- src/locales/es/metadata.ts | 4 +-- src/locales/es_MX/metadata.ts | 4 +-- src/locales/fa/metadata.ts | 4 +-- src/locales/fi/metadata.ts | 4 +-- src/locales/fr/metadata.ts | 4 +-- src/locales/fr_BE/metadata.ts | 4 +-- src/locales/fr_CA/metadata.ts | 4 +-- src/locales/fr_CH/metadata.ts | 4 +-- src/locales/fr_LU/metadata.ts | 4 +-- src/locales/he/metadata.ts | 4 +-- src/locales/hr/metadata.ts | 4 +-- src/locales/hu/metadata.ts | 4 +-- src/locales/hy/metadata.ts | 4 +-- src/locales/id_ID/metadata.ts | 4 +-- src/locales/it/metadata.ts | 4 +-- src/locales/ja/metadata.ts | 4 +-- src/locales/ka_GE/metadata.ts | 4 +-- src/locales/ko/metadata.ts | 4 +-- src/locales/lv/metadata.ts | 4 +-- src/locales/mk/metadata.ts | 4 +-- src/locales/nb_NO/metadata.ts | 4 +-- src/locales/ne/metadata.ts | 4 +-- src/locales/nl/metadata.ts | 4 +-- src/locales/nl_BE/metadata.ts | 4 +-- src/locales/pl/metadata.ts | 4 +-- src/locales/pt_BR/metadata.ts | 4 +-- src/locales/pt_PT/metadata.ts | 4 +-- src/locales/ro/metadata.ts | 4 +-- src/locales/ru/metadata.ts | 4 +-- src/locales/sk/metadata.ts | 4 +-- src/locales/sr_RS_latin/metadata.ts | 4 +-- src/locales/sv/metadata.ts | 4 +-- src/locales/th/metadata.ts | 4 +-- src/locales/tr/metadata.ts | 4 +-- src/locales/uk/metadata.ts | 4 +-- src/locales/ur/metadata.ts | 4 +-- src/locales/vi/metadata.ts | 4 +-- src/locales/zh_CN/metadata.ts | 4 +-- src/locales/zh_TW/metadata.ts | 4 +-- src/locales/zu_ZA/metadata.ts | 4 +-- src/utils/merge-locales.ts | 2 +- 64 files changed, 157 insertions(+), 135 deletions(-) diff --git a/src/definitions/definitions.ts b/src/definitions/definitions.ts index 112c2c1aa64..dd477bebcba 100644 --- a/src/definitions/definitions.ts +++ b/src/definitions/definitions.ts @@ -32,7 +32,7 @@ export type LocaleEntry> = Partial & * that most properties are optional and extra properties are allowed. */ export type LocaleDefinition = { - metadata: MetadataDefinitions; + metadata?: MetadataDefinitions; airline?: AirlineDefinitions; animal?: AnimalDefinitions; color?: ColorDefinitions; diff --git a/src/definitions/metadata.ts b/src/definitions/metadata.ts index 23132c1b264..f70427201de 100644 --- a/src/definitions/metadata.ts +++ b/src/definitions/metadata.ts @@ -1,4 +1,9 @@ -export type MetadataDefinitions = { +import type { LocaleEntry } from './definitions'; + +/** + * Metadata for pre-built locales. + */ +export type PreBuiltMetadataDefinitions = { /** * The English name of the language (and the specific country, if defined). */ @@ -6,33 +11,50 @@ export type MetadataDefinitions = { /** * The full code of the locale, including the country code if applicable. */ - code?: string; + code: string; /** * The endonym (native name) of the language (and the specific country, if defined). * * @see https://en.wikipedia.org/wiki/List_of_countries_and_dependencies_and_their_capitals_in_native_languages */ - endonym?: string; + endonym: string; /** * The ISO 639-1 code of the language. * * @see https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes */ - language?: string; + language: string; /** - * The ISO 3166-1 alpha-2 code of the country. - * - * @see https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 + * The specific variant of the language. This usually refers to a dialect or slang. */ - country?: string; + variant?: string; /** * Whether the language is written right-to-left. */ - rtl?: boolean; + rtl: boolean; /** * The ISO 15924 code of the script. * * @see https://en.wikipedia.org/wiki/ISO_15924 */ - script?: string; -} & Record; + script: string; +}; + +/** + * Metadata for pre-built locales for a specific country. + */ +export type PreBuiltMetadataDefinitionsForCountry = + PreBuiltMetadataDefinitions & { + /** + * The ISO 3166-1 alpha-2 code of the country. + * + * @see https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 + */ + country: string; + }; + +/** + * Metadata for the current locale. + */ +export type MetadataDefinitions = + LocaleEntry; diff --git a/src/locales/af_ZA/metadata.ts b/src/locales/af_ZA/metadata.ts index 0344fba4f87..892570cf8a2 100644 --- a/src/locales/af_ZA/metadata.ts +++ b/src/locales/af_ZA/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'Afrikaans (South Africa)', code: 'af_ZA', country: 'ZA', diff --git a/src/locales/ar/metadata.ts b/src/locales/ar/metadata.ts index 8b4ace9d0ef..3623b1e4b2e 100644 --- a/src/locales/ar/metadata.ts +++ b/src/locales/ar/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Arabic', code: 'ar', language: 'ar', diff --git a/src/locales/az/metadata.ts b/src/locales/az/metadata.ts index 3f4282a925f..62851968a7f 100644 --- a/src/locales/az/metadata.ts +++ b/src/locales/az/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Azerbaijani', code: 'az', language: 'az', diff --git a/src/locales/cs_CZ/metadata.ts b/src/locales/cs_CZ/metadata.ts index 9a688397a06..77b30a4d67f 100644 --- a/src/locales/cs_CZ/metadata.ts +++ b/src/locales/cs_CZ/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'Czech (Czechia)', code: 'cs_CZ', country: 'CZ', diff --git a/src/locales/de/metadata.ts b/src/locales/de/metadata.ts index 35f7dab66ed..ac914dd0313 100644 --- a/src/locales/de/metadata.ts +++ b/src/locales/de/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'German', code: 'de', language: 'de', diff --git a/src/locales/de_AT/metadata.ts b/src/locales/de_AT/metadata.ts index a39af8abfeb..aefdf311480 100644 --- a/src/locales/de_AT/metadata.ts +++ b/src/locales/de_AT/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'German (Austria)', code: 'de_AT', country: 'AT', diff --git a/src/locales/de_CH/metadata.ts b/src/locales/de_CH/metadata.ts index d06b0a70dc6..5d5f5f950d3 100644 --- a/src/locales/de_CH/metadata.ts +++ b/src/locales/de_CH/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'German (Switzerland)', code: 'de_CH', country: 'CH', diff --git a/src/locales/dv/metadata.ts b/src/locales/dv/metadata.ts index aa60c4e8985..981955246ac 100644 --- a/src/locales/dv/metadata.ts +++ b/src/locales/dv/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Maldivian', code: 'dv', language: 'dv', diff --git a/src/locales/el/metadata.ts b/src/locales/el/metadata.ts index 1f2fb851ca5..d015ddbf0f9 100644 --- a/src/locales/el/metadata.ts +++ b/src/locales/el/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Greek', code: 'el', language: 'el', diff --git a/src/locales/en/metadata.ts b/src/locales/en/metadata.ts index 68d88fb8168..cb9844bc44b 100644 --- a/src/locales/en/metadata.ts +++ b/src/locales/en/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'English', code: 'en', language: 'en', diff --git a/src/locales/en_AU/metadata.ts b/src/locales/en_AU/metadata.ts index c5ab5656a96..d8912059221 100644 --- a/src/locales/en_AU/metadata.ts +++ b/src/locales/en_AU/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'English (Australia)', code: 'en_AU', country: 'AU', diff --git a/src/locales/en_AU_ocker/metadata.ts b/src/locales/en_AU_ocker/metadata.ts index d203c298ab1..c6133bd6e42 100644 --- a/src/locales/en_AU_ocker/metadata.ts +++ b/src/locales/en_AU_ocker/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'English (Australia Ocker)', code: 'en_AU_ocker', country: 'AU', diff --git a/src/locales/en_BORK/metadata.ts b/src/locales/en_BORK/metadata.ts index 62f9affc7bc..61e08a90b8e 100644 --- a/src/locales/en_BORK/metadata.ts +++ b/src/locales/en_BORK/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'English (Bork)', code: 'en_BORK', variant: 'BORK', diff --git a/src/locales/en_CA/metadata.ts b/src/locales/en_CA/metadata.ts index 900b8217f14..d528514b8c7 100644 --- a/src/locales/en_CA/metadata.ts +++ b/src/locales/en_CA/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'English (Canada)', code: 'en_CA', country: 'CA', diff --git a/src/locales/en_GB/metadata.ts b/src/locales/en_GB/metadata.ts index c95e756be5e..5b37fb6bdf8 100644 --- a/src/locales/en_GB/metadata.ts +++ b/src/locales/en_GB/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'English (Great Britain)', code: 'en_GB', country: 'GB', diff --git a/src/locales/en_GH/metadata.ts b/src/locales/en_GH/metadata.ts index 3e30a6bc9eb..7a79a96fd9d 100644 --- a/src/locales/en_GH/metadata.ts +++ b/src/locales/en_GH/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'English (Ghana)', code: 'en_GH', country: 'GH', diff --git a/src/locales/en_IE/metadata.ts b/src/locales/en_IE/metadata.ts index 3f2be551661..582986ba848 100644 --- a/src/locales/en_IE/metadata.ts +++ b/src/locales/en_IE/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'English (Ireland)', code: 'en_IE', country: 'IE', diff --git a/src/locales/en_IN/metadata.ts b/src/locales/en_IN/metadata.ts index cb59e111eac..a274fdcd911 100644 --- a/src/locales/en_IN/metadata.ts +++ b/src/locales/en_IN/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'English (India)', code: 'en_IN', country: 'IN', diff --git a/src/locales/en_NG/metadata.ts b/src/locales/en_NG/metadata.ts index e428a62a157..6cd220b2d39 100644 --- a/src/locales/en_NG/metadata.ts +++ b/src/locales/en_NG/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'English (Nigeria)', code: 'en_NG', country: 'NG', diff --git a/src/locales/en_US/metadata.ts b/src/locales/en_US/metadata.ts index 152906bb014..9932bac29e3 100644 --- a/src/locales/en_US/metadata.ts +++ b/src/locales/en_US/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'English (United States)', code: 'en_US', country: 'US', diff --git a/src/locales/en_ZA/metadata.ts b/src/locales/en_ZA/metadata.ts index 822c31312d3..303b181922b 100644 --- a/src/locales/en_ZA/metadata.ts +++ b/src/locales/en_ZA/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'English (South Africa)', code: 'en_ZA', country: 'ZA', diff --git a/src/locales/es/metadata.ts b/src/locales/es/metadata.ts index ca13e93d0c9..b2b99581989 100644 --- a/src/locales/es/metadata.ts +++ b/src/locales/es/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Spanish', code: 'es', language: 'es', diff --git a/src/locales/es_MX/metadata.ts b/src/locales/es_MX/metadata.ts index 760234d6875..90cb1d2b348 100644 --- a/src/locales/es_MX/metadata.ts +++ b/src/locales/es_MX/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'Spanish (Mexico)', code: 'es_MX', country: 'MX', diff --git a/src/locales/fa/metadata.ts b/src/locales/fa/metadata.ts index 24d5d4b07f3..5488397edec 100644 --- a/src/locales/fa/metadata.ts +++ b/src/locales/fa/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Farsi/Persian', code: 'fa', language: 'fa', diff --git a/src/locales/fi/metadata.ts b/src/locales/fi/metadata.ts index 7138249de78..9b20a3b1c82 100644 --- a/src/locales/fi/metadata.ts +++ b/src/locales/fi/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Finnish', code: 'fi', language: 'fi', diff --git a/src/locales/fr/metadata.ts b/src/locales/fr/metadata.ts index 0b0b3dc60e8..6afeb2dc209 100644 --- a/src/locales/fr/metadata.ts +++ b/src/locales/fr/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'French', code: 'fr', language: 'fr', diff --git a/src/locales/fr_BE/metadata.ts b/src/locales/fr_BE/metadata.ts index c5c185fb50c..6302b0f492c 100644 --- a/src/locales/fr_BE/metadata.ts +++ b/src/locales/fr_BE/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'French (Belgium)', code: 'fr_BE', country: 'BE', diff --git a/src/locales/fr_CA/metadata.ts b/src/locales/fr_CA/metadata.ts index df1cb34d633..9d8b185303f 100644 --- a/src/locales/fr_CA/metadata.ts +++ b/src/locales/fr_CA/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'French (Canada)', code: 'fr_CA', country: 'CA', diff --git a/src/locales/fr_CH/metadata.ts b/src/locales/fr_CH/metadata.ts index f9b4e09d38b..b51ab74b835 100644 --- a/src/locales/fr_CH/metadata.ts +++ b/src/locales/fr_CH/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'French (Switzerland)', code: 'fr_CH', country: 'CH', diff --git a/src/locales/fr_LU/metadata.ts b/src/locales/fr_LU/metadata.ts index bf2c0cf5858..3ddfcde770c 100644 --- a/src/locales/fr_LU/metadata.ts +++ b/src/locales/fr_LU/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'French (Luxembourg)', code: 'fr_LU', country: 'LU', diff --git a/src/locales/he/metadata.ts b/src/locales/he/metadata.ts index 2f3373674e6..6ed4091b387 100644 --- a/src/locales/he/metadata.ts +++ b/src/locales/he/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Hebrew', code: 'he', language: 'he', diff --git a/src/locales/hr/metadata.ts b/src/locales/hr/metadata.ts index 90d5622ea06..b0477ebc86f 100644 --- a/src/locales/hr/metadata.ts +++ b/src/locales/hr/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Croatian', code: 'hr', language: 'hr', diff --git a/src/locales/hu/metadata.ts b/src/locales/hu/metadata.ts index 18b368238f1..2db99443514 100644 --- a/src/locales/hu/metadata.ts +++ b/src/locales/hu/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Hungarian', code: 'hu', language: 'hu', diff --git a/src/locales/hy/metadata.ts b/src/locales/hy/metadata.ts index f9ab709561f..666bee3d8bd 100644 --- a/src/locales/hy/metadata.ts +++ b/src/locales/hy/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Armenian', code: 'hy', language: 'hy', diff --git a/src/locales/id_ID/metadata.ts b/src/locales/id_ID/metadata.ts index 4b2b3d599f0..114a1db4f23 100644 --- a/src/locales/id_ID/metadata.ts +++ b/src/locales/id_ID/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'Indonesian (Indonesia)', code: 'id_ID', country: 'ID', diff --git a/src/locales/it/metadata.ts b/src/locales/it/metadata.ts index b9442eb64b8..a23ea0bfb67 100644 --- a/src/locales/it/metadata.ts +++ b/src/locales/it/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Italian', code: 'it', language: 'it', diff --git a/src/locales/ja/metadata.ts b/src/locales/ja/metadata.ts index 14e117a81a0..386c9c7b800 100644 --- a/src/locales/ja/metadata.ts +++ b/src/locales/ja/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Japanese', code: 'ja', language: 'ja', diff --git a/src/locales/ka_GE/metadata.ts b/src/locales/ka_GE/metadata.ts index 4072eefa853..1df7aa76d0d 100644 --- a/src/locales/ka_GE/metadata.ts +++ b/src/locales/ka_GE/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'Georgian (Georgia)', code: 'ka_GE', country: 'GE', diff --git a/src/locales/ko/metadata.ts b/src/locales/ko/metadata.ts index 46ba9558963..16413342172 100644 --- a/src/locales/ko/metadata.ts +++ b/src/locales/ko/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Korean', code: 'ko', language: 'ko', diff --git a/src/locales/lv/metadata.ts b/src/locales/lv/metadata.ts index b3b02d65a31..3e875fda5ce 100644 --- a/src/locales/lv/metadata.ts +++ b/src/locales/lv/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Latvian', code: 'lv', language: 'lv', diff --git a/src/locales/mk/metadata.ts b/src/locales/mk/metadata.ts index fc659f148c2..4d1cc7493f9 100644 --- a/src/locales/mk/metadata.ts +++ b/src/locales/mk/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Macedonian', code: 'mk', language: 'mk', diff --git a/src/locales/nb_NO/metadata.ts b/src/locales/nb_NO/metadata.ts index 5f2e9065cb7..3848d5d369a 100644 --- a/src/locales/nb_NO/metadata.ts +++ b/src/locales/nb_NO/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'Norwegian (Norway)', code: 'nb_NO', country: 'NO', diff --git a/src/locales/ne/metadata.ts b/src/locales/ne/metadata.ts index 4773dc6e287..57d978dc14c 100644 --- a/src/locales/ne/metadata.ts +++ b/src/locales/ne/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Nepali', code: 'ne', language: 'ne', diff --git a/src/locales/nl/metadata.ts b/src/locales/nl/metadata.ts index 2f20302e880..7a3a178149f 100644 --- a/src/locales/nl/metadata.ts +++ b/src/locales/nl/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Dutch', code: 'nl', language: 'nl', diff --git a/src/locales/nl_BE/metadata.ts b/src/locales/nl_BE/metadata.ts index 7147811e1f4..f92500c61f5 100644 --- a/src/locales/nl_BE/metadata.ts +++ b/src/locales/nl_BE/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'Dutch (Belgium)', code: 'nl_BE', country: 'BE', diff --git a/src/locales/pl/metadata.ts b/src/locales/pl/metadata.ts index 5ab6c1ff640..0031703d2fe 100644 --- a/src/locales/pl/metadata.ts +++ b/src/locales/pl/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Polish', code: 'pl', language: 'pl', diff --git a/src/locales/pt_BR/metadata.ts b/src/locales/pt_BR/metadata.ts index 84e15d34dc8..11bc000872f 100644 --- a/src/locales/pt_BR/metadata.ts +++ b/src/locales/pt_BR/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'Portuguese (Brazil)', code: 'pt_BR', country: 'BR', diff --git a/src/locales/pt_PT/metadata.ts b/src/locales/pt_PT/metadata.ts index ef76ba5c6f9..d83a577165f 100644 --- a/src/locales/pt_PT/metadata.ts +++ b/src/locales/pt_PT/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'Portuguese (Portugal)', code: 'pt_PT', country: 'PT', diff --git a/src/locales/ro/metadata.ts b/src/locales/ro/metadata.ts index 436abe10263..8f1b6f7ecac 100644 --- a/src/locales/ro/metadata.ts +++ b/src/locales/ro/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Romanian', code: 'ro', language: 'ro', diff --git a/src/locales/ru/metadata.ts b/src/locales/ru/metadata.ts index 80fdfe618b5..bb5d4430f38 100644 --- a/src/locales/ru/metadata.ts +++ b/src/locales/ru/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Russian', code: 'ru', language: 'ru', diff --git a/src/locales/sk/metadata.ts b/src/locales/sk/metadata.ts index 7ca5003e1aa..ff9ed23eb8b 100644 --- a/src/locales/sk/metadata.ts +++ b/src/locales/sk/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Slovak', code: 'sk', language: 'sk', diff --git a/src/locales/sr_RS_latin/metadata.ts b/src/locales/sr_RS_latin/metadata.ts index e2a809a1757..18923eb059a 100644 --- a/src/locales/sr_RS_latin/metadata.ts +++ b/src/locales/sr_RS_latin/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'Serbian (Serbia, Latin)', code: 'sr_RS_latin', country: 'RS', diff --git a/src/locales/sv/metadata.ts b/src/locales/sv/metadata.ts index 07a8e5ce30e..13772b45ca5 100644 --- a/src/locales/sv/metadata.ts +++ b/src/locales/sv/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Swedish', code: 'sv', language: 'sv', diff --git a/src/locales/th/metadata.ts b/src/locales/th/metadata.ts index 82ebd1cb4c7..a969875b68c 100644 --- a/src/locales/th/metadata.ts +++ b/src/locales/th/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Thai', code: 'th', language: 'th', diff --git a/src/locales/tr/metadata.ts b/src/locales/tr/metadata.ts index 0eb86f13876..d967e530d36 100644 --- a/src/locales/tr/metadata.ts +++ b/src/locales/tr/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Turkish', code: 'tr', language: 'tr', diff --git a/src/locales/uk/metadata.ts b/src/locales/uk/metadata.ts index c68fe383616..ef1f6c66d17 100644 --- a/src/locales/uk/metadata.ts +++ b/src/locales/uk/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Ukrainian', code: 'uk', language: 'uk', diff --git a/src/locales/ur/metadata.ts b/src/locales/ur/metadata.ts index 09d4e0f0247..787f506172c 100644 --- a/src/locales/ur/metadata.ts +++ b/src/locales/ur/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Urdu', code: 'ur', language: 'ur', diff --git a/src/locales/vi/metadata.ts b/src/locales/vi/metadata.ts index b78eb4eea8d..782e997ffef 100644 --- a/src/locales/vi/metadata.ts +++ b/src/locales/vi/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitions } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitions = { title: 'Vietnamese', code: 'vi', language: 'vi', diff --git a/src/locales/zh_CN/metadata.ts b/src/locales/zh_CN/metadata.ts index 4dc42310e2a..0f8984099c8 100644 --- a/src/locales/zh_CN/metadata.ts +++ b/src/locales/zh_CN/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'Chinese (China)', code: 'zh_CN', country: 'CN', diff --git a/src/locales/zh_TW/metadata.ts b/src/locales/zh_TW/metadata.ts index 1d78cf2e570..64043474f72 100644 --- a/src/locales/zh_TW/metadata.ts +++ b/src/locales/zh_TW/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'Chinese (Taiwan)', code: 'zh_TW', country: 'TW', diff --git a/src/locales/zu_ZA/metadata.ts b/src/locales/zu_ZA/metadata.ts index 76f9d163a75..57f519bd332 100644 --- a/src/locales/zu_ZA/metadata.ts +++ b/src/locales/zu_ZA/metadata.ts @@ -1,6 +1,6 @@ -import type { MetadataDefinitions } from '../..'; +import type { PreBuiltMetadataDefinitionsForCountry } from '../../definitions/metadata'; -const metadata: MetadataDefinitions = { +const metadata: PreBuiltMetadataDefinitionsForCountry = { title: 'Zulu (South Africa)', code: 'zu_ZA', country: 'ZA', diff --git a/src/utils/merge-locales.ts b/src/utils/merge-locales.ts index 1a69f541210..f8233d48b59 100644 --- a/src/utils/merge-locales.ts +++ b/src/utils/merge-locales.ts @@ -13,7 +13,7 @@ import type { LocaleDefinition } from '..'; * const de_CH_with_fallbacks = mergeLocales([ de_CH, de, en ]); */ export function mergeLocales(locales: LocaleDefinition[]): LocaleDefinition { - const merged: LocaleDefinition = {} as LocaleDefinition; + const merged: LocaleDefinition = {}; for (const locale of locales) { for (const key in locale) {