Merge pull request #263 from mattolson/patch

STRF-9434: Bug fix to load test
bigcommerce · Jan 31, 2022 · 02c18de · 02c18de
2 parents bad4620 + b802c7c
commit 02c18de
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/lib/translator/index.js b/lib/translator/index.js
@@ -94,8 +94,7 @@ Translator.create = function (acceptLanguage, allTranslations, logger = console)
  * @returns {string}
  */
 Translator.prototype.translate = function (key, parameters) {
-    const language = this.getLanguage();
-    if (!language.translations || !language.translations[key]) {
+    if (!this._language.translations || !this._language.translations[key]) {
         return key;
     }
 
@@ -157,12 +156,11 @@ Translator.prototype._getFormatter = function (locale) {
  * @return {Function}
  */
 Translator.prototype._compileTemplate = function (key) {
-    const language = this.getLanguage();
-    const locale = language.locales[key];
+    const locale = this._language.locales[key];
     const formatter = this._getFormatter(locale);
 
     try {
-        return formatter.compile(language.translations[key]);
+        return formatter.compile(this._language.translations[key]);
     } catch (err) {
         if (err.name === 'SyntaxError') {
             this._logger.error(`Language File Syntax Error: ${err.message} for key "${key}"`, err.expected);

diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
   "scripts": {
     "lint": "eslint .",
     "lint-and-fix": "eslint . --fix",
-    "test": "lab -v -t 94 --ignore i18n,WebAssembly,SharedArrayBuffer,Atomics,BigUint64Array,BigInt64Array,BigInt,URL,URLSearchParams,TextEncoder,TextDecoder,queueMicrotask,FinalizationRegistry,WeakRef,plural,en,number,select spec",
+    "test": "lab -v -t 95 --ignore i18n,WebAssembly,SharedArrayBuffer,Atomics,BigUint64Array,BigInt64Array,BigInt,URL,URLSearchParams,TextEncoder,TextDecoder,queueMicrotask,FinalizationRegistry,WeakRef,plural,en,number,select spec",
     "coverage": "lab -c -r console -o stdout -r html -o coverage.html spec"
   },
   "repository": {

diff --git a/spec/lib/translator.js b/spec/lib/translator.js
@@ -348,15 +348,18 @@ describe('Translator', () => {
     // Lab will output the amount of time spent in this test. We can use it to
     // compare relative speed of different implementations.
     it('load test', { timeout: 5000, skip: true }, done => {
-        fs.readFile('./spec/fixtures/lang.json', 'utf8' , (err, translations) => {
+        fs.readFile('./spec/fixtures/lang.json', 'utf8' , (err, data) => {
             if (err) {
                 console.error(err);
                 throw err;
             }
 
+            translations = JSON.parse(data);
+
             for (let i = 0; i < 1000; i++) {
-                Translator.create('fr-CA', translations);
+                Translator.create('fr-CA, fr, en', translations);
             }
+
             done();
         });
     });