wineater-bot 3.8.0 → 3.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wineater-bot",
-  "version": "3.8.0",
+  "version": "3.8.1",
   "description": "",
   "main": "dist/index.js",
   "module": "src/index.js",

package/src/js/i18n.js

@@ -470,8 +470,8 @@ class Translator {
                 headerOccasion: "случай",
                 headerOr: "или",
             },
-            kz: {
-                lang: 'kz',
+            kk: {
+                lang: 'kk',
                 welcomeMessage: "Сіз не жегіңіз келеді? Тағамыңызды сипаттаңыз, мен оған керемет шарап ұсынамын.",
                 noResultsFound: "Нәтижелер табылмады.",
                 somethingWentWrong: "Кешіріңіз, бірдеңе дұрыс болмады.",
@@ -540,29 +540,31 @@ class Translator {
 
     async fetchConfig(storeName) {
         try {
-            const config = await this.api.getStoreConfig(storeName);
-            this.storeLanguage = config.lang;
-            this.supportedLanguages = config.available_languages;
-            this.OpenAIApiKey = config.open_ai_key;
-            // ✅ Если язык уже сохранён в localStorage — использовать его
-            const storedLang = localStorage.getItem('selectedLanguage');
-            if (storedLang && this.translations[storedLang]) {
-                this.language = storedLang;
-            } else if (config.lang && this.translations[config.lang]) {
-                // иначе использовать с бэкенда
-                this.language = config.lang;
-                localStorage.setItem('selectedLanguage', config.lang);
-            } else {
-                this.language = 'en';
-            }
-    
-            this.currency = config.currency || 'USD';
-    
+          const config = await this.api.getStoreConfig(storeName);
+          this.storeLanguage = config.lang;
+          this.supportedLanguages = config.available_languages;
+          this.OpenAIApiKey = config.open_ai_key;
+      
+          const urlParams = new URLSearchParams(window.location.search);
+          const urlLang = urlParams.get('lang') || urlParams.get('language');
+      
+          if (urlLang && this.translations[urlLang]) {
+            this.language = urlLang;
+          } else if (config.lang && this.translations[config.lang]) {
+            this.language = config.lang;
+          } else {
+            this.language = 'en';
+          }
+      
+          this.currency = config.currency || 'USD';
         } catch (e) {
-            this.language = localStorage.getItem('selectedLanguage') || 'en';
-            this.currency = 'USD';
+          const urlParams = new URLSearchParams(window.location.search);
+          const urlLang = urlParams.get('lang') || urlParams.get('language');
+      
+          this.language = this.translations[urlLang] ? urlLang : 'en';
+          this.currency = 'USD';
         }
-    }
+      }
 
     getCurrency(key) {
         const keys = key.split('.'); // Разбиваем ключ на части
@@ -598,12 +600,19 @@ class Translator {
         return this.supportedLanguages;
     }
 
-    async translateTexts(textObject) {
+    getLangFromURL() {
+        const urlParams = new URLSearchParams(window.location.search);
+        const lang = urlParams.get('lang') || urlParams.get('language');
+        return lang && this.translations[lang] ? lang : null;
+      }
+
+      async translateTexts(textObject) {
         if (this.storeLanguage === this.language || !this.supportedLanguages) {
+            console.log('gривет');
           return textObject;
         }
       
-        const apiKey = this.OpenAIApiKey; // ✅ Заменить на твой реальный ключ
+        const apiKey = this.OpenAIApiKey;
         const url = 'https://api.openai.com/v1/chat/completions';
       
         const headers = {
@@ -611,12 +620,37 @@ class Translator {
           'Authorization': `Bearer ${apiKey}`,
         };
       
-        const texts = Object.values(textObject);
-        const joinedText = texts.join(' ||| ');
-      
-        const prompt = `Translate the following texts to language with the next code: ${this.language}. Return only the translated texts separated by " ||| " in the same order:
+        const entries = Object.entries(textObject).map(([key, text]) => ({
+          key,
+          text,
+        }));
       
-      ${joinedText}`;
+        const prompt = `
+        You are a professional translator.
+        
+        The input texts are written in language with code "${this.storeLanguage}". Your task is to translate them strictly to the target language with code "${this.language}".
+        
+        ⚠️ DO NOT leave the original text.
+        ⚠️ DO NOT skip any entry.
+        ⚠️ Preserve the original order and keys exactly.
+        
+        Translate only the "text" fields of the JSON array. Return an array of the same length and structure, like this:
+        
+        Input:
+        [
+          { "key": "shortDescription", "text": "Red wine with rich cherry notes." },
+          { "key": "tags", "text": "fruity, dry, elegant" }
+        ]
+        
+        Output:
+        [
+          { "key": "shortDescription", "text": "..." },
+          { "key": "tags", "text": "..." }
+        ]
+        
+        Now translate the following input:
+        ${JSON.stringify(entries, null, 2)}
+        `;
       
         const body = JSON.stringify({
           model: 'gpt-3.5-turbo',
@@ -640,11 +674,13 @@ class Translator {
       
           if (!translatedRaw) throw new Error('No response from OpenAI');
       
-          const translatedTexts = translatedRaw.split(' ||| ').map(t => t.trim());
+          const translatedArray = JSON.parse(translatedRaw);
       
           const translatedObject = {};
-          Object.keys(textObject).forEach((key, index) => {
-            translatedObject[key] = translatedTexts[index] || textObject[key];
+          translatedArray.forEach(entry => {
+            if (entry.key && entry.text !== undefined) {
+              translatedObject[entry.key] = entry.text;
+            }
           });
       
           return translatedObject;

package/src/js/widget.js

@@ -399,59 +399,64 @@ export class WineWidget {
       if (translator.language === translator.storeLanguage || this.widgetType !== 'bar') {
         return;
       }
+    
       const possibleFields = ['Short Description', 'reason', 'pairing_recommendation', 'Tags', 'tags'];
-  const firstWine = wines[0];
-
-  // Фильтруем по реально существующим ключам в первом объекте
-  const fieldsToTranslate = possibleFields.filter(field => field in firstWine);
-
-  const language = translator.language;
-  const batchSize = 4;
-
-  for (let i = 0; i < wines.length; i += batchSize) {
-    const batch = wines.slice(i, i + batchSize);
-
-    const translationPromises = batch.map(async (wine, index) => {
-      const globalIndex = i + index;
-      const textObject = {};
-
-      fieldsToTranslate.forEach(field => {
-        const val = wine[field] || wine[field.toLowerCase()];
-        if (val) textObject[field] = Array.isArray(val) ? val.join(', ') : val;
-      });
-
-      if (Object.keys(textObject).length === 0) return;
-
-      const translated = await translator.translateTexts(textObject);
-
-      const popup = document.querySelector(`.card-popup[data-wine-index="${globalIndex}"]`);
-      if (!popup) return;
-
-      if (translated['Short Description']) {
-        const el = popup.querySelector('.popup-short-desc');
-        if (el) el.textContent = translated['Short Description'];
-      }
-
-      if (translated.reason) {
-        const el = popup.querySelector('.popup-reason');
-        if (el) el.textContent = translated.reason;
-      }
-
-      if (translated.pairing_recommendation) {
-        const el = popup.querySelector('.popup-pairing');
-        if (el) el.textContent = translated.pairing_recommendation;
-      }
-
-      if (translated.tags || translated.Tags) {
-        const tagsString = translated.tags || translated.Tags;
-        const tagsArray = tagsString.split(',').map(tag => tag.trim());
-        const tagHTML = tagsArray.map(tag => `<span class="popup-tag">${tag}</span>`).join('');
-        const tagsContainer = popup.querySelector('.popup-tags');
-        if (tagsContainer) tagsContainer.innerHTML = tagHTML;
-      }
-    });
-
-    await Promise.all(translationPromises);
+      const firstWine = wines[0];
+    
+      const fieldsToTranslate = possibleFields.filter(field => field in firstWine);
+      const batchSize = 4;
+    
+      for (let i = 0; i < wines.length; i += batchSize) {
+        const batch = wines.slice(i, i + batchSize);
+    
+        const translationPromises = batch.map(async (wine, index) => {
+          const globalIndex = i + index;
+    
+          // Сбор оригинальных текстов в формате [{ key, text }]
+          const entries = fieldsToTranslate
+            .map(field => {
+              const val = wine[field] || wine[field.toLowerCase()];
+              if (!val) return null;
+              return { key: field, text: Array.isArray(val) ? val.join(', ') : val };
+            })
+            .filter(Boolean);
+    
+          if (entries.length === 0) return;
+    
+          // Перевод
+          const translatedArray = await translator.translateTexts(
+            Object.fromEntries(entries.map(entry => [entry.key, entry.text]))
+          );
+    
+          const popup = document.querySelector(`.card-popup[data-wine-index="${globalIndex}"]`);
+          if (!popup) return;
+    
+          // Применение перевода
+          if (translatedArray['Short Description']) {
+            const el = popup.querySelector('.popup-short-desc');
+            if (el) el.textContent = translatedArray['Short Description'];
+          }
+    
+          if (translatedArray.reason) {
+            const el = popup.querySelector('.popup-reason');
+            if (el) el.textContent = translatedArray.reason;
+          }
+    
+          if (translatedArray.pairing_recommendation) {
+            const el = popup.querySelector('.popup-pairing');
+            if (el) el.textContent = translatedArray.pairing_recommendation;
+          }
+    
+          const tags = translatedArray.tags || translatedArray.Tags;
+          if (tags) {
+            const tagArray = tags.split(',').map(tag => tag.trim());
+            const tagHTML = tagArray.map(tag => `<span class="popup-tag">${tag}</span>`).join('');
+            const tagsContainer = popup.querySelector('.popup-tags');
+            if (tagsContainer) tagsContainer.innerHTML = tagHTML;
+          }
+        });
+    
+        await Promise.all(translationPromises);
       }
     }
 
@@ -515,9 +520,8 @@ export class WineWidget {
 createLanguageSwitcher() {
   const langContainer = document.querySelector('#powered-by-widget .powered-by-lang');
   const languages = translator.getSupportedLanguages();
-  if (!languages) {
-    return;
-  }
+  if (!languages) return;
+
   const currentLanguage = translator.language;
 
   const dropdown = document.createElement('select');
@@ -525,18 +529,25 @@ createLanguageSwitcher() {
   dropdown.className = 'language-dropdown';
 
   languages.forEach(lang => {
-      const option = document.createElement('option');
-      option.value = lang;
-      option.textContent = lang.toUpperCase();
-      option.selected = lang === currentLanguage;
-      dropdown.appendChild(option);
+    const option = document.createElement('option');
+    option.value = lang;
+    option.textContent = lang.toUpperCase();
+    option.selected = lang === currentLanguage;
+    dropdown.appendChild(option);
   });
 
   dropdown.onchange = (event) => {
-      const selectedLang = event.target.value;
-      translator.language = selectedLang;
-      localStorage.setItem('selectedLanguage', selectedLang);
-      location.reload(); // Reload to apply language change
+    const selectedLang = event.target.value;
+
+    // Обновляем URL без перезагрузки страницы
+    const url = new URL(window.location.href);
+    url.searchParams.set('lang', selectedLang);
+
+    // Обновляем localStorage тоже, на всякий случай
+    localStorage.setItem('selectedLanguage', selectedLang);
+
+    // Перенаправляем пользователя с обновлённым URL
+    window.location.href = url.toString();
   };
 
   langContainer.appendChild(dropdown);