fix: modifiers with pascalCase wouldn't translate (#1512)

Co-authored-by: Mikhail Ermakov <m.ermakov@youps.io>
kazupon · Jun 20, 2022 · eebc076 · eebc076
1 parent 22f73b3
commit eebc076
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/index.js b/src/index.js
@@ -26,8 +26,8 @@ import I18nPath from './path'
 import type { PathValue } from './path'
 
 const htmlTagMatcher = /<\/?[\w\s="/.':;#-\/]+>/
-const linkKeyMatcher = /(?:@(?:\.[a-z]+)?:(?:[\w\-_|./]+|\([\w\-_:|./]+\)))/g
-const linkKeyPrefixMatcher = /^@(?:\.([a-z]+))?:/
+const linkKeyMatcher = /(?:@(?:\.[a-zA-Z]+)?:(?:[\w\-_|./]+|\([\w\-_:|./]+\)))/g
+const linkKeyPrefixMatcher = /^@(?:\.([a-zA-Z]+))?:/
 const bracketsMatcher = /[()]/g
 const defaultModifiers = {
   'upper': str => str.toLocaleUpperCase(),

diff --git a/test/unit/issues.test.js b/test/unit/issues.test.js
@@ -820,4 +820,24 @@ describe('issues', () => {
       assert.strictEqual(vm.$i18n.t('message.linkPipe'), messages.en['pipe|hello'])
     })
   })
+
+  describe('#1308', () => {
+    it('should be translated', () => {
+      const i18n = new VueI18n({
+          locale: 'en',
+          messages: {
+            en: {
+              'address': 'home Address',
+              'snakeAddress': '@.snakeCase:(address)'
+            }
+          },
+          name: 'test',
+          modifiers: {
+            snakeCase: str => str.split(' ').join('-')
+          },
+      })
+
+      assert.strictEqual(i18n.t('snakeAddress'), 'home-Address')
+    })
+  })
 })