locize-cli 9.0.0 → 9.0.2

package/CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 Project versioning adheres to [Semantic Versioning](http://semver.org/).
 Change log format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## [9.0.2](https://github.com/locize/locize-cli/compare/v9.0.1...v9.0.2) - 2025-04-25
+
+- Hint: `Using the "--auto-translate true" option together with the "--reference-language-only false" option might result in inconsistent target language translations (automatic translation vs. what is sent direcly to locize).`
+
+## [9.0.1](https://github.com/locize/locize-cli/compare/v9.0.0...v9.0.1) - 2025-04-04
+
+- optimize xcstrings format [106](https://github.com/locize/locize-cli/issues/106)
+
 ## [9.0.0](https://github.com/locize/locize-cli/compare/v8.7.1...v9.0.0) - 2025-04-03
 
 - the format `yaml-rails-ns`/`yml-rails-ns` is the old `yaml-rails`/`yml-rails`

package/download.js

@@ -79,8 +79,7 @@ function handleDownload(opt, url, err, res, downloads, cb) {
           if (err) return clb(err);
 
           try {
-            const result = locize2xcstrings(locizeData);
-            const converted = JSON.stringify(result, null, 2);
+            const converted = locize2xcstrings(locizeData);
 
             var filledMask = opt.pathMask.replace(`${opt.pathMaskInterpolationPrefix}language${opt.pathMaskInterpolationSuffix}`, '').replace(`${opt.pathMaskInterpolationPrefix}namespace${opt.pathMaskInterpolationSuffix}`, ns) + reversedFileExtensionsMap[opt.format];
             var mkdirPath;
@@ -94,7 +93,7 @@ function handleDownload(opt, url, err, res, downloads, cb) {
               if (clb) clb(null);
             }
 
-            const fileContent = opt.format !== 'xlsx' ? (converted + '\n') : converted;
+            const fileContent = (opt.format !== 'xlsx' && !converted.endsWith('\n')) ? (converted + '\n') : converted;
             if (!opt.version) {
               if (mkdirPath) mkdirp.sync(path.join(opt.path, version, mkdirPath));
               fs.writeFile(path.join(opt.path, version, filledMask), fileContent, logAndClb);
@@ -146,7 +145,7 @@ function handleDownload(opt, url, err, res, downloads, cb) {
           if (filledMask.lastIndexOf(path.sep) > 0) {
             mkdirPath = filledMask.substring(0, filledMask.lastIndexOf(path.sep));
           }
-          const fileContent = opt.format !== 'xlsx' ? (converted + '\n') : converted;
+          const fileContent = (opt.format !== 'xlsx' && !converted.endsWith('\n')) ? (converted + '\n') : converted;
           if (!opt.version) {
             if (mkdirPath) mkdirp.sync(path.join(opt.path, version, mkdirPath));
             fs.writeFile(path.join(opt.path, version, filledMask), fileContent, clb);
@@ -233,7 +232,7 @@ function handlePull(opt, toDownload, cb) {
           }
 
           if (mkdirPath) mkdirp.sync(path.join(opt.path, mkdirPath));
-          const fileContent = opt.format !== 'xlsx' ? (converted + '\n') : converted;
+          const fileContent = (opt.format !== 'xlsx' && !converted.endsWith('\n')) ? (converted + '\n') : converted;
           fs.writeFile(path.join(opt.path, filledMask), fileContent, logAndClb);
         } catch (e) {
           err.message = 'Invalid content for "' + opt.format + '" format!\n' + (err.message || '');
@@ -277,7 +276,7 @@ function handlePull(opt, toDownload, cb) {
           if (filledMask.lastIndexOf(path.sep) > 0) {
             mkdirPath = filledMask.substring(0, filledMask.lastIndexOf(path.sep));
           }
-          const fileContent = opt.format !== 'xlsx' ? (converted + '\n') : converted;
+          const fileContent = (opt.format !== 'xlsx' && !converted.endsWith('\n')) ? (converted + '\n') : converted;
           if (!opt.language) {
             if (mkdirPath) mkdirp.sync(path.join(opt.path, mkdirPath));
             fs.writeFile(path.join(opt.path, filledMask), fileContent, clb);

package/format.js

@@ -113,7 +113,7 @@ function writeLocalFile(opt, file, clb) {
     return clb(null, true);
   }
 
-  const fileContent = opt.format !== 'xlsx' ? (file.converted + '\n') : file.converted;
+  const fileContent = (opt.format !== 'xlsx' && !file.converted.endsWith('\n')) ? (file.converted + '\n') : file.converted;
 
   fs.writeFile(file.path, fileContent, (err) => clb(err, true));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "locize-cli",
-  "version": "9.0.0",
+  "version": "9.0.2",
   "description": "locize cli to import locales",
   "main": "index.js",
   "bin": {
@@ -15,7 +15,7 @@
     "commander": "9.5.0",
     "csvjson": "5.1.0",
     "diff": "7.0.0",
-    "dotenv": "16.4.7",
+    "dotenv": "16.5.0",
     "flat": "5.0.2",
     "fluent_conv": "3.3.0",
     "gettext-converter": "1.3.0",
@@ -23,7 +23,7 @@
     "ini": "4.1.3",
     "js-yaml": "4.1.0",
     "laravelphp": "2.0.4",
-    "locize-xcstrings": "1.0.0",
+    "locize-xcstrings": "2.0.0",
     "lodash.clonedeep": "4.5.0",
     "mkdirp": "3.0.1",
     "node-fetch": "2.7.0",
@@ -31,11 +31,11 @@
     "rimraf": "4.4.1",
     "strings-file": "0.0.5",
     "tmexchange": "2.0.5",
-    "xliff": "6.2.1",
+    "xliff": "6.2.2",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz"
   },
   "devDependencies": {
-    "@yao-pkg/pkg": "6.3.1",
+    "@yao-pkg/pkg": "6.4.0",
     "eslint": "8.56.0",
     "gh-release": "7.0.2"
   },

package/parseLocalLanguage.js

@@ -141,7 +141,7 @@ const parseLocalLanguage = (opt, lng, cb) => {
 
       if (opt.format === 'xcstrings') { // 1 file per namespace including all languages
         try {
-          const content = xcstrings2locize(JSON.parse(data));
+          const content = xcstrings2locize(data);
 
           fs.stat(fPath, (err, stat) => {
             if (err) return clb(err);

package/sync.js

@@ -258,8 +258,7 @@ const downloadAll = (opt, remoteLanguages, omitRef, manipulate, cb) => {
           if (err) return clb(err);
 
           try {
-            const result = locize2xcstrings(locizeData);
-            const converted = JSON.stringify(result, null, 2);
+            const converted = locize2xcstrings(locizeData);
 
             const filledMask = opt.pathMask.replace(`${opt.pathMaskInterpolationPrefix}language${opt.pathMaskInterpolationSuffix}`, '').replace(`${opt.pathMaskInterpolationPrefix}namespace${opt.pathMaskInterpolationSuffix}`, namespace) + reversedFileExtensionsMap[opt.format];
             if (opt.dry) return clb(null);
@@ -268,7 +267,7 @@ const downloadAll = (opt, remoteLanguages, omitRef, manipulate, cb) => {
             }
             const parentDir = path.dirname(path.join(opt.path, filledMask));
             mkdirp.sync(parentDir);
-            const fileContent = opt.format !== 'xlsx' ? (converted + '\n') : converted;
+            const fileContent = (opt.format !== 'xlsx' && !converted.endsWith('\n')) ? (converted + '\n') : converted;
             fs.writeFile(path.join(opt.path, filledMask), fileContent, clb);
           } catch (e) {
             err.message = 'Invalid content for "' + opt.format + '" format!\n' + (err.message || '');
@@ -308,7 +307,7 @@ const downloadAll = (opt, remoteLanguages, omitRef, manipulate, cb) => {
             }
             const parentDir = path.dirname(path.join(opt.path, filledMask));
             mkdirp.sync(parentDir);
-            const fileContent = opt.format !== 'xlsx' ? (converted + '\n') : converted;
+            const fileContent = (opt.format !== 'xlsx' && !converted.endsWith('\n')) ? (converted + '\n') : converted;
             fs.writeFile(path.join(opt.path, filledMask), fileContent, clb);
           });
         });
@@ -336,7 +335,7 @@ const update = (opt, lng, ns, shouldOmit, cb) => {
 
   function send(d, so, clb, isRetrying) {
     const queryParams = new URLSearchParams();
-    if (opt.autoTranslate) {
+    if (opt.autoTranslate && lng === opt.referenceLanguage) {
       /** @See https://www.locize.com/docs/api#optional-autotranslate */
       queryParams.append('autotranslate', 'true');
     }
@@ -490,7 +489,7 @@ const backupDeleted = (opt, ns, now) => {
   }, {});
   mkdirp.sync(path.join(currentBackupPath, ns.language));
   const content = JSON.stringify(removingRemote, null, 2);
-  const fileContent = opt.format !== 'xlsx' ? (content + '\n') : content;
+  const fileContent = (opt.format !== 'xlsx' && !content.endsWith('\n')) ? (content + '\n') : content;
   fs.writeFileSync(path.join(currentBackupPath, ns.language, `${ns.namespace}.json`), fileContent);
 };
 
@@ -666,6 +665,10 @@ const sync = (opt, cb) => {
     return handleError(new Error(`${opt.format} is not a valid format!`), cb);
   }
 
+  if (opt.autoTranslate && !opt.referenceLanguageOnly) {
+    console.log(colors.yellow('Using the "--auto-translate true" option together with the "--reference-language-only false" option might result in inconsistent target language translations (automatic translation vs. what is sent direcly to locize).'));
+  }
+
   opt.version = opt.version || 'latest';
   opt.apiPath = opt.apiPath || 'https://api.locize.app';