scratch-blocks 2.0.1 → 2.0.3

package/i18n/json_to_js.js

@@ -1,52 +1,52 @@
-const async = require('async');
-const fs = require('fs');
-const path = require('path');
-const glob = require('glob');
+const async = require('async')
+const fs = require('fs')
+const path = require('path')
+const glob = require('glob')
 
 // Globals
-const PATH_INPUT = path.resolve(__dirname, '../msg/json/en.json');
+const PATH_INPUT = path.resolve(__dirname, '../msg/json/en.json')
 // If you want to generate js files for other languages, comment out the line above,
 // and use the one below instead.
 // const PATH_INPUT = path.resolve(__dirname, '../msg/json/*.json');
-const PATH_OUTPUT = path.resolve(__dirname, '../msg/js');
-const CONCURRENCY_LIMIT = 4;
+const PATH_OUTPUT = path.resolve(__dirname, '../msg/js')
+const CONCURRENCY_LIMIT = 4
 
 // Processing task
 const work = function (uri, callback) {
-    fs.readFile(uri, function (err, body) {
-      const name = path.parse(uri).name;
-      if (err) return callback(err);
-
-        // Convert file body into an object (let this throw if invalid JSON)
-        body = JSON.parse(body);
-
-        // File storage object and preamble
-        let file = '';
-        file += '// This file was automatically generated.  Do not modify.\n';
-        file += '\n';
-        file += '\'use strict\';\n';
-        file += '\n';
-        file += `goog.provide(\'Blockly.Msg.${name}\');\n`;
-        file += 'goog.require(\'Blockly.Msg\');\n';
-        file += '\n';
-
-        // Iterate over object and build up file
-        for (let i in body) {
-            file += `Blockly.Msg["${i}"] = "${body[i].replace(/"/g, '\\"')}";\n`
-        }
-
-        // Write file to disk
-        fs.writeFile(`${PATH_OUTPUT}/${name}.js`, file, callback);
-    });
-};
+  fs.readFile(uri, function (err, body) {
+    const name = path.parse(uri).name
+    if (err) return callback(err)
+
+    // Convert file body into an object (let this throw if invalid JSON)
+    body = JSON.parse(body)
+
+    // File storage object and preamble
+    let file = ''
+    file += '// This file was automatically generated.  Do not modify.\n'
+    file += '\n'
+    file += "'use strict';\n"
+    file += '\n'
+    file += `goog.provide(\'Blockly.Msg.${name}\');\n`
+    file += "goog.require('Blockly.Msg');\n"
+    file += '\n'
+
+    // Iterate over object and build up file
+    for (let i in body) {
+      file += `Blockly.Msg["${i}"] = "${body[i].replace(/"/g, '\\"')}";\n`
+    }
+
+    // Write file to disk
+    fs.writeFile(`${PATH_OUTPUT}/${name}.js`, file, callback)
+  })
+}
 
 // Create async processing queue
-const q = async.queue(work, CONCURRENCY_LIMIT);
+const q = async.queue(work, CONCURRENCY_LIMIT)
 
 // Handle errors
 q.error = function (err) {
-    throw new Error(err);
-};
+  throw new Error(err)
+}
 
 // Get all JSON files in input directory and add to queue
-q.push(glob.sync(PATH_INPUT));
+q.push(glob.sync(PATH_INPUT))

package/i18n/sync_tx_translations.js

@@ -8,64 +8,61 @@
  * token that has developer access.
  */
 
- const usage = `
+const usage = `
  Pull supported language translations from Transifex. Usage:
    node sync_tx_translations.js
    NOTE: TX_TOKEN environment variable needs to be set with a Transifex API token. See
    the Localization page on the GUI wiki for information about setting up Transifex.
- `;
+ `
 // Fail immediately if the TX_TOKEN is not defined
 if (!process.env.TX_TOKEN || process.argv.length !== 2) {
-  process.stdout.write(usage);
-  process.exit(1);
-};
+  process.stdout.write(usage)
+  process.exit(1)
+}
 
-const fs = require('fs');
-const path = require('path');
-const assert = require('assert');
-const locales = require('scratch-l10n').default;
-const {txPull} = require('scratch-l10n/lib/transifex.js');
+const fs = require('fs')
+const path = require('path')
+const assert = require('assert')
+const locales = require('scratch-l10n').default
+const { txPull } = require('scratch-l10n/lib/transifex.js')
 
 // Globals
-const PATH_OUTPUT = path.resolve(__dirname, '../msg');
+const PATH_OUTPUT = path.resolve(__dirname, '../msg')
 const PROJECT = 'scratch-editor'
-const RESOURCE = 'blocks';
-const MODE = 'reviewed';
+const RESOURCE = 'blocks'
+const MODE = 'reviewed'
 
