@adminforth/i18n 1.7.1 → 1.8.1

package/dist/index.js

@@ -9,12 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { AdminForthPlugin, Filters, suggestIfTypo, AdminForthDataTypes, RAMLock } from "adminforth";
 import iso6391 from 'iso-639-1';
-import { iso31661Alpha2ToAlpha3 } from 'iso-3166';
 import path from 'path';
 import fs from 'fs-extra';
 import chokidar from 'chokidar';
 import { AsyncQueue } from '@sapphire/async-queue';
 import getFlagEmoji from 'country-flag-svg';
+import { parse } from 'bcp-47';
 const processFrontendMessagesQueue = new AsyncQueue();
 const SLAVIC_PLURAL_EXAMPLES = {
     uk: 'яблук | Яблуко | Яблука | Яблук', // zero | singular | 2-4 | 5+
@@ -38,6 +38,8 @@ const countryISO31661ByLangISO6391 = {
     ja: 'jp', // Japanese → Japan
     uk: 'ua', // Ukrainian → Ukraine
     ur: 'pk', // Urdu → Pakistan
+    sr: 'rs', // Serbian → Serbia
+    da: 'dk' // Danish → Denmark
 };
 function getCountryCodeFromLangCode(lang) {
     const [langCode, region] = String(lang).split('-');
@@ -50,15 +52,19 @@ function getPrimaryLanguageCode(langCode) {
     return String(langCode).split('-')[0];
 }
 function isValidSupportedLanguageTag(langCode) {
-    const [primary, region] = String(langCode).split('-');
-    if (!iso6391.validate(primary)) {
-        return false;
+    try {
+        const schema = parse(String(langCode), {
+            normalize: true,
+            warning: (reason, code, offset) => {
+                console.warn(`Warning in validating language tag ${langCode}: reason=${reason}, code=${code}, offset=${offset}`);
+            }
+        });
+        const isValid = schema && schema.language && schema.language.length === 2;
+        return !!isValid;
     }
-    if (!region) {
-        return true;
+    catch (e) {
+        return false;
     }
-    const regionUpper = region.toUpperCase();
-    return /^[A-Z]{2}$/.test(regionUpper) && (regionUpper in iso31661Alpha2ToAlpha3);
 }
 class CachingAdapterMemory {
     constructor() {
@@ -793,6 +799,7 @@ export default class I18nPlugin extends AdminForthPlugin {
                 const flagEmoji = typeof getFlagEmoji === 'function'
                     ? getFlagEmoji
                     : getFlagEmoji.default;
+                console.log('🪲languagesList for lang:', lang, 'country code:', getCountryCodeFromLangCode(lang));
                 return {
                     code: lang,
                     nameOnNative: iso6391.getNativeName(getPrimaryLanguageCode(lang)),

package/index.ts

@@ -8,7 +8,7 @@ import fs from 'fs-extra';
 import chokidar from 'chokidar';
 import  { AsyncQueue } from '@sapphire/async-queue';
 import getFlagEmoji from 'country-flag-svg';
-
+import { parse } from 'bcp-47'
 
 const processFrontendMessagesQueue = new AsyncQueue();
 
@@ -35,6 +35,8 @@ const countryISO31661ByLangISO6391 = {
   ja: 'jp', // Japanese → Japan
   uk: 'ua', // Ukrainian → Ukraine
   ur: 'pk', // Urdu → Pakistan
+  sr: 'rs', // Serbian → Serbia
+  da: 'dk' // Danish → Denmark
 };
 
 function getCountryCodeFromLangCode(lang: SupportedLanguage) {
@@ -50,15 +52,20 @@ function getPrimaryLanguageCode(langCode: SupportedLanguage): string {
 }
 
 function isValidSupportedLanguageTag(langCode: SupportedLanguage): boolean {
-  const [primary, region] = String(langCode).split('-');
-  if (!iso6391.validate(primary as any)) {
+  try {
+    const schema = parse(String(langCode), 
+      { 
+        normalize: true, 
+        warning: (reason, code, offset) => {
+          console.warn(`Warning in validating language tag ${langCode}: reason=${reason}, code=${code}, offset=${offset}`);
+        }
+      }
+    );
+    const isValid = schema && schema.language && schema.language.length === 2;
+    return !!isValid;
+  } catch (e) {
     return false;
   }
-  if (!region) {
-    return true;
-  }
-  const regionUpper = region.toUpperCase();
-  return /^[A-Z]{2}$/.test(regionUpper) && (regionUpper in iso31661Alpha2ToAlpha3);
 }
 
 
@@ -930,6 +937,8 @@ export default class I18nPlugin extends AdminForthPlugin {
         typeof getFlagEmoji === 'function'
           ? getFlagEmoji
           : getFlagEmoji.default;
+      
+      console.log('🪲languagesList for lang:', lang, 'country code:', getCountryCodeFromLangCode(lang));
 
       return {
         code: lang,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/i18n",
-  "version": "1.7.1",
+  "version": "1.8.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
@@ -30,6 +30,7 @@
   "dependencies": {
     "@aws-sdk/client-ses": "^3.654.0",
     "@sapphire/async-queue": "^1.5.5",
+    "bcp-47": "^2.1.0",
     "chokidar": "^4.0.1",
     "country-flag-svg": "^1.0.19",
     "fs-extra": "^11.3.2",