@brightspace-ui/intl 3.33.1 → 3.34.0

package/lib/common.js

@@ -5,31 +5,31 @@ export const supportedBaseLocales = ['ar', 'cy', 'da', 'de', 'en', 'es', 'fr', '
 export const supportedLangpacks = ['ar', 'cy', 'da', 'de', 'en', 'en-gb', 'es', 'es-es', 'fr', 'fr-fr', 'fr-on', 'haw', 'hi', 'ja', 'ko', 'mi', 'nl', 'pt', 'sv', 'th', 'tr', 'vi', 'zh-cn', 'zh-tw'];
 
 export const supportedLocalesDetails = [
-	{ code: 'ar-sa', dir: 'rtl', name: 'العربية (المملكة العربية السعودية)' },
-	{ code: 'cy-gb', dir: 'ltr', name: 'Cymraeg (Y Deyrnas Unedig)' },
-	{ code: 'da-dk', dir: 'ltr', name: 'Dansk (danmark)' },
-	{ code: 'de-de', dir: 'ltr', name: 'Deutsch (Deutschland)' },
-	{ code: 'en-ca', dir: 'ltr', name: 'English (Canada)' },
-	{ code: 'en-gb', dir: 'ltr', name: 'English (United Kingdom)' },
-	{ code: 'en-us', dir: 'ltr', name: 'English (United States)' },
-	{ code: 'es-es', dir: 'ltr', name: 'Español (España)' },
-	{ code: 'es-mx', overrideCode: 'es-419', dir: 'ltr', name: 'Español (Latinoamérica)' },
-	{ code: 'fr-ca', dir: 'ltr', name: 'Français (Canada)' },
-	{ code: 'fr-fr', dir: 'ltr', name: 'Français (France)' },
-	{ code: 'fr-on', overrideCode: 'fr-CA-Ontario', dir: 'ltr', name: 'Français (Ontario)' },
-	{ code: 'haw-us', dir: 'ltr', name: 'ʻŌlelo Hawaiʻi (ʻAmelika Hui Pū ʻIa)' },
-	{ code: 'hi-in', dir: 'ltr', name: 'हिंदी (भारत)' },
-	{ code: 'ja-jp', dir: 'ltr', name: '日本語 (日本)' },
-	{ code: 'ko-kr', dir: 'ltr', name: '한국어 (대한민국)' },
-	{ code: 'mi-nz', dir: 'ltr', name: 'Māori (Aotearoa)' },
-	{ code: 'nl-nl', dir: 'ltr', name: 'Nederlands (Nederland)' },
-	{ code: 'pt-br', dir: 'ltr', name: 'Português (Brasil)' },
-	{ code: 'sv-se', dir: 'ltr', name: 'Svenska (Sverige)' },
-	{ code: 'th-th', dir: 'ltr', name: 'ไทย (ไทย)' },
-	{ code: 'tr-tr', dir: 'ltr', name: 'Türkçe (Türkiye)' },
-	{ code: 'vi-vn', dir: 'ltr', name: 'Tiếng Việt (Việt Nam)' },
-	{ code: 'zh-cn', overrideCode: 'zh-Hans', dir: 'ltr', name: '中文(简体)' },
-	{ code: 'zh-tw', overrideCode: 'zh-Hant', dir: 'ltr', name: '中文(繁体)' }
+	{ id: 16, code: 'ar-sa', pack: 'ar', dir: 'rtl', name: 'العربية (المملكة العربية السعودية)' },
+	{ id: 31, code: 'cy-gb', pack: 'cy', dir: 'ltr', name: 'Cymraeg (Y Deyrnas Unedig)' },
+	{ id: 28, code: 'da-dk', pack: 'da', dir: 'ltr', name: 'Dansk (danmark)' },
+	{ id: 26, code: 'de-de', pack: 'de', dir: 'ltr', name: 'Deutsch (Deutschland)' },
+	{ id: 13, code: 'en-ca', dir: 'ltr', name: 'English (Canada)' },
+	{ id: 11, code: 'en-gb', pack: 'en-gb', dir: 'ltr', name: 'English (United Kingdom)' },
+	{ id: 1, code: 'en-us', pack: 'en', dir: 'ltr', name: 'English (United States)' },
+	{ id: 30, code: 'es-es', pack: 'es-es', dir: 'ltr', name: 'Español (España)' },
+	{ id: 18, code: 'es-mx', pack: 'es', overrideCode: 'es-419', dir: 'ltr', name: 'Español (Latinoamérica)' },
+	{ id: 2, code: 'fr-ca', pack: 'fr', dir: 'ltr', name: 'Français (Canada)' },
+	{ id: 29, code: 'fr-fr', pack: 'fr-fr', dir: 'ltr', name: 'Français (France)' },
+	{ id: 32, code: 'fr-on', pack: 'fr-on', overrideCode: 'fr-CA-Ontario', dir: 'ltr', name: 'Français (Ontario)' },
+	{ id: 35, code: 'haw-us', pack: 'haw', dir: 'ltr', name: 'ʻŌlelo Hawaiʻi (ʻAmelika Hui Pū ʻIa)' },
+	{ id: 33, code: 'hi-in', pack: 'hi', dir: 'ltr', name: 'हिंदी (भारत)' },
+	{ id: 21, code: 'ja-jp', pack: 'ja', dir: 'ltr', name: '日本語 (日本)' },
+	{ id: 22, code: 'ko-kr', pack: 'ko', dir: 'ltr', name: '한국어 (대한민국)' },
+	{ id: 34, code: 'mi-nz', pack: 'mi', dir: 'ltr', name: 'Māori (Aotearoa)' },
+	{ id: 25, code: 'nl-nl', pack: 'nl', dir: 'ltr', name: 'Nederlands (Nederland)' },
+	{ id: 19, code: 'pt-br', pack: 'pt', dir: 'ltr', name: 'Português (Brasil)' },
+	{ id: 24, code: 'sv-se', pack: 'sv', dir: 'ltr', name: 'Svenska (Sverige)' },
+	{ id: 37, code: 'th-th', pack: 'th', dir: 'ltr', name: 'ไทย (ไทย)' },
+	{ id: 23, code: 'tr-tr', pack: 'tr', dir: 'ltr', name: 'Türkçe (Türkiye)' },
+	{ id: 36, code: 'vi-vn', pack: 'vi', dir: 'ltr', name: 'Tiếng Việt (Việt Nam)' },
+	{ id: 17, code: 'zh-cn', pack: 'zh-cn', overrideCode: 'zh-Hans', dir: 'ltr', name: '中文(简体)' },
+	{ id: 20, code: 'zh-tw', pack: 'zh-tw', overrideCode: 'zh-Hant', dir: 'ltr', name: '中文(繁体)' }
 ];
 export const supportedLocales = supportedLocalesDetails.map((l) => l.code);
 

package/lib/localize.js

@@ -1,5 +1,5 @@
 import './PluralRules.js';
-import { defaultLocale as fallbackLang, getDocumentLocaleSettings, supportedLangpacks } from './common.js';
+import { defaultLocale as fallbackLang, getDocumentLocaleSettings, supportedLangpacks, supportedLocalesDetails } from './common.js';
 import { getLocalizeOverrideResources } from '../helpers/getLocalizeResources.js';
 import IntlMessageFormat from 'intl-messageformat';
 
@@ -220,18 +220,32 @@ export const getLocalizeClass = (superclass = class {}) => class LocalizeClass e
 
 		if (importFunc === undefined) return;
 
+		// en-ca does not have an actual langpack, but supports overrides, so mark its usage
+		const enCA = langs.includes('en-ca') && langs.indexOf('en-ca') <= Math.max(langs.indexOf('en-us'), 0);
+
 		// in dev, don't request unsupported langpacks
 		if (!importFunc.toString().includes('switch') && !useBrowserLangs) {
 			langs = langs.filter(lang => supportedLangpacks.includes(lang));
 		}
 
 		for (const lang of [...langs, fallbackLang]) {
-
 			const resources = await Promise.resolve(importFunc(lang)).catch(() => {});
 
+			const osloLang = lang === 'en' && enCA ? 'en-ca' : lang;
+
 			if (resources) {
 
 				if (osloCollection) {
+					const oslo = this.documentLocaleSettings.oslo;
+					let languageId = 0;
+					if (oslo.batch) {
+						const batch = new URL(oslo.batch, document.location.origin);
+						languageId = supportedLocalesDetails.find(l => l.code === osloLang || l.pack === osloLang)?.id;
+						if (languageId && languageId !== batch.searchParams.get('languageId')) {
+							batch.searchParams.set('languageId', languageId);
+							oslo.batch = batch.toString();
+						}
+					}
 					return await getLocalizeOverrideResources(
 						lang,
 						resources,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brightspace-ui/intl",
-  "version": "3.33.1",
+  "version": "3.34.0",
   "description": "Internationalization APIs for number, date, time and file size formatting and parsing in D2L Brightspace.",
   "main": "lib/number.js",
   "type": "module",