-
-
-let en = fs.readFileSync(path.resolve(__dirname, '../msg/json/en.json'));
-en = JSON.parse(en);
-const enKeys = Object.keys(en).sort().toString();
+let en = fs.readFileSync(path.resolve(__dirname, '../msg/json/en.json'))
+en = JSON.parse(en)
+const enKeys = Object.keys(en).sort().toString()
 
 // Check that translation is valid:
 // entry: array [key, translation]  corresponding to a single string from <locale>.json
 // - messages with placeholders have the same number of placeholders
 // - messages must not have newlines embedded
 const validateEntry = function (entry) {
-    const re = /(%\d)/g;
-    const [key, translation] = entry;
-    const enMatch = en[key].match(re);
-    const tMatch = translation.match(re);
-    const enCount = enMatch ? enMatch.length : 0;
-    const tCount = tMatch ? tMatch.length : 0;
-    assert.strictEqual(tCount, enCount, `${key}:${en[key]} - "${translation}" placeholder mismatch`);
-    if (enCount > 0) {
-
-      assert.notStrictEqual(tMatch, null, `${key} is missing a placeholder: ${translation}`);
-      assert.strictEqual(
-          tMatch.sort().toString(),
-          enMatch.sort().toString(),
-          `${key} is missing or has duplicate placeholders: ${translation}`
-      );
-    }
-    assert.strictEqual(translation.match(/[\n]/), null, `${key} contains a newline character ${translation}`);
-};
+  const re = /(%\d)/g
+  const [key, translation] = entry
+  const enMatch = en[key].match(re)
+  const tMatch = translation.match(re)
+  const enCount = enMatch ? enMatch.length : 0
+  const tCount = tMatch ? tMatch.length : 0
+  assert.strictEqual(tCount, enCount, `${key}:${en[key]} - "${translation}" placeholder mismatch`)
+  if (enCount > 0) {
+    assert.notStrictEqual(tMatch, null, `${key} is missing a placeholder: ${translation}`)
+    assert.strictEqual(
+      tMatch.sort().toString(),
+      enMatch.sort().toString(),
+      `${key} is missing or has duplicate placeholders: ${translation}`,
+    )
+  }
+  assert.strictEqual(translation.match(/[\n]/), null, `${key} contains a newline character ${translation}`)
+}
 
 const validate = function (json, name) {
-    assert.strictEqual(Object.keys(json).sort().toString(), enKeys, `${name}: Locale json keys do not match en.json`);
-    Object.entries(json).forEach(validateEntry);
-};
+  assert.strictEqual(Object.keys(json).sort().toString(), enKeys, `${name}: Locale json keys do not match en.json`)
+  Object.entries(json).forEach(validateEntry)
+}
 
 let file = `// This file was automatically generated.  Do not modify.
 
@@ -75,37 +72,39 @@ goog.provide('Blockly.ScratchMsgs.allLocales');
 
 goog.require('Blockly.ScratchMsgs');
 
-`;
+`
 
 let localeMap = {
   'aa-dj': 'aa_DJ',
   'es-419': 'es_419',
   'pt-br': 'pt_BR',
   'zh-cn': 'zh_CN',
-  'zh-tw': 'zh_TW'
-};
+  'zh-tw': 'zh_TW',
+}
 
 const getLocaleData = async function (locale) {
-    let txLocale = localeMap[locale] || locale;
-    const data = await txPull(PROJECT, RESOURCE, txLocale, MODE);
-    return {
-        locale: locale,
-        translations: data
-    };
-};
-
-Promise.all(Object.keys(locales).map(getLocaleData)).then(function (values) {
-  values.forEach(function (translation) {
-    validate(translation.translations, translation.locale);
-    file += '\n';
-    file += `Blockly.ScratchMsgs.locales["${translation.locale}"] =\n`;
-    file += JSON.stringify(translation.translations, null, 4);
-    file += ';\n';
-  });
-  file += '// End of combined translations\n';
-  // write combined file
-  fs.writeFileSync(`${PATH_OUTPUT}/scratch_msgs.js`, file);
-}).catch((err) => {
-  console.error(err);
-  process.exit(1);
-});
+  let txLocale = localeMap[locale] || locale
+  const data = await txPull(PROJECT, RESOURCE, txLocale, MODE)
+  return {
+    locale: locale,
+    translations: data,
+  }
+}
+
+Promise.all(Object.keys(locales).map(getLocaleData))
+  .then(function (values) {
+    values.forEach(function (translation) {
+      validate(translation.translations, translation.locale)
+      file += '\n'
+      file += `Blockly.ScratchMsgs.locales["${translation.locale}"] =\n`
+      file += JSON.stringify(translation.translations, null, 4)
+      file += ';\n'
+    })
+    file += '// End of combined translations\n'
+    // write combined file
+    fs.writeFileSync(`${PATH_OUTPUT}/scratch_msgs.js`, file)
+  })
+  .catch(err => {
+    console.error(err)
+    process.exit(1)
+  })

package/i18n/test_scratch_msgs.js

@@ -1,87 +1,90 @@
-const es = require('event-stream');
-const fs = require('fs');
-const path = require('path');
-const assert = require('assert');
+const es = require('event-stream')
+const fs = require('fs')
+const path = require('path')
+const assert = require('assert')
 
 // current locale and keys for the locale
-let locale = '';
-let keys = [];
+let locale = ''
+let keys = []
 
 // current English keys
-let en = fs.readFileSync(path.resolve(__dirname, '../msg/json/en.json'));
-en = JSON.parse(en);
-const enKeys = Object.keys(en);
+let en = fs.readFileSync(path.resolve(__dirname, '../msg/json/en.json'))
+en = JSON.parse(en)
+const enKeys = Object.keys(en)
 
 // File paths
-const PATH_INPUT = path.resolve(__dirname, '../msg/scratch_msgs.js');
+const PATH_INPUT = path.resolve(__dirname, '../msg/scratch_msgs.js')
 
 // Match lines of the scratch_msgs file
 // Blockly.ScratchMsgs.locales indicates the start of a new locale
 // ": " marks a "key": "value" pair
 // Also match the end of the generated file so the last set of keys can be checked
 const match = function (str) {
-    if (str.indexOf('Blockly.ScratchMsgs.locales') !== 0) return true;
-    if (str.indexOf('": "') !== 0) return true;
-    if (str.indexOf('End of combined translations') !== 0) return true;
-    return false;
+  if (str.indexOf('Blockly.ScratchMsgs.locales') !== 0) return true
+  if (str.indexOf('": "') !== 0) return true
+  if (str.indexOf('End of combined translations') !== 0) return true
+  return false
 }
 
 // Extract key and value from message definition, or locale when it changes
 const extract = function (str) {
-    let m = str.match(/locales\["(.+)"\]/);
-    if (m) {
-      // locale changed
-      return m[1];
+  let m = str.match(/locales\["(.+)"\]/)
+  if (m) {
+    // locale changed
+    return m[1]
+  }
+  m = str.match(/"(.*)": "(.*)",?$/)
+  if (m) {
+    return {
+      key: m[1],
+      value: m[2],
     }
-    m = str.match(/"(.*)": "(.*)",?$/);
-    if (m) {
-      return {
-        key: m[1],
-        value: m[2]
-      }
-    }
-    // return a string for the end of the file so that validate will check the last set of keys
-    m = str.match(/^\/\/ End of combined translations$/);
-    if (m) return 'last';
-    return null;
-};
+  }
+  // return a string for the end of the file so that validate will check the last set of keys
+  m = str.match(/^\/\/ End of combined translations$/)
+  if (m) return 'last'
+  return null
+}
 
 const validateKeys = function () {
-    // ignore empty keys first time through
-    if (keys.length === 0) return;
-    assert.strictEqual(keys.length, Object.keys(en).length, `scratch_msgs-${locale}: number of keys doesn't match`);
-    keys.map(item => assert(enKeys.includes(item), `scratch_msgs-${locale}: has key ${item} not in en`));
-    enKeys.map(item => assert(keys.includes(item), `scratch_msgs-${locale}: is missing key ${item}`));
+  // ignore empty keys first time through
+  if (keys.length === 0) return
+  assert.strictEqual(keys.length, Object.keys(en).length, `scratch_msgs-${locale}: number of keys doesn't match`)
+  keys.map(item => assert(enKeys.includes(item), `scratch_msgs-${locale}: has key ${item} not in en`))
+  enKeys.map(item => assert(keys.includes(item), `scratch_msgs-${locale}: is missing key ${item}`))
 }
 
 // Stream input and push each match to the storage object
