Separate estonian abbreviations with space. Based on information from…

… Estonian Language Institution
Addepar · Nov 21, 2013 · da348a8 · da348a8
1 parent 3d1910d
commit da348a8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/languages/et.js b/languages/et.js
@@ -2,6 +2,9 @@
  * numeral.js language configuration
  * language : Estonian
  * author : Illimar Tambek : https://github.com/ragulka
+ *
+ * Note: in Estonian, abbreviations are always separated
+ * from numbers with a space
  */
 (function () {
     var language = {
@@ -10,10 +13,10 @@
             decimal: ','
         },
         abbreviations: {
-            thousand: 'tuh',
-            million: 'mln',
-            billion: 'mld',
-            trillion: 'T'
+            thousand: ' tuh',
+            million: ' mln',
+            billion: ' mld',
+            trillion: ' trl'
         },
         ordinal: function (number) {
             return '.';

diff --git a/tests/languages/et.js b/tests/languages/et.js
@@ -26,9 +26,9 @@ exports['language:et'] = {
             [-0.23,'.00','-,23'],
             [-0.23,'(.00)','(,23)'],
             [0.23,'0.00000','0,23000'],
-            [1230974,'0.0a','1,2mln'],
-            [1460,'0a','1tuh'],
-            [-104000,'0a','-104tuh'],
+            [1230974,'0.0a','1,2 mln'],
+            [1460,'0a','1 tuh'],
+            [-104000,'0a','-104 tuh'],
             [1,'0o','1.'],
             [52,'0o','52.'],
             [23,'0o','23.'],
@@ -50,7 +50,7 @@ exports['language:et'] = {
             [1000.234,'$0,0.00','€1 000,23'],
             [-1000.234,'($0,0)','(€1 000)'],
             [-1000.234,'$0.00','-€1000,23'],
-            [1230974,'($0.00a)','€1,23mln']
+            [1230974,'($0.00a)','€1,23 mln']
         ];
 
         for (var i = 0; i < tests.length; i++) {
@@ -83,9 +83,9 @@ exports['language:et'] = {
         var tests = [
             ['10.000,123',10000.123],
             ['(0,12345)',-0.12345],
-            ['(€1,23mln)',-1230000],
-            ['10tuh',10000],
-            ['-10tuh',-10000],
+            ['(€1,23 mln)',-1230000],
+            ['10 tuh',10000],
+            ['-10 tuh',-10000],
             ['23.',23],
             ['€10.000,00',10000],
             ['-76%',-0.76],