@vendure/admin-ui 1.4.3 → 1.4.4

package/bundles/vendure-admin-ui-core.umd.js

@@ -12736,8 +12736,8 @@
                 this.subscription = dataService.client
                     .uiState()
                     .mapStream(function (data) { return data.uiState; })
-                    .subscribe(function (_a) {
-                    var language = _a.language, locale = _a.locale;
+                    .subscribe(function (_b) {
+                    var language = _b.language, locale = _b.locale;
                     _this.locale = language.replace(/_/g, '-');
                     if (locale) {
                         _this.locale += "-" + locale;
@@ -12751,6 +12751,28 @@
                 this.subscription.unsubscribe();
             }
         };
+        /**
+         * Returns the active locale after attempting to ensure that the locale string
+         * is valid for the Intl API.
+         */
+        LocaleBasePipe.prototype.getActiveLocale = function (localeOverride) {
+            var _a;
+            var locale = typeof localeOverride === 'string' ? localeOverride : (_a = this.locale) !== null && _a !== void 0 ? _a : 'en';
+            var hyphenated = locale === null || locale === void 0 ? void 0 : locale.replace(/_/g, '-');
+            // Check for a double-region string, containing 2 region codes like
+            // pt-BR-BR, which is invalid. In this case, the second region is used
+            // and the first region discarded. This would only ever be an issue for
+            // those languages where the translation file itself encodes the region,
+            // as in pt_BR & pt_PT.
+            var matches = hyphenated === null || hyphenated === void 0 ? void 0 : hyphenated.match(/^([a-zA-Z_-]+)(-[A-Z][A-Z])(-[A-Z][A-z])$/);
+            if (matches === null || matches === void 0 ? void 0 : matches.length) {
+                var overriddenLocale = matches[1] + matches[3];
+                return overriddenLocale;
+            }
+            else {
+                return hyphenated;
+            }
+        };
         return LocaleBasePipe;
     }());
     LocaleBasePipe.decorators = [
@@ -12779,7 +12801,7 @@
         }
         LocaleCurrencyNamePipe.prototype.transform = function (value, display, locale) {
             if (display === void 0) { display = 'full'; }
-            var _a, _b;
+            var _a;
             if (value == null || value === '') {
                 return '';
             }
@@ -12788,7 +12810,7 @@
             }
             var name = '';
             var symbol = '';
-            var activeLocale = typeof locale === 'string' ? locale : (_a = this.locale) !== null && _a !== void 0 ? _a : 'en';
+            var activeLocale = this.getActiveLocale(locale);
             // Awaiting TS types for this API: https://github.com/microsoft/TypeScript/pull/44022/files
             var DisplayNames = Intl.DisplayNames;
             if (display === 'full' || display === 'name') {
@@ -12802,7 +12824,7 @@
                     currency: value,
                     currencyDisplay: 'symbol',
                 }).formatToParts();
-                symbol = ((_b = parts.find(function (p) { return p.type === 'currency'; })) === null || _b === void 0 ? void 0 : _b.value) || value;
+                symbol = ((_a = parts.find(function (p) { return p.type === 'currency'; })) === null || _a === void 0 ? void 0 : _a.value) || value;
             }
             return display === 'full' ? name + " (" + symbol + ")" : display === 'name' ? name : symbol;
         };
@@ -12843,7 +12865,7 @@
             }
             var _a = __read(args, 2), currencyCode = _a[0], locale = _a[1];
             if (typeof value === 'number' && typeof currencyCode === 'string') {
-                var activeLocale = typeof locale === 'string' ? locale : this.locale;
+                var activeLocale = this.getActiveLocale(locale);
                 var majorUnits = value / 100;
                 return new Intl.NumberFormat(activeLocale, { style: 'currency', currency: currencyCode }).format(majorUnits);
             }
@@ -12886,7 +12908,7 @@
             }
             var _a = __read(args, 2), format = _a[0], locale = _a[1];
             if (this.locale || typeof locale === 'string') {
-                var activeLocale = typeof locale === 'string' ? locale : this.locale;
+                var activeLocale = this.getActiveLocale(locale);
                 var date = value instanceof Date ? value : typeof value === 'string' ? new Date(value) : undefined;
                 if (date) {
                     var options = this.getOptionsForFormat(typeof format === 'string' ? format : 'medium');
@@ -12962,14 +12984,13 @@
             return _super.call(this, dataService, changeDetectorRef) || this;
         }
         LocaleLanguageNamePipe.prototype.transform = function (value, locale) {
-            var _a;
             if (value == null || value === '') {
                 return '';
             }
             if (typeof value !== 'string') {
                 return "Invalid language code \"" + value + "\"";
             }
-            var activeLocale = typeof locale === 'string' ? locale : (_a = this.locale) !== null && _a !== void 0 ? _a : 'en';
+            var activeLocale = this.getActiveLocale(locale);
             // Awaiting TS types for this API: https://github.com/microsoft/TypeScript/pull/44022/files
             var DisplayNames = Intl.DisplayNames;
             try {
@@ -13009,14 +13030,13 @@
             return _super.call(this, dataService, changeDetectorRef) || this;
         }
         LocaleRegionNamePipe.prototype.transform = function (value, locale) {
-            var _a;
             if (value == null || value === '') {
                 return '';
             }
             if (typeof value !== 'string') {
                 return "Invalid region code \"" + value + "\"";
             }
-            var activeLocale = typeof locale === 'string' ? locale : (_a = this.locale) !== null && _a !== void 0 ? _a : 'en';
+            var activeLocale = this.getActiveLocale(locale);
             // Awaiting TS types for this API: https://github.com/microsoft/TypeScript/pull/44022/files
             var DisplayNames = Intl.DisplayNames;
             try {
@@ -13985,7 +14005,7 @@
     }
 
     // Auto-generated by the set-version.js script.
-    var ADMIN_UI_VERSION = '1.4.3';
+    var ADMIN_UI_VERSION = '1.4.4';
 
     /**
      * Responsible for registering dashboard widget components and querying for layouts.