Skip to content

Commit f97f14b

Browse files
adamwdraperadamwdraper
committed
Merge pull request #126 from adamwdraper/develop
Develop 1.5.3
2 parents c3556ec + 24610f8 commit f97f14b

File tree

17 files changed

+592
-40
lines changed

17 files changed

+592
-40
lines changed

‎.gitignore‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,29 @@
1-
node_modules/
1+
# --------------------
2+
# OSX Files
3+
# --------------------
24
.DS_Store
5+
.AppleDouble
6+
.LSOverride
7+
Icon
8+
._*
9+
.Spotlight-V100
10+
.Trashes
11+
12+
# --------------------
13+
# IntelliJ Files
14+
# --------------------
15+
*.iml
16+
*.ipr
17+
*.iws
18+
.idea/
19+
20+
# --------------------
21+
# Sublime Files
22+
# --------------------
323
*.sublime-project
4-
*.sublime-workspace
24+
*.sublime-workspace
25+
26+
# --------------------
27+
# App Files
28+
# --------------------
29+
node_modules/

‎README.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@ See [the english unit tests](https://github.com/adamwdraper/Numeral-js/blob/mast
4242

4343
# Changelog
4444

45+
### 1.5.3
46+
47+
Added currency symbol to optionally appear before negative sign / open paren
48+
49+
Added float precision math support
50+
51+
Added specification of abbreviation in thousands, millions, billions
52+
4553
### 1.5.2
4654

4755
Bug fix: Unformat should pass through if given a number

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "numeral",
33
"repo": "adamwdraper/Numeral-js",
4-
"version": "1.5.2",
4+
"version": "1.5.3",
55
"description": "Format and manipulate numbers.",
66
"keywords": [
77
"numeral",

‎component.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "numeral",
33
"repo": "adamwdraper/Numeral-js",
4-
"version": "1.5.2",
4+
"version": "1.5.3",
55
"description": "Format and manipulate numbers.",
66
"keywords": [
77
"numeral",

‎languages.js‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,41 @@
3333
this.numeral.language('be-nl', language);
3434
}
3535
}());
36+
/*!
37+
* numeral.js language configuration
38+
* language : simplified chinese
39+
* author : badplum : https://github.com/badplum
40+
*/
41+
(function () {
42+
var language = {
43+
delimiters: {
44+
thousands: ',',
45+
decimal: '.'
46+
},
47+
abbreviations: {
48+
thousand: '千',
49+
million: '百万',
50+
billion: '十亿',
51+
trillion: '兆'
52+
},
53+
ordinal: function (number) {
54+
return '.';
55+
},
56+
currency: {
57+
symbol: '¥'
58+
}
59+
};
60+
61+
// Node
62+
if (typeof module !== 'undefined' && module.exports) {
63+
module.exports = language;
64+
}
65+
// Browser
66+
if (typeof window !== 'undefined' && this.numeral && this.numeral.language) {
67+
this.numeral.language('chs', language);
68+
}
69+
}());
70+
3671
/*!
3772
* numeral.js language configuration
3873
* language : czech (cs)
@@ -288,6 +323,44 @@
288323
}
289324
}());
290325

326+
/*!
327+
* numeral.js language configuration
328+
* language : Estonian
329+
* author : Illimar Tambek : https://github.com/ragulka
330+
*
331+
* Note: in Estonian, abbreviations are always separated
332+
* from numbers with a space
333+
*/
334+
(function () {
335+
var language = {
336+
delimiters: {
337+
thousands: ' ',
338+
decimal: ','
339+
},
340+
abbreviations: {
341+
thousand: ' tuh',
342+
million: ' mln',
343+
billion: ' mld',
344+
trillion: ' trl'
345+
},
346+
ordinal: function (number) {
347+
return '.';
348+
},
349+
currency: {
350+
symbol: '€'
351+
}
352+
};
353+
354+
// Node
355+
if (typeof module !== 'undefined' && module.exports) {
356+
module.exports = language;
357+
}
358+
// Browser
359+
if (typeof window !== 'undefined' && this.numeral && this.numeral.language) {
360+
this.numeral.language('et', language);
361+
}
362+
}());
363+
291364
/*!
292365
* numeral.js language configuration
293366
* language : Finnish

‎languages/chs.js‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/*!
2+
* numeral.js language configuration
3+
* language : simplified chinese
4+
* author : badplum : https://github.com/badplum
5+
*/
6+
(function () {
7+
var language = {
8+
delimiters: {
9+
thousands: ',',
10+
decimal: '.'
11+
},
12+
abbreviations: {
13+
thousand: '千',
14+
million: '百万',
15+
billion: '十亿',
16+
trillion: '兆'
17+
},
18+
ordinal: function (number) {
19+
return '.';
20+
},
21+
currency: {
22+
symbol: '¥'
23+
}
24+
};
25+
26+
// Node
27+
if (typeof module !== 'undefined' && module.exports) {
28+
module.exports = language;
29+
}
30+
// Browser
31+
if (typeof window !== 'undefined' && this.numeral && this.numeral.language) {
32+
this.numeral.language('chs', language);
33+
}
34+
}());

