@shoelace-style/localize 3.0.2 → 3.0.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 3.0.4
+
+- Ensure return values of translation functions are always a string
+
+## 3.0.3
+
+- Fixed a bug where regional locales stopped working
+
 ## 3.0.2
 
 - Fixed a parsing bug in extended language codes [#16](https://github.com/shoelace-style/localize/issues/16)

package/dist/index.d.ts

@@ -17,7 +17,7 @@ export declare class LocalizeController<UserTranslation extends Translation = De
     hostDisconnected(): void;
     dir(): string;
     lang(): string;
-    term<K extends keyof UserTranslation>(key: K, ...args: FunctionParams<UserTranslation[K]>): any;
+    term<K extends keyof UserTranslation>(key: K, ...args: FunctionParams<UserTranslation[K]>): string;
     date(dateToFormat: Date | string, options?: Intl.DateTimeFormatOptions): string;
     number(numberToFormat: number | string, options?: Intl.NumberFormatOptions): string;
     relativeTime(value: number, unit: Intl.RelativeTimeFormatUnit, options?: Intl.RelativeTimeFormatOptions): string;

package/dist/index.js

@@ -54,7 +54,7 @@ export class LocalizeController {
         const locale = new Intl.Locale(this.lang());
         const language = locale === null || locale === void 0 ? void 0 : locale.language.toLowerCase();
         const region = (_b = (_a = locale === null || locale === void 0 ? void 0 : locale.region) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : '';
-        const primary = translations.get(region);
+        const primary = translations.get(`${language}-${region}`);
         const secondary = translations.get(language);
         let term;
         if (primary && primary[key]) {
@@ -68,7 +68,7 @@ export class LocalizeController {
         }
         else {
             console.error(`No translation found for: ${String(key)}`);
-            return key;
+            return String(key);
         }
         if (typeof term === 'function') {
             return term(...args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shoelace-style/localize",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "description": "A micro library for localizing custom elements using Lit's Reactive Controller model.",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/index.ts

@@ -115,11 +115,11 @@ export class LocalizeController<UserTranslation extends Translation = DefaultTra
     return `${this.host.lang || documentLanguage}`.toLowerCase();
   }
 
-  term<K extends keyof UserTranslation>(key: K, ...args: FunctionParams<UserTranslation[K]>) {
+  term<K extends keyof UserTranslation>(key: K, ...args: FunctionParams<UserTranslation[K]>): string {
     const locale = new Intl.Locale(this.lang());
     const language = locale?.language.toLowerCase();
     const region = locale?.region?.toLowerCase() ?? '';
-    const primary = <UserTranslation>translations.get(region);
+    const primary = <UserTranslation>translations.get(`${language}-${region}`);
     const secondary = <UserTranslation>translations.get(language);
     let term: any;
 
@@ -132,7 +132,7 @@ export class LocalizeController<UserTranslation extends Translation = DefaultTra
       term = fallback[key as keyof Translation];
     } else {
       console.error(`No translation found for: ${String(key)}`);
-      return key;
+      return String(key);
     }
 
     if (typeof term === 'function') {
@@ -143,19 +143,19 @@ export class LocalizeController<UserTranslation extends Translation = DefaultTra
   }
 
   /** Outputs a localized date in the specified format. */
-  date(dateToFormat: Date | string, options?: Intl.DateTimeFormatOptions) {
+  date(dateToFormat: Date | string, options?: Intl.DateTimeFormatOptions): string {
     dateToFormat = new Date(dateToFormat);
     return new Intl.DateTimeFormat(this.lang(), options).format(dateToFormat);
   }
 
   /** Outputs a localized number in the specified format. */
-  number(numberToFormat: number | string, options?: Intl.NumberFormatOptions) {
+  number(numberToFormat: number | string, options?: Intl.NumberFormatOptions): string {
     numberToFormat = Number(numberToFormat);
     return isNaN(numberToFormat) ? '' : new Intl.NumberFormat(this.lang(), options).format(numberToFormat);
   }
 
   /** Outputs a localized time in relative format. */
-  relativeTime(value: number, unit: Intl.RelativeTimeFormatUnit, options?: Intl.RelativeTimeFormatOptions) {
+  relativeTime(value: number, unit: Intl.RelativeTimeFormatUnit, options?: Intl.RelativeTimeFormatOptions): string {
     return new Intl.RelativeTimeFormat(this.lang(), options).format(value, unit);
   }
 }