@fluid-topics/ft-i18n 1.3.16 → 1.3.17

package/build/lit/i18n.d.ts

@@ -15,7 +15,7 @@ export type FtLitElementWithI18nInterface = {
     [i18nContexts]: Map<string, I18nContextDefinition>;
     [i18nUnsubs]: Map<string, Function>;
     useCustomMessageContexts: boolean;
-    i18n(property: I18nPropertyInit): string;
+    i18n(property: I18nPropertyInit | I18nAttributeInit): string;
     customI18n(value: string): string;
     /**
      * @deprecated use this.addI18nContext instead

package/build/lit/i18n.js

@@ -25,17 +25,21 @@ export function withI18n(Class) {
         getI18nService(custom) {
             return (custom !== null && custom !== void 0 ? custom : this.useCustomMessageContexts) ? ftCustomI18nService : ftI18nService;
         }
-        i18n(property) {
-            var _c;
-            if (!this.hasI18nContext(property.context)) {
-                this.addI18nContext(property.context, undefined, property.custom);
+        i18n(propertyOrValue) {
+            const { context, key, message } = propertyOrValue;
+            const { custom, args, argsProvider } = propertyOrValue;
+            if (context && key) {
+                if (!this.hasI18nContext(context)) {
+                    this.addI18nContext(context, undefined, custom);
+                }
+                const resolvedArgs = args !== null && args !== void 0 ? args : (argsProvider ? argsProvider(this) : []);
+                return this.getI18nService(custom).resolveMessage(context, key, ...resolvedArgs);
             }
-            const resolvedArgs = (_c = property.args) !== null && _c !== void 0 ? _c : (property.argsProvider ? property.argsProvider(this) : []);
-            return this.getI18nService(property.custom).resolveMessage(property.context, property.key, ...resolvedArgs);
+            return message;
         }
         customI18n(value, init) {
             if (isI18nKey(value)) {
-                let [context, key] = value.split(".");
+                const [context, key] = value.split(".");
                 return this.i18n({ custom: true, context, key, ...init }) || value;
             }
             return value;
@@ -60,12 +64,12 @@ export function withI18n(Class) {
             const self = this;
             const update = (init, prop, value) => {
                 if ((value === null || value === void 0 ? void 0 : value.context) && value.key && condition(init, prop, value)) {
-                    return { ...value, message: this.i18n({ context: value.context, key: value.key, ...init }) };
+                    return { ...value, message: this.i18n({ context: value.context, key: value.key, custom: value.custom, ...init }) };
                 }
                 return value;
             };
             (_c = this[i18nAttributes]) === null || _c === void 0 ? void 0 : _c.forEach((init, prop) => self[prop] = update(init, prop, self[prop]));
-            (_d = this[i18nListAttributes]) === null || _d === void 0 ? void 0 : _d.forEach((init, prop) => { var _c; return self[prop] = (_c = self[prop]) === null || _c === void 0 ? void 0 : _c.map(value => update(init, prop, value)); });
+            (_d = this[i18nListAttributes]) === null || _d === void 0 ? void 0 : _d.forEach((init, prop) => { var _c; return self[prop] = (_c = self[prop]) === null || _c === void 0 ? void 0 : _c.map((value) => update(init, prop, value)); });
         }
         updateI18nProperties(condition) {
             var _c;
@@ -83,7 +87,7 @@ export function withI18n(Class) {
             this.addI18nContext(context, defaultMessages, isCustomContext);
         }
         addI18nContext(context, defaultMessages, isCustomContext) {
-            let contextName = (typeof context === "string" ? context : context.name).toLowerCase();
+            const contextName = (typeof context === "string" ? context : context.name).toLowerCase();
             isCustomContext = typeof context === "string" ? isCustomContext : context.custom;
             this[i18nContexts].set(contextName, { isCustomContext });
             if (!this[i18nUnsubs].has(contextName)) {
@@ -100,7 +104,7 @@ export function withI18n(Class) {
         }
         disconnectedCallback() {
             super.disconnectedCallback();
-            this[i18nUnsubs].forEach(unsub => unsub());
+            this[i18nUnsubs].forEach((unsub) => unsub());
             this[i18nUnsubs].clear();
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-topics/ft-i18n",
-  "version": "1.3.16",
+  "version": "1.3.17",
   "description": "Integrated component that displays internationalized label from a Fluid Topics portal.",
   "keywords": [
     "Lit"
@@ -19,9 +19,9 @@
     "url": "ssh://git@scm.mrs.antidot.net:2222/fluidtopics/ft-web-components.git"
   },
   "dependencies": {
-    "@fluid-topics/ft-app-context": "1.3.16",
-    "@fluid-topics/ft-wc-utils": "1.3.16",
+    "@fluid-topics/ft-app-context": "1.3.17",
+    "@fluid-topics/ft-wc-utils": "1.3.17",
     "lit": "3.1.0"
   },
-  "gitHead": "092d409b397263ffef1f860386137eea8e5f7c2c"
+  "gitHead": "ca55c7b44d386d960ceb68323361ce0ab3aefaa8"
 }