Merge branch 'main' of github.com:devforth/adminforth

Author: Romper9

adminforth/documentation/docs/tutorial/05-Plugins/10-i18n.md

@@ -337,7 +337,7 @@ And on the backend side you can use tr function to translate the string:
       admin.express.translatable(
         async (req, res) => {
           res.json({
-            text: await tr('Welcome, {name}', 'customApis', { name: req.adminUser.username }),
+            text: await req.tr('Welcome, {name}', 'customApis', { name: req.adminUser.username }),
           });
         }
       )

adminforth/modules/restApi.ts

@@ -459,8 +459,6 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
           })
         );
 
-        console.log('🗣️translated', translated);
-
 
         const toReturn = {
             ...resource,

adminforth/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.5.8-next.11",
+  "version": "1.5.8-next.12",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "module": "dist/index.js",

adminforth/package.json

@@ -0,0 +1,13 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [v1.0.10]
+
+## Fixed
+
+- fix automatic translations for duplicate strings
+- improve slavik pluralization generations by splitting the requests

adminforth/plugins/i18n/Changelog.md

@@ -347,7 +347,8 @@ export default class I18N extends AdminForthPlugin {
     });
   }
 
-  async bulkTranslate({ selectedIds }: { selectedIds: string[] }) {
+  // returns translated count
+  async bulkTranslate({ selectedIds }: { selectedIds: string[] }): Promise<number> {
 
     const needToTranslateByLang : Partial<
       Record<
@@ -382,26 +383,33 @@ export default class I18N extends AdminForthPlugin {
     const maxKeysInOneReq = 10;
 
     const updateStrings: Record<string, { 
-      updates: any, category: string, strId: string
+      updates: any, 
+      category: string,
+      strId: string,
+      translatedStr: string
      }> = {};
 
-    const translateToLang = async (langIsoCode: LanguageCode, strings: { en_string: string, category: string }[]) => {
-
+    const translateToLang = async (langIsoCode: LanguageCode, strings: { en_string: string, category: string }[], plurals=false): Promise<number> => {
+      if (strings.length === 0) {
+        return 0;
+      }
 
       if (strings.length > maxKeysInOneReq) {
+        let totalTranslated = 0;
         for (let i = 0; i < strings.length; i += maxKeysInOneReq) {
           const slicedStrings = strings.slice(i, i + maxKeysInOneReq);
-          await translateToLang(langIsoCode, slicedStrings);
+          console.log('🪲🔪slicedStrings ', slicedStrings);
+          totalTranslated += await translateToLang(langIsoCode, slicedStrings, plurals);
         }
-        return;
+        return totalTranslated;
       }
       const lang = langIsoCode;
 
-      const isSlavikPlural = Object.keys(SLAVIC_PLURAL_EXAMPLES).includes(lang);
+      const requestSlavicPlurals = Object.keys(SLAVIC_PLURAL_EXAMPLES).includes(lang) && plurals;
 
       const prompt = `
 I need to translate strings in JSON to ${lang} language from English for my web app.
-${isSlavikPlural ? `If string contains '|' it means it is plural form, you should provide 4 translations (zero | singular | 2-4 | 5+) e.g. ${SLAVIC_PLURAL_EXAMPLES[lang]}` : ''}
+${requestSlavicPlurals ? `You should provide 4 translations (in format zero | singular | 2-4 | 5+) e.g. ${SLAVIC_PLURAL_EXAMPLES[lang]}` : ''}
 Keep keys, as is, write translation into values! Here are the strings:
 
 \`\`\`json
@@ -442,29 +450,42 @@ ${
         return;
       }
       res = JSON.parse(res);
-      for (const [enStr, translatedStr] of Object.entries(res)) {
+
+
+      for (const [enStr, translatedStr] of Object.entries(res) as [string, string][]) {
         const translationsTargeted = translations.filter(t => t[this.enFieldName] === enStr);
         // might be several with same en_string
         for (const translation of translationsTargeted) {
-          translation[this.trFieldNames[lang]] = translatedStr;
+          //translation[this.trFieldNames[lang]] = translatedStr;
           // process.env.HEAVY_DEBUG && console.log(`🪲translated to ${lang} ${translation.en_string}, ${translatedStr}`)
-          if (!updateStrings[enStr]) {
-            updateStrings[enStr] = {
+          if (!updateStrings[translation[this.primaryKeyFieldName]]) {
+
+            updateStrings[translation[this.primaryKeyFieldName]] = {
               updates: {},
+              translatedStr,
               category: translation[this.options.categoryFieldName],
               strId: translation[this.primaryKeyFieldName],
             };
           }
-          updateStrings[enStr].updates[this.trFieldNames[lang]] = translatedStr;
+          updateStrings[
+            translation[this.primaryKeyFieldName]
+          ].updates[this.trFieldNames[lang]] = translatedStr;
         }
       }
 
+      return res.length;
     }
 
     const langsInvolved = new Set(Object.keys(needToTranslateByLang));
 
+    let totalTranslated = 0;
     await Promise.all(Object.entries(needToTranslateByLang).map(async ([lang, strings]: [LanguageCode, { en_string: string, category: string }[]]) => {
-      await translateToLang(lang, strings);
+      // first translate without plurals
+      const stringsWithoutPlurals = strings.filter(s => !s.en_string.includes('|'));
+      totalTranslated += await translateToLang(lang, stringsWithoutPlurals, false);
+
+      const stringsWithPlurals = strings.filter(s => s.en_string.includes('|'));
+      totalTranslated += await translateToLang(lang, stringsWithPlurals, true);
     }));    
 
     await Promise.all(
@@ -488,6 +509,8 @@ ${
       }
     }
 
+    return totalTranslated;
+
   }
 
   async processExtractedMessages(adminforth: IAdminForth, filePath: string) {

adminforth/plugins/i18n/index.ts

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

adminforth/plugins/i18n/package-lock.json

@@ -17,6 +17,7 @@ export default {
   plugins: [
     new I18nPlugin({
       supportedLanguages: ['en', 'uk', 'ja', 'fr'],
+      // supportedLanguages: ['en', 'uk'],
 
       // names of the fields in the resource which will store translations
       translationFieldNames: {