Merge pull request #863 from aray12/master

Return namespace in cimode with appendNamespaceToCIMode option

src/Translator.js

@@ -56,17 +56,25 @@ class Translator extends EventEmitter {
     if (typeof keys === 'number') keys = String(keys);
     if (typeof keys === 'string') keys = [keys];
 
-    // return key on CIMode
-    let lng = options.lng || this.language;
-    if (lng && lng.toLowerCase() === 'cimode') return keys[keys.length - 1];
-
     // separators
     let keySeparator = options.keySeparator || this.options.keySeparator || '.';
 
     // get namespace(s)
     let { key, namespaces } = this.extractFromKey(keys[keys.length - 1], options);
     let namespace = namespaces[namespaces.length - 1];
 
+    // return key on CIMode
+    let lng = options.lng || this.language;
+    let appendNamespaceToCIMode = options.appendNamespaceToCIMode || this.options.appendNamespaceToCIMode;
+    if (lng && lng.toLowerCase() === 'cimode') {
+      if (appendNamespaceToCIMode) {
+        let nsSeparator = options.nsSeparator || this.options.nsSeparator
+        return namespace + nsSeparator + key;
+      }
+
+      return key;
+    }
+
     // resolve from store
     let res = this.resolve(keys, options);
 
@@ -96,7 +104,7 @@ class Translator extends EventEmitter {
     // string, empty or null
     else {
       let usedDefault = false,
-          usedKey = false;
+        usedKey = false;
 
       // fallback value
       if (!this.isValidLookup(res) && options.defaultValue !== undefined) {
@@ -167,9 +175,9 @@ class Translator extends EventEmitter {
     let postProcessorNames = typeof postProcess === 'string' ? [postProcess] : postProcess;
 
     if (res !== undefined &&
-        postProcessorNames &&
-        postProcessorNames.length &&
-        options.applyPostProcessor !== false) {
+      postProcessorNames &&
+      postProcessorNames.length &&
+      options.applyPostProcessor !== false) {
       res = postProcessor.handle(postProcessorNames, res, key, options, this);
     }
 
@@ -229,8 +237,8 @@ class Translator extends EventEmitter {
 
   isValidLookup(res) {
     return res !== undefined &&
-           !(!this.options.returnNull && res === null) &&
-           !(!this.options.returnEmptyString && res === '');
+      !(!this.options.returnNull && res === null) &&
+      !(!this.options.returnEmptyString && res === '');
   }
 
   getResource(code, ns, key, options = {}) {

src/defaults.js

@@ -30,6 +30,7 @@ export function get() {
     returnedObjectHandler: function() {}, // function(key, value, options) triggered if key returns object but returnObjects is set to false
     parseMissingKeyHandler: false, // function(key) parsed a key that was not found in t() before returning
     appendNamespaceToMissingKey: false,
+    appendNamespaceToCIMode: false,
     overloadTranslationOptionHandler: function(args) {
       return { defaultValue: args[1] };
     },

test/translator/translator.cimode.spec.js

@@ -0,0 +1,55 @@
+import Translator from '../../src/Translator';
+import ResourceStore from '../../src/ResourceStore.js';
+import LanguageUtils from '../../src/LanguageUtils';
+import PluralResolver from '../../src/PluralResolver';
+import Interpolator from '../../src/Interpolator';
+
+describe('Translator', () => {
+
+  describe('translate() in cimode', () => {
+    var t;
+
+    before(() => {
+      const rs = new ResourceStore({
+        en: {
+          translation: {
+            test: 'test_en'
+          }
+        },
+        de: {
+          translation: {
+            test: 'test_de'
+          }
+        }
+      });
+      const lu = new LanguageUtils({ fallbackLng: 'en' });
+      t = new Translator({
+        resourceStore: rs,
+        languageUtils: lu,
+        pluralResolver: new PluralResolver(lu, {prepend: '_'}),
+        interpolator: new Interpolator()
+      }, {
+        interpolation: {
+          interpolateResult: true,
+          interpolateDefaultValue: true,
+          interpolateKey: true
+        }
+      });
+      t.changeLanguage('cimode');
+    });
+
+    var tests = [
+      {args: ['translation:test', { appendNamespaceToCIMode: false, ns: 'translation', nsSeparator: ':' }], expected: 'test'},
+      {args: ['test', { appendNamespaceToCIMode: false, ns: 'translation', nsSeparator: ':' }], expected: 'test'},
+      {args: ['translation:test', { appendNamespaceToCIMode: true, ns: 'translation', nsSeparator: ':' }], expected: 'translation:test'},
+      {args: ['test', { appendNamespaceToCIMode: true, ns: 'translation', nsSeparator: ':' }], expected: 'translation:test'},
+    ];
+
+    tests.forEach((test) => {
+      it('correctly return key for ' + JSON.stringify(test.args) + ' args in cimode', () => {
+        expect(t.translate.apply(t, test.args)).to.eql(test.expected);
+      });
+    });
+  });
+
+});