‎languages/et.js‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
/*!
2+
* numeral.js language configuration
3+
* language : Estonian
4+
* author : Illimar Tambek : https://github.com/ragulka
5+
*
6+
* Note: in Estonian, abbreviations are always separated
7+
* from numbers with a space
8+
*/
9+
(function () {
10+
var language = {
11+
delimiters: {
12+
thousands: ' ',
13+
decimal: ','
14+
},
15+
abbreviations: {
16+
thousand: ' tuh',
17+
million: ' mln',
18+
billion: ' mld',
19+
trillion: ' trl'
20+
},
21+
ordinal: function (number) {
22+
return '.';
23+
},
24+
currency: {
25+
symbol: '€'
26+
}
27+
};
28+
29+
// Node
30+
if (typeof module !== 'undefined' && module.exports) {
31+
module.exports = language;
32+
}
33+
// Browser
34+
if (typeof window !== 'undefined' && this.numeral && this.numeral.language) {
35+
this.numeral.language('et', language);
36+
}
37+
}());

‎min/languages.min.js‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@
33
* language : belgium-dutch (be-nl)
44
* author : Dieter Luypaert : https://github.com/moeriki
55
*/
6-
!function(){var a={delimiters:{thousands:" ",decimal:","},abbreviations:{thousand:"k",million:" mln",billion:" mld",trillion:" bln"},ordinal:function(a){var b=a%100;return 0!==a&&1>=b||8===b||b>=20?"ste":"de"},currency:{symbol:"€ "}};"undefined"!=typeof module&&module.exports&&(module.exports=a),"undefined"!=typeof window&&this.numeral&&this.numeral.language&&this.numeral.language("be-nl",a)}(),/*!
6+
!function(){var a={delimiters:{thousands:" ",decimal:","},abbreviations:{thousand:"k",million:" mln",billion:" mld",trillion:" bln"},ordinal:function(a){var b=a%100;return 0!==a&&1>=b||8===b||b>=20?"ste":"de"},currency:{symbol:"€ "}};"undefined"!=typeof module&&module.exports&&(module.exports=a),"undefined"!=typeof window&&this.numeral&&this.numeral.language&&this.numeral.language("be-nl",a)}(),/*!
7+
* numeral.js language configuration
8+
* language : simplified chinese
9+
* author : badplum : https://github.com/badplum
10+
*/
11+
function(){var a={delimiters:{thousands:",",decimal:"."},abbreviations:{thousand:"千",million:"百万",billion:"十亿",trillion:"兆"},ordinal:function(){return"."},currency:{symbol:"¥"}};"undefined"!=typeof module&&module.exports&&(module.exports=a),"undefined"!=typeof window&&this.numeral&&this.numeral.language&&this.numeral.language("chs",a)}(),/*!
712
* numeral.js language configuration
813
* language : czech (cs)
914
* author : Anatoli Papirovski : https://github.com/apapirovski
@@ -39,6 +44,14 @@ function(){var a={delimiters:{thousands:".",decimal:","},abbreviations:{thousand
3944
* author : Hernan Garcia : https://github.com/hgarcia
4045
*/
4146
function(){var a={delimiters:{thousands:".",decimal:","},abbreviations:{thousand:"k",million:"mm",billion:"b",trillion:"t"},ordinal:function(a){var b=a%10;return 1===b||3===b?"er":2===b?"do":7===b||0===b?"mo":8===b?"vo":9===b?"no":"to"},currency:{symbol:"$"}};"undefined"!=typeof module&&module.exports&&(module.exports=a),"undefined"!=typeof window&&this.numeral&&this.numeral.language&&this.numeral.language("es",a)}(),/*!
47+
* numeral.js language configuration
48+
* language : Estonian
49+
* author : Illimar Tambek : https://github.com/ragulka
50+
*
51+
* Note: in Estonian, abbreviations are always separated
52+
* from numbers with a space
53+
*/
54+
function(){var a={delimiters:{thousands:" ",decimal:","},abbreviations:{thousand:" tuh",million:" mln",billion:" mld",trillion:" trl"},ordinal:function(){return"."},currency:{symbol:"€"}};"undefined"!=typeof module&&module.exports&&(module.exports=a),"undefined"!=typeof window&&this.numeral&&this.numeral.language&&this.numeral.language("et",a)}(),/*!
4255
* numeral.js language configuration
4356
* language : Finnish
4457
* author : Sami Saada : https://github.com/samitheberber

‎min/languages/chs.min.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/*!
2+
* numeral.js language configuration
3+
* language : simplified chinese
4+
* author : badplum : https://github.com/badplum
5+
*/
6+
!function(){var a={delimiters:{thousands:",",decimal:"."},abbreviations:{thousand:"千",million:"百万",billion:"十亿",trillion:"兆"},ordinal:function(){return"."},currency:{symbol:"¥"}};"undefined"!=typeof module&&module.exports&&(module.exports=a),"undefined"!=typeof window&&this.numeral&&this.numeral.language&&this.numeral.language("chs",a)}();

‎min/languages/et.min.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/*!
2+
* numeral.js language configuration
3+
* language : Estonian
4+
* author : Illimar Tambek : https://github.com/ragulka
5+
*
6+
* Note: in Estonian, abbreviations are always separated
7+
* from numbers with a space
8+
*/
9+
!function(){var a={delimiters:{thousands:" ",decimal:","},abbreviations:{thousand:" tuh",million:" mln",billion:" mld",trillion:" trl"},ordinal:function(){return"."},currency:{symbol:"€"}};"undefined"!=typeof module&&module.exports&&(module.exports=a),"undefined"!=typeof window&&this.numeral&&this.numeral.language&&this.numeral.language("et",a)}();

0 commit comments

Comments
 (0)