-const stream = fs.createReadStream(PATH_INPUT);
+const stream = fs.createReadStream(PATH_INPUT)
 stream
-    .pipe(es.split('\n'))
-    .pipe(es.mapSync(function (str) {
-        if (!match(str)) return;
-        const result = extract(str);
-        if (!result) return;
-        if (typeof result === 'string') {
-          // locale changed or end of file, validate the current collection of keys
-          try {
-              validateKeys();
-          }
-          catch (err) {
-            console.error('Key validation FAILED: %O', err);
-            process.exit(1);
-          }
-          // change locale, and reset keys array
-          locale = result;
-          keys = [];
-        } else {
-          keys.push(result.key);
+  .pipe(es.split('\n'))
+  .pipe(
+    es.mapSync(function (str) {
+      if (!match(str)) return
+      const result = extract(str)
+      if (!result) return
+      if (typeof result === 'string') {
+        // locale changed or end of file, validate the current collection of keys
+        try {
+          validateKeys()
+        } catch (err) {
+          console.error('Key validation FAILED: %O', err)
+          process.exit(1)
         }
-    }))
-    .pipe(es.wait(function (err) {
-        if (err) {
-          console.err(err);
-          process.exit(1);
-        }
-        process.exit(0)
-    }));
+        // change locale, and reset keys array
+        locale = result
+        keys = []
+      } else {
+        keys.push(result.key)
+      }
+    }),
+  )
+  .pipe(
+    es.wait(function (err) {
+      if (err) {
+        console.error(err)
+        process.exit(1)
+      }
+      process.exit(0)
+    }),
+  )