Merge pull request #484 from adamwdraper/develop

2.0.5

Author: adamwdraper

README.md

@@ -56,6 +56,16 @@ See [the english unit tests](https://github.com/adamwdraper/Numeral-js/blob/mast
 
 # Changelog
 
+### 2.0.5
+
+Bug fix: Multi letter currency symbols and spacing
+
+Added: Formatting of numbers with leading zeros
+
+New format: Basic Point
+
+Option: Added `scalePercentBy100` (default: true) option to turn on/off scaling percentages
+
 ### 2.0.4
 
 Bug fix: Incorrect abbreviations for values rounded up [#187](https://github.com/adamwdraper/Numeral-js/issues/187)

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "numeral",
   "repo": "adamwdraper/Numeral-js",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "Format and manipulate numbers.",
   "keywords": [
     "numeral",

component.json

@@ -1,7 +1,7 @@
 {
   "name": "numeral",
   "repo": "adamwdraper/Numeral-js",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "Format and manipulate numbers.",
   "keywords": [
     "numeral",

locales.js

@@ -1,6 +1,6 @@
 /*! @preserve
  * numeral.js
- * locales : 2.0.4
+ * locales : 2.0.5
  * license : MIT
  * http://adamwdraper.github.com/Numeral-js/
  */
@@ -15,30 +15,6 @@
     }
 }(this, function (numeral) {
 
-(function() {
-        numeral.register('locale', 'be-nl', {
-        delimiters: {
-            thousands: ' ',
-            decimal  : ','
-        },
-        abbreviations: {
-            thousand : 'k',
-            million  : ' mln',
-            billion  : ' mld',
-            trillion : ' bln'
-        },
-        ordinal : function (number) {
-            var remainder = number % 100;
-
-            return (number !== 0 && remainder <= 1 || remainder === 8 || remainder >= 20) ? 'ste' : 'de';
-        },
-        currency: {
-            symbol: '€ '
-        }
-    });
-})();
-
-
 (function() {
         numeral.register('locale', 'bg', {
         delimiters: {
@@ -510,6 +486,30 @@
 })();
 
 
+(function() {
+        numeral.register('locale', 'nl-be', {
+        delimiters: {
+            thousands: ' ',
+            decimal  : ','
+        },
+        abbreviations: {
+            thousand : 'k',
+            million  : ' mln',
+            billion  : ' mld',
+            trillion : ' bln'
+        },
+        ordinal : function (number) {
+            var remainder = number % 100;
+
+            return (number !== 0 && remainder <= 1 || remainder === 8 || remainder >= 20) ? 'ste' : 'de';
+        },
+        currency: {
+            symbol: '€ '
+        }
+    });
+})();
+
+
 (function() {
         numeral.register('locale', 'nl-nl', {
         delimiters: {
@@ -820,4 +820,27 @@
 })();
 
 
+(function() {
+    
+    numeral.register('locale', 'vi', {
+        delimiters: {
+            thousands: '.',
+            decimal: ','
+        },
+        abbreviations: {
+            thousand: ' nghìn',
+            million: ' triệu',
+            billion: ' tỷ',
+            trillion: ' nghìn tỷ'
+        },
+        ordinal: function () {
+            return '.';
+        },
+        currency: {
+            symbol: '₫'
+        }
+    });
+})();
+
+
 }));

locales/be-nl.js renamed to locales/nl-be.js

@@ -1,6 +1,7 @@
 // numeral.js locale configuration
-// locale : belgium-dutch (be-nl)
+// locale : dutch-belgium (nl-be)
 // author : Dieter Luypaert : https://github.com/moeriki
+// corrected : Olivier Godefroy : https://github.com/godefroyo
 
 (function (global, factory) {
     if (typeof define === 'function' && define.amd) {
@@ -11,7 +12,7 @@
         factory(global.numeral);
     }
 }(this, function (numeral) {
-    numeral.register('locale', 'be-nl', {
+    numeral.register('locale', 'nl-be', {
         delimiters: {
             thousands: ' ',
             decimal  : ','

locales/vi.js

@@ -0,0 +1,33 @@
+// numeral.js locale configuration
+// locale : vietnam (vi)
+// author : Harry Nguyen : https://github.com/thaihoa311
+
+(function (global, factory) {
+    if (typeof define === 'function' && define.amd) {
+        define(['../numeral'], factory);
+    } else if (typeof module === 'object' && module.exports) {
+        factory(require('../numeral'));
+    } else {
+        factory(global.numeral);
+    }
+}(this, function (numeral) {
+
+    numeral.register('locale', 'vi', {
+        delimiters: {
+            thousands: '.',
+            decimal: ','
+        },
+        abbreviations: {
+            thousand: ' nghìn',
+            million: ' triệu',
+            billion: ' tỷ',
+            trillion: ' nghìn tỷ'
+        },
+        ordinal: function () {
+            return '.';
+        },
+        currency: {
+            symbol: '₫'
+        }
+    });
+}));