feat: Make "*" the default subkey, instead of "__"

StephanHoyer · Sep 14, 2017 · 5a45279 · 5a45279
1 parent 7d8fc27
commit 5a45279
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -83,7 +83,7 @@ var messages = {
 
     hasDefaultSubkey: {
         foo: 'Foo subkey value',
-        __: 'Default value',
+        '*': 'Default value',
     },
 
     'Prosa Key': 'This is prosa!',  
@@ -116,7 +116,7 @@ t('saveButton', 'tooltip') => 'Save unsaved changes'
 t('simpleButton', 'label') => 'Simple'
 t('simpleButton', 'tooltip') => 'Simple'
 
-//default '__' subkey
+//default '*' subkey
 t('hasDefaultSubkey', 'foo') => 'Foo subkey value'
 t('hasDefaultSubkey', 'missing') => 'Default value'
 t('hasDefaultSubkey') => 'Default value'

diff --git a/index.js b/index.js
@@ -122,7 +122,7 @@
         replacements = replacements || {}
 
         if (translationIsObject) {
-          var propValue = (subKey != null && translation[subKey]) || translation.__
+          var propValue = (subKey != null && translation[subKey]) || translation['*']
           if (propValue != null) {
             translation = propValue
           } else if (typeof subKey === 'number') {

diff --git a/test.js b/test.js
@@ -39,15 +39,15 @@ describe('translate.js', function () {
       11: '{day}. November {year}',
       12: '{day}. December {year}',
 
-      __: 'WAT! {n}!?',
-      n: 'Is always overridden by __'
+      '*': 'WAT! {n}!?',
+      n: 'Is always overridden by "*"'
     },
 
     'Prosa Key': 'This is prosa!',
 
     comboCounter: '{name} is {n} years old.',
     translationWithSubkeys: { 'foo': 'FOO' },
-    translationWithDefaultSubkey: { __: 'I am a default value' }
+    translationWithDefaultSubkey: { '*': 'I am a default value' }
   }
 
   var t = translate(translationsObject)
@@ -181,10 +181,10 @@ describe('translate.js', function () {
   it('should ignore replacements object if translation is a plain string', function () {
     expect(t3b('plain', {nonexistentreplacement: 'foo'})).to.equal('I like this.')
   })
-  it('should return the "__" subkey value if no subkey is passed', function () {
+  it('should return the "*" subkey value if no subkey is passed', function () {
     expect(t3b('translationWithDefaultSubkey')).to.equal('I am a default value')
   })
-  it('should retry the "__" subkey value if passed subkey is missing', function () {
+  it('should retry the "*" subkey value if passed subkey is missing', function () {
     expect(t3b('translationWithDefaultSubkey', 'nonexistentsubkey') ).to.equal('I am a default value')
     expect(t3b('date', 13, {day: '13', year: 2013}) ).to.equal('WAT! 13!?')
   })