@enplug/scripts 1.11.4-dev57 → 1.11.4-dev59

package/bin/functions/translations/crowdin.js

@@ -109,19 +109,19 @@ function getCrowdinConfig() {
 
 async function findCrowdinAppDirectoryId(credentials, crowdinPath, appName) {
   try {
-    if(crowdinPath.startsWith('apps')){
+    if(crowdinPath.startsWith('apps') || appName !== 'en.json') { // path is apps/{app-name}/... or dashboard/{data-connector or regions-map or uploader}/en.json
       const url = `${CROWDIN_PROJECT_URL}/directories?filter=${appName}`;
       const AuthStr = 'Bearer '.concat(credentials.token);
       const resp = await axios.get(url, { headers: { Authorization: AuthStr } });
       const directory = resp.data.data.find(d => d.data.name === appName );
       return directory ? directory.data.id : undefined;
-    } else if(crowdinPath.startsWith('dashboard')) {
+    } else if((crowdinPath.startsWith('dashboard') || crowdinPath.startsWith('player-web') || crowdinPath.startsWith('components')) && appName === 'en.json') { //path is dashboard/en.json or player-web/en.json or components/en.json
       const url = `${CROWDIN_PROJECT_URL}/directories?filter=dashboard`;
       const AuthStr = 'Bearer '.concat(credentials.token);
       const resp = await axios.get(url, { headers: { Authorization: AuthStr } });
       const directory = resp.data.data.find(d => d.data.name === 'dashboard' && d.data.title === 'Dashboard' && d.data.path === '/dashboard');
       return directory ? directory.data.id : undefined;
-    } 
+    }
   } catch (err) {
     if (err.response.status === HTTP_UNAUTHORIZED_STATUS_CODE) {
       console.error(`\n${chalk.red.bold('Provided Crowdin token is invalid')}`);
@@ -238,16 +238,15 @@ async function addCrowdinFile(credentials, crowdinPath, storageId, folderId) {
   })).toPromise();
 }
 
-function fetchFileFromCrowdin(credentials, crowdinPath, language) {
-  const url = `${CROWDIN_PROJECT_URL}/export-file`;
-  const params = {
-    'login': credentials.login,
-    'account-key': credentials.accountKey,
-    'file': crowdinPath,
-    'language': language
+function fetchFileFromCrowdin(credentials, language, fileId) {
+  const url = `${CROWDIN_PROJECT_URL}/translations/exports`;
+  const AuthStr = 'Bearer '.concat(credentials.token);
+  const body = {
+    "targetLanguageId": language,
+    "fileIds": [fileId]
   };
 
-  return axios.get(url, { params });
+  return axios.post(url, body, { headers: { Authorization: AuthStr } });
 }
 
 function promptAddFile(crowdinPath) {

package/bin/functions/translations/translations.js

@@ -66,7 +66,7 @@ async function syncTranslations(s3Client, bucket) {
         const appName = crowdinPathSections[1];
         const appDirectoryId = await findCrowdinAppDirectoryId(credentials, crowdinPath, appName);
         if(appDirectoryId === undefined) {
-          console.error(`\n${chalk.red.bold('Directory does not exist')} ${chalk.yellow.bold(`[${appName}]`)}`);
+          console.error(`\n${chalk.red.bold('Directory does not exist')} ${chalk.yellow.bold(`${appName}`)}`);
           console.log('Create the directory in the Crowdin panel first.');
           return;
         }
@@ -84,32 +84,44 @@ async function syncTranslations(s3Client, bucket) {
           if(fileId) {
             const storageId = await uploadFileToCrowdinStorage(credentials, config.localPath);
             if(fileId && storageId) {
-              updateCrowdinFile(credentials, crowdinPath, storageId.data.data.id, fileId);
+              await updateCrowdinFile(credentials, crowdinPath, storageId.data.data.id, fileId);
             }
           } else {
             const storageId = await uploadFileToCrowdinStorage(credentials, config.localPath);
             if(storageId) {
-              addCrowdinFile(credentials, crowdinPath, storageId.data.data.id, folderId);
+              const result = await addCrowdinFile(credentials, crowdinPath, storageId.data.data.id, folderId);
+              console.log('add result', result.data);
             }
           }
-        } else if(crowdinPathSections[0] === 'dashboard' && appDirectoryId) {
+        } else if((crowdinPathSections[0] === 'dashboard' || crowdinPathSections[0] === 'player-web' || crowdinPathSections[0] === 'components') && appDirectoryId) {
           if(crowdinPathSections[1] === 'en.json') {
             const fileId = await getFileIdIfExists(credentials, appDirectoryId, crowdinPathSections[1]); // en.json file id to update
             if(fileId) {
               const storageId = await uploadFileToCrowdinStorage(credentials, config.localPath);
               if(fileId && storageId) {
-                updateCrowdinFile(credentials, crowdinPath, storageId.data.data.id, fileId);
+                await updateCrowdinFile(credentials, crowdinPath, storageId.data.data.id, fileId);
               }
             } else {
-              console.error(`Could not upload ${chalk.yellow.bold(`[${rowdinPathSections[1]}]`)}. Only en.json supported.`);
+              console.error(`Could not upload ${chalk.yellow.bold(`${rowdinPathSections[1]}`)}. Only en.json supported.`);
             }
-          } // TODO else for data-connector, regions-map and uploader
+          } else { // data-connector, regions-map and uploader in dashboard folder
+            const folderId = await findCrowdinAppDirectoryId(credentials, crowdinPath, crowdinPathSections[1]);
+            if(folderId === undefined) {
+              console.error(`Could not find ${chalk.yellow.bold(`${folderId}`)} folder`);
+            }
+            const fileId = await getFileIdIfExists(credentials, folderId, crowdinPathSections[2]); // en.json file id to update
+            const storageId = await uploadFileToCrowdinStorage(credentials, config.localPath);
+            if(fileId && storageId) {
+              await updateCrowdinFile(credentials, crowdinPath, storageId.data.data.id, fileId);
+            } 
+          }
         }
-        // await uploadFileToCrowdin(credentials, config.crowdinPath, config.localPath);
-        // const { data: fakeTranslation } = await fetchFileFromCrowdin(credentials, config.crowdinPath, FAKE_IN_CONTEXT_LANGUAGE);
-
-        // const s3TranslationsPath = path.parse(s3EnPath).dir;
-        // const s3FakeTranslationPath = path.join(s3TranslationsPath, FAKE_IN_CONTEXT_LANGUAGE_FILE);
+        const { data: fakeTranslation } = await fetchFileFromCrowdin(credentials, FAKE_IN_CONTEXT_LANGUAGE, fileId);
+        console.log('eo data', fakeTranslation);
+        const s3TranslationsPath = path.parse(s3EnPath).dir;
+        console.log('s3TranslationsPath', s3TranslationsPath);
+        const s3FakeTranslationPath = path.join(s3TranslationsPath, FAKE_IN_CONTEXT_LANGUAGE_FILE);
+        console.log('s3FakeTranslationPath', s3FakeTranslationPath);
 
         // await uploadTranslationToS3(s3Client, bucket, s3FakeTranslationPath, JSON.stringify(fakeTranslation));
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enplug/scripts",
-  "version": "1.11.4-dev57",
+  "version": "1.11.4-dev59",
   "description": "Enplug scripts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",