@adminforth/i18n 1.0.18-next.9 → 1.0.19-next.0

package/custom/LanguageInUserMenu.vue

@@ -18,21 +18,25 @@
       />
     </div>
 
-    <div v-if="showDropdown" class="cursor-pointer flex items-center gap-1 block px-4 py-2 text-sm 
-      text-black dark:text-darkSidebarTextHover
-      bg-black bg-opacity-10	
-      hover:bg-html dark:hover:bg-darkSidebarItemHover dark:hover:text-darkSidebarTextActive 
-      w-full text-select-none pl-5 select-none"
-      v-for="option in options.filter((opt) => opt.value !== selectedOption.value)"
-      @click="doChangeLang(option.value)"
-    >
-      <span class="mr-1">
-        <span class="flag-icon"
-          :class="`flag-icon-${getCountryCodeFromLangCode(option.value)}`"
-        ></span>
-      </span>
-      <span>{{ option.label }}</span>
-    
+    <div v-if="showDropdown" >
+      
+      <div class="cursor-pointer flex items-center gap-1 block px-4 py-1 text-sm 
+        text-black dark:text-darkSidebarTextHover
+        bg-black bg-opacity-10	
+        hover:brightness-110
+        hover:bg-lightPrimaryContrast dark:hover:bg-darkPrimaryContrasts
+        w-full text-select-none pl-5 select-none"
+        v-for="option in options.filter((opt) => opt.value !== selectedOption.value)"
+        @click="doChangeLang(option.value)"
+      >
+        <span class="mr-1">
+          <span class="flag-icon"
+            :class="`flag-icon-${getCountryCodeFromLangCode(option.value)}`"
+          ></span>
+        </span>
+        <span>{{ option.label }}</span>
+      
+      </div>
     </div>
 
    

package/custom/LanguageUnderLogin.vue

@@ -1,6 +1,7 @@
 <template>
   <p class="text-gray-500 dark:text-gray-400 font-sm text-left mt-3 flex items-center justify-center">
     <Select
+      class="w-full"
       v-model="selectedLanguage"
       :options="options"
       :placeholder="$t('Select language')"

package/dist/custom/LanguageInUserMenu.vue

@@ -18,21 +18,25 @@
       />
     </div>
 
-    <div v-if="showDropdown" class="cursor-pointer flex items-center gap-1 block px-4 py-2 text-sm 
-      text-black dark:text-darkSidebarTextHover
-      bg-black bg-opacity-10	
-      hover:bg-html dark:hover:bg-darkSidebarItemHover dark:hover:text-darkSidebarTextActive 
-      w-full text-select-none pl-5 select-none"
-      v-for="option in options.filter((opt) => opt.value !== selectedOption.value)"
-      @click="doChangeLang(option.value)"
-    >
-      <span class="mr-1">
-        <span class="flag-icon"
-          :class="`flag-icon-${getCountryCodeFromLangCode(option.value)}`"
-        ></span>
-      </span>
-      <span>{{ option.label }}</span>
-    
+    <div v-if="showDropdown" >
+      
+      <div class="cursor-pointer flex items-center gap-1 block px-4 py-1 text-sm 
+        text-black dark:text-darkSidebarTextHover
+        bg-black bg-opacity-10	
+        hover:brightness-110
+        hover:bg-lightPrimaryContrast dark:hover:bg-darkPrimaryContrasts
+        w-full text-select-none pl-5 select-none"
+        v-for="option in options.filter((opt) => opt.value !== selectedOption.value)"
+        @click="doChangeLang(option.value)"
+      >
+        <span class="mr-1">
+          <span class="flag-icon"
+            :class="`flag-icon-${getCountryCodeFromLangCode(option.value)}`"
+          ></span>
+        </span>
+        <span>{{ option.label }}</span>
+      
+      </div>
     </div>
 
    

package/dist/custom/LanguageUnderLogin.vue

@@ -1,6 +1,7 @@
 <template>
   <p class="text-gray-500 dark:text-gray-400 font-sm text-left mt-3 flex items-center justify-center">
     <Select
+      class="w-full"
       v-model="selectedLanguage"
       :options="options"
       :placeholder="$t('Select language')"

package/dist/index.js

@@ -290,8 +290,8 @@ export default class I18N extends AdminForthPlugin {
                             if (e instanceof AiTranslateError) {
                                 return { ok: false, error: e.message };
                             }
+                            throw e;
                         }
-                        process.env.HEAVY_DEBUG && console.log('🪲bulkTranslate done', translatedCount);
                         this.updateUntranslatedMenuBadge();
                         return {
                             ok: true,
@@ -345,9 +345,10 @@ export default class I18N extends AdminForthPlugin {
                 return totalTranslated;
             }
             const lang = langIsoCode;
+            const langName = iso6391.getName(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.
+I need to translate strings in JSON to ${lang} (${langName}) language from English for my web app.
 ${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:
 
@@ -358,10 +359,8 @@ ${JSON.stringify(strings.reduce((acc, s) => {
             }, {}), null, 2)}
 \`\`\`
 `;
-            // process.env.HEAVY_DEBUG && console.log('🧠 llm prompt', prompt);
             // call OpenAI
             const resp = yield this.options.completeAdapter.complete(prompt, [], 300);
-            // process.env.HEAVY_DEBUG && console.log('🧠 llm resp', resp);
             if (resp.error) {
                 throw new AiTranslateError(resp.error);
             }
@@ -375,10 +374,16 @@ ${JSON.stringify(strings.reduce((acc, s) => {
                 res = resp.content.split("```json")[1].split("```")[0];
             }
             catch (e) {
-                console.error(`Error in parsing OpenAI: ${resp}\n Prompt was: ${prompt}\n Resp was: ${JSON.stringify(resp)}`);
+                console.error(`Error in parsing LLM resp: ${resp}\n Prompt was: ${prompt}\n Resp was: ${JSON.stringify(resp)}`);
+                return [];
+            }
+            try {
+                res = JSON.parse(res);
+            }
+            catch (e) {
+                console.error(`Error in parsing LLM resp json: ${resp}\n Prompt was: ${prompt}\n Resp was: ${JSON.stringify(resp)}`);
                 return [];
             }
-            res = JSON.parse(res);
             for (const [enStr, translatedStr] of Object.entries(res)) {
                 const translationsTargeted = translations.filter(t => t[this.enFieldName] === enStr);
                 // might be several with same en_string
@@ -424,20 +429,14 @@ ${JSON.stringify(strings.reduce((acc, s) => {
             const updateStrings = {};
             const langsInvolved = new Set(Object.keys(needToTranslateByLang));
             let totalTranslated = [];
-            process.env.HEAVY_DEBUG && console.log(' 🐛starting Promise.all Object.entries(needToTranslateByLang)');
             yield Promise.all(Object.entries(needToTranslateByLang).map((_b) => __awaiter(this, [_b], void 0, function* ([lang, strings]) {
                 // first translate without plurals
                 const stringsWithoutPlurals = strings.filter(s => !s.en_string.includes('|'));
-                process.env.HEAVY_DEBUG && console.log(`🔗  ${lang} noplurals started ${stringsWithoutPlurals.length}`);
                 const noPluralKeys = yield this.translateToLang(lang, stringsWithoutPlurals, false, translations, updateStrings);
-                process.env.HEAVY_DEBUG && console.log(`🔗  ${lang} noplurals finished`);
                 const stringsWithPlurals = strings.filter(s => s.en_string.includes('|'));
-                process.env.HEAVY_DEBUG && console.log(`🔗  ${lang} plurals started ${stringsWithPlurals.length}`);
                 const pluralKeys = yield this.translateToLang(lang, stringsWithPlurals, true, translations, updateStrings);
-                process.env.HEAVY_DEBUG && console.log(`🔗  ${lang} plurals finished`);
                 totalTranslated = totalTranslated.concat(noPluralKeys, pluralKeys);
             })));
-            process.env.HEAVY_DEBUG && console.log('✅ updateStrings were formed', (new Set(totalTranslated)));
             yield Promise.all(Object.entries(updateStrings).map((_c) => __awaiter(this, [_c], void 0, function* ([_, { updates, strId }]) {
                 // because this will translate all languages, we can set completedLangs to all languages
                 const futureCompletedFieldValue = this.fullCompleatedFieldValue;

package/index.ts

@@ -332,9 +332,9 @@ export default class I18N extends AdminForthPlugin {
               process.env.HEAVY_DEBUG && console.error('🪲⛔ bulkTranslate error', e);
               if (e instanceof AiTranslateError) {
                 return { ok: false, error: e.message };
-              }
+              } 
+              throw e;
             }
-            process.env.HEAVY_DEBUG && console.log('🪲bulkTranslate done', translatedCount);
             this.updateUntranslatedMenuBadge();
             return { 
               ok: true, 
@@ -395,11 +395,11 @@ export default class I18N extends AdminForthPlugin {
       return totalTranslated;
     }
     const lang = langIsoCode;
-
+    const langName = iso6391.getName(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.
+I need to translate strings in JSON to ${lang} (${langName}) language from English for my web app.
 ${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:
 
@@ -411,9 +411,7 @@ JSON.stringify(strings.reduce((acc: object, s: { en_string: string }): object =>
 }, {}), null, 2)
 }
 \`\`\`
-`;
-
-    // process.env.HEAVY_DEBUG && console.log('🧠 llm prompt', prompt);
+`;  
 
     // call OpenAI
     const resp = await this.options.completeAdapter.complete(
@@ -422,8 +420,6 @@ JSON.stringify(strings.reduce((acc: object, s: { en_string: string }): object =>
       300,
     );
 
-    // process.env.HEAVY_DEBUG && console.log('🧠 llm resp', resp);
-
     if (resp.error) {
       throw new AiTranslateError(resp.error);
     }
@@ -437,10 +433,17 @@ JSON.stringify(strings.reduce((acc: object, s: { en_string: string }): object =>
     try {
       res = resp.content.split("```json")[1].split("```")[0];
     } catch (e) {
-      console.error(`Error in parsing OpenAI: ${resp}\n Prompt was: ${prompt}\n Resp was: ${JSON.stringify(resp)}`, );
+      console.error(`Error in parsing LLM resp: ${resp}\n Prompt was: ${prompt}\n Resp was: ${JSON.stringify(resp)}`, );
+      return [];
+    }
+
+    try {
+      res = JSON.parse(res);
+    } catch (e) {
+      console.error(`Error in parsing LLM resp json: ${resp}\n Prompt was: ${prompt}\n Resp was: ${JSON.stringify(resp)}`, );
       return [];
     }
-    res = JSON.parse(res);
+
 
     for (const [enStr, translatedStr] of Object.entries(res) as [string, string][]) {
       const translationsTargeted = translations.filter(t => t[this.enFieldName] === enStr);
@@ -510,31 +513,24 @@ JSON.stringify(strings.reduce((acc: object, s: { en_string: string }): object =>
     const langsInvolved = new Set(Object.keys(needToTranslateByLang));
 
     let totalTranslated = [];
-    process.env.HEAVY_DEBUG && console.log(' 🐛starting Promise.all Object.entries(needToTranslateByLang)');
 
     await Promise.all(
       Object.entries(needToTranslateByLang).map(
         async ([lang, strings]: [LanguageCode, { en_string: string, category: string }[]]) => {
           // first translate without plurals
           const stringsWithoutPlurals = strings.filter(s => !s.en_string.includes('|'));
-          process.env.HEAVY_DEBUG && console.log(`🔗  ${lang} noplurals started ${stringsWithoutPlurals.length}`);
           const noPluralKeys = await this.translateToLang(lang, stringsWithoutPlurals, false, translations, updateStrings);
-          process.env.HEAVY_DEBUG && console.log(`🔗  ${lang} noplurals finished`);
 
 
           const stringsWithPlurals = strings.filter(s => s.en_string.includes('|'));
 
-          process.env.HEAVY_DEBUG && console.log(`🔗  ${lang} plurals started ${stringsWithPlurals.length}`);
           const pluralKeys = await this.translateToLang(lang, stringsWithPlurals, true, translations, updateStrings);
-          process.env.HEAVY_DEBUG && console.log(`🔗  ${lang} plurals finished`);
 
           totalTranslated = totalTranslated.concat(noPluralKeys, pluralKeys);
         }
       )
     );
 
-    process.env.HEAVY_DEBUG && console.log('✅ updateStrings were formed', (new Set(totalTranslated)));
-
     await Promise.all(
       Object.entries(updateStrings).map(
         async ([_, { updates, strId }]: [string, { updates: any, category: string, strId: string }]) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/i18n",
-  "version": "1.0.18-next.9",
+  "version": "1.0.19-next.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",