@adminforth/i18n 1.0.23-next.2 → 1.0.23-next.3

package/Changelog.md

@@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - support for pluralization in Backend `tr` function
+- add handy languagesList function to get all languages for translation of side apps
+
+### Fixed
+- invalidation of indvidual tr messages when translation using LLM adapter
 
 ## [1.0.22]
 

package/dist/index.js

@@ -30,6 +30,19 @@ const SLAVIC_PLURAL_EXAMPLES = {
     be: 'яблыкаў | яблык | яблыкі | яблыкаў', // zero | singular | 2-4 | 5+
     ru: 'яблок | яблоко | яблока | яблок', // zero | singular | 2-4 | 5+
 };
+const countryISO31661ByLangISO6391 = {
+    en: 'us', // English → United States
+    zh: 'cn', // Chinese → China
+    hi: 'in', // Hindi → India
+    ar: 'sa', // Arabic → Saudi Arabia
+    ko: 'kr', // Korean → South Korea
+    ja: 'jp', // Japanese → Japan
+    uk: 'ua', // Ukrainian → Ukraine
+    ur: 'pk', // Urdu → Pakistan
+};
+function getCountryCodeFromLangCode(langCode) {
+    return countryISO31661ByLangISO6391[langCode] || langCode;
+}
 class CachingAdapterMemory {
     constructor() {
         this.cache = {};
@@ -425,6 +438,7 @@ ${JSON.stringify(strings.reduce((acc, s) => {
                         updateStrings[translation[this.primaryKeyFieldName]] = {
                             updates: {},
                             translatedStr,
+                            enStr,
                             category: translation[this.options.categoryFieldName],
                             strId: translation[this.primaryKeyFieldName],
                         };
@@ -482,7 +496,7 @@ ${JSON.stringify(strings.reduce((acc, s) => {
             })));
             for (const lang of langsInvolved) {
                 yield this.cache.clear(`${this.resourceConfig.resourceId}:frontend:${lang}`);
-                for (const [enStr, { category }] of Object.entries(updateStrings)) {
+                for (const { enStr, category } of Object.values(updateStrings)) {
                     yield this.cache.clear(`${this.resourceConfig.resourceId}:${category}:${lang}:${enStr}`);
                 }
             }
@@ -681,7 +695,7 @@ ${JSON.stringify(strings.reduce((acc, s) => {
                     code: lang,
                     nameOnNative: iso6391.getNativeName(lang),
                     nameEnglish: iso6391.getName(lang),
-                    emojiFlag: lang.toUpperCase().replace(/./g, char => String.fromCodePoint(char.charCodeAt(0) + 127397)),
+                    emojiFlag: getCountryCodeFromLangCode(lang).toUpperCase().replace(/./g, char => String.fromCodePoint(char.charCodeAt(0) + 127397)),
                 };
             });
         });

package/index.ts

@@ -6,8 +6,6 @@ import path from 'path';
 import fs from 'fs-extra';
 import chokidar from 'chokidar';
 import  { AsyncQueue } from '@sapphire/async-queue';
-
-
 console.log = (...args) => {
   process.stdout.write(args.join(" ") + "\n");
 };
@@ -28,6 +26,22 @@ const SLAVIC_PLURAL_EXAMPLES = {
   ru: 'яблок | яблоко | яблока | яблок', // zero | singular | 2-4 | 5+
 };
 
+const countryISO31661ByLangISO6391 = {
+  en: 'us', // English → United States
+  zh: 'cn', // Chinese → China
+  hi: 'in', // Hindi → India
+  ar: 'sa', // Arabic → Saudi Arabia
+  ko: 'kr', // Korean → South Korea
+  ja: 'jp', // Japanese → Japan
+  uk: 'ua', // Ukrainian → Ukraine
+  ur: 'pk', // Urdu → Pakistan
+};
+
+function getCountryCodeFromLangCode(langCode) {
+  return countryISO31661ByLangISO6391[langCode] || langCode;
+}
+
+
 interface ICachingAdapter {
   get(key: string): Promise<any>;
   set(key: string, value: any): Promise<void>;
@@ -406,7 +420,7 @@ export default class I18nPlugin extends AdminForthPlugin {
       strings: { en_string: string, category: string }[], 
       plurals=false,
       translations: any[],
-      updateStrings: Record<string, { updates: any, category: string, strId: string, translatedStr: string }> = {}
+      updateStrings: Record<string, { updates: any, category: string, strId: string, enStr: string, translatedStr: string }> = {}
   ): Promise<string[]> {
     const maxKeysInOneReq = 10;
     if (strings.length === 0) {
@@ -486,6 +500,7 @@ JSON.stringify(strings.reduce((acc: object, s: { en_string: string }): object =>
           updateStrings[translation[this.primaryKeyFieldName]] = {
             updates: {},
             translatedStr,
+            enStr,
             category: translation[this.options.categoryFieldName],
             strId: translation[this.primaryKeyFieldName],
           };
@@ -541,6 +556,7 @@ JSON.stringify(strings.reduce((acc: object, s: { en_string: string }): object =>
       updates: any, 
       category: string,
       strId: string,
+      enStr: string,
       translatedStr: string
     }> = {};
 
@@ -585,7 +601,7 @@ JSON.stringify(strings.reduce((acc: object, s: { en_string: string }): object =>
 
     for (const lang of langsInvolved) {
       await this.cache.clear(`${this.resourceConfig.resourceId}:frontend:${lang}`);
-      for (const [enStr, { category }] of Object.entries(updateStrings)) {
+      for (const { enStr, category } of Object.values(updateStrings)) {
         await this.cache.clear(`${this.resourceConfig.resourceId}:${category}:${lang}:${enStr}`);
       }
     }
@@ -807,7 +823,7 @@ JSON.stringify(strings.reduce((acc: object, s: { en_string: string }): object =>
         code: lang as LanguageCode,
         nameOnNative: iso6391.getNativeName(lang),
         nameEnglish: iso6391.getName(lang),
-        emojiFlag: lang.toUpperCase().replace(/./g, char => String.fromCodePoint(char.charCodeAt(0) + 127397)),
+        emojiFlag: getCountryCodeFromLangCode(lang).toUpperCase().replace(/./g, char => String.fromCodePoint(char.charCodeAt(0) + 127397)),
       };
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/i18n",
-  "version": "1.0.23-next.2",
+  "version": "1.0.23-next.3",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",