Fixed a bug in the array iterator.

IEvangelist · Nov 6, 2020 · b9482ad · b9482ad
1 parent 412c910
commit b9482ad
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/__tests__/api.test.ts b/__tests__/api.test.ts
@@ -14,7 +14,7 @@ const expectedLocales = [
     'sl', 'sm', 'sr-Cyrl', 'sr-Latn', 'sv', 'sw', 'ta',
     'te', 'th', 'tlh-Latn', 'tlh-Piqd', 'to', 'tr', 'ty',
     'uk', 'ur', 'vi', 'yua', 'yue', 'zh-Hans', 'zh-Hant'
-]
+];
 
 test('API: get available translations correctly gets all locales', async () => {
     const translations = await getAvailableTranslations();

diff --git a/__tests__/resource-io.test.ts b/__tests__/resource-io.test.ts
@@ -1,5 +1,6 @@
 import { readFile, writeFile, buildXml, applyTranslations } from '../src/resource-io';
 import { resolve } from 'path';
+import { getLocaleName } from '../src/utils';
 
 test('IO: read file correctly parses known XML', async () => {
     const resourcePath = resolve(__dirname, './data/Test.en.resx');
@@ -79,4 +80,11 @@ test('IO: apply translations to Index.en.resx', async () => {
     expect(resourceXml.root.data[1].value[0]).toEqual('Goodbye my friend');
     expect(resourceXml.root.data[2].$.name).toEqual('SurveyTitle');
     expect(resourceXml.root.data[2].value[0]).toEqual('I do not like surveys!');
-});
+});
+
+test('IO: correctly gets local name.', () => {
+    const resourcePath = resolve(__dirname, './data/Index.en.resx');
+    const localName = getLocaleName(resourcePath, 'fr');
+
+    expect(localName).toEqual(resourcePath.replace('.en.resx', '.fr.resx'));
+})
diff --git a/dist/resource-translator/index.js b/dist/resource-translator/index.js
@@ -11632,7 +11632,8 @@ async function initiate() {
                     const resultSet = await api_1.translate(inputOptions, toLocales, translatableTextMap.text);
                     core_1.info(`Translation result:\n ${JSON.stringify(resultSet)}`);
                     if (resultSet) {
-                        for (let locale in toLocales) {
+                        for (let index = 0; index < toLocales.length; index++) {
+                            const locale = toLocales[index];
                             const translations = resultSet[locale];
                             const clone = { ...resourceXml };
                             const result = resource_io_1.applyTranslations(clone, translations, translatableTextMap.ordinals);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ievangelist/resource-translator",
-  "version": "1.0.2-preview6",
+  "version": "1.0.2-preview7",
   "preview": true,
   "keywords": [
     "github",

diff --git a/src/resource-translator.ts b/src/resource-translator.ts
@@ -86,7 +86,8 @@ export async function initiate() {
                     info(`Translation result:\n ${JSON.stringify(resultSet)}`);
 
                     if (resultSet) {
-                        for (let locale in toLocales) {
+                        for (let index = 0; index < toLocales.length; index ++) {
+                            const locale = toLocales[index];
                             const translations = resultSet[locale];
                             const clone = { ...resourceXml };
                             const result = applyTranslations(clone, translations, translatableTextMap.ordinals);