Merge pull request #8 from lexxor/ignore-key-prefix-if-namespace

Ignore keyPrefix property if namespace prefix used
panter · Oct 17, 2017 · aee90dc · aee90dc
2 parents d7f7dae + 783aed9
commit aee90dc
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/src/install.js b/src/install.js
@@ -9,8 +9,8 @@ export function install(_Vue) {
 
   Vue = _Vue;
 
-  const getByKey = i18nOptions => (key) => {
-    if (i18nOptions && i18nOptions.keyPrefix) {
+  const getByKey = (i18nOptions, i18nextOptions) => (key) => {
+    if (i18nOptions && i18nOptions.keyPrefix && !key.includes(i18nextOptions.nsSeparator)) {
       return `${i18nOptions.keyPrefix}.${key}`;
     }
     return key;
@@ -19,7 +19,7 @@ export function install(_Vue) {
   Vue.mixin({
     computed: {
       $t() {
-        const getKey = getByKey(this._i18nOptions);
+        const getKey = getByKey(this._i18nOptions, this.$i18n.i18next.options);
 
         if (this._i18nOptions && this._i18nOptions.namespaces) {
           const { lng, namespaces } = this._i18nOptions;

diff --git a/test/unit/render.test.js b/test/unit/render.test.js
@@ -116,7 +116,10 @@ describe('$t loaded languages', () => {
       i18next.init({
         lng: 'en',
         resources: {
-          en: { translation: { messages: { hello: 'Hello' } } },
+          en: {
+            translation: { messages: { hello: 'Hello' }, },
+            common: { goodbye: 'Goodbye' }
+          },
         },
       });
     });
@@ -135,5 +138,20 @@ describe('$t loaded languages', () => {
       await nextTick();
       expect(text.textContent).to.equal('Hello');
     });
+
+    it('should ignore keyPrefix property if namespace prefix used', async () => {
+      const el = document.createElement('div');
+      const vm = new Vue({
+        i18n: vueI18Next,
+        i18nOptions: { keyPrefix: 'messages' },
+        render(h) {
+          return h('p', { ref: 'text' }, [this.$t('common:goodbye')]);
+        },
+      }).$mount(el);
+
+      const { text } = vm.$refs;
+      await nextTick();
+      expect(text.textContent).to.equal('Goodbye');
+    });
   });
 });