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

StephanHoyer · Apr 20, 2018 · 9ffffef · 9ffffef
1 parent 5a45279
commit 9ffffef
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -83,7 +83,7 @@ var messages = {
 
     hasDefaultSubkey: {
         foo: 'Foo subkey value',
-        '*': 'Default value',
+        __default__: '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 __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.__default__
           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 "*"'
+      __default__: 'WAT! {n}!?',
+      n: 'Is always overridden by __default__'
     },
 
     'Prosa Key': 'This is prosa!',
 
     comboCounter: '{name} is {n} years old.',
     translationWithSubkeys: { 'foo': 'FOO' },
-    translationWithDefaultSubkey: { '*': 'I am a default value' }
+    translationWithDefaultSubkey: { __default__: 'I am a default value' }
   }
 
   var t = translate(translationsObject)