Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 6374fd8

Browse files
ichernevichernev
committed
Merge branch 'master' into develop
2 parents b4e6153 + 57c9062 commit 6374fd8

22 files changed

+57
-40
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
Changelog
22
=========
33

4+
### 2.29.3 [Full changelog](https://gist.github.com/ichernev/edebd440f49adcaec72e5e77b791d8be)
5+
6+
* Release Apr 17, 2022
7+
* [#5995](https://github.com/moment/moment/pull/5995) [bugfix] Remove const usage
8+
* [#5990](https://github.com/moment/moment/pull/5990) misc: fix advisory link
9+
10+
411
### 2.29.2 [See full changelog](https://gist.github.com/ichernev/1904b564f6679d9aac1ae08ce13bc45c)
512

613
* Release Apr 3 2022

‎Moment.js.nuspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Moment.js</id>
5-
<version>2.29.2</version>
5+
<version>2.29.3</version>
66
<authors>Tim Wood, Iskren Chernev, Moment.js contributors</authors>
77
<owners>Cory Deppen, Iskren Chernev</owners>
88
<description>A lightweight JavaScript date library for parsing, manipulating, and formatting dates.</description>
99
<releaseNotes>
10-
* Release Oct 6, 2020
11-
12-
Updated deprecation message, bugfix in hi locale
10+
* Release Apr 17, 2022
11+
* [#5995](https://github.com/moment/moment/pull/5995) [bugfix] Remove const usage
12+
* [#5990](https://github.com/moment/moment/pull/5990) misc: fix advisory link
1313
</releaseNotes>
1414
<projectUrl>http://momentjs.com/</projectUrl>
1515
<iconUrl>http://pbs.twimg.com/profile_images/482670411402858496/Xrtdc94q_normal.png</iconUrl>

‎component.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "moment",
3-
"version": "2.29.2",
3+
"version": "2.29.3",
44
"main": "moment.js",
55
"description": "Parse, validate, manipulate, and display dates in JavaScript.",
66
"files": [

‎dist/locale/sr-cyrl.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,16 @@ var translator = {
3131
return wordKey[2];
3232
},
3333
translate: function (number, withoutSuffix, key, isFuture) {
34-
var wordKey = translator.words[key];
34+
var wordKey = translator.words[key],
35+
word;
3536

3637
if (key.length === 1) {
3738
// Nominativ
3839
if (key === 'y' && withoutSuffix) return 'једна година';
3940
return isFuture || withoutSuffix ? wordKey[0] : wordKey[1];
4041
}
4142

42-
const word = translator.correctGrammaticalCase(number, wordKey);
43+
word = translator.correctGrammaticalCase(number, wordKey);
4344
// Nominativ
4445
if (key === 'yy' && withoutSuffix && word === 'годину') {
4546
return number + ' година';

‎dist/locale/sr.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,16 @@ var translator = {
3131
return wordKey[2];
3232
},
3333
translate: function (number, withoutSuffix, key, isFuture) {
34-
var wordKey = translator.words[key];
34+
var wordKey = translator.words[key],
35+
word;
3536

3637
if (key.length === 1) {
3738
// Nominativ
3839
if (key === 'y' && withoutSuffix) return 'jedna godina';
3940
return isFuture || withoutSuffix ? wordKey[0] : wordKey[1];
4041
}
4142

42-
const word = translator.correctGrammaticalCase(number, wordKey);
43+
word = translator.correctGrammaticalCase(number, wordKey);
4344
// Nominativ
4445
if (key === 'yy' && withoutSuffix && word === 'godinu') {
4546
return number + ' godina';

‎dist/moment.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//! moment.js
2-
//! version : 2.29.2
2+
//! version : 2.29.3
33
//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
44
//! license : MIT
55
//! momentjs.com
@@ -5629,7 +5629,7 @@ addParseToken('x', function (input, array, config) {
56295629

56305630
//! moment.js
56315631

5632-
hooks.version = '2.29.2';
5632+
hooks.version = '2.29.3';
56335633

56345634
setHookCallback(createLocal);
56355635

‎locale/sr-cyrl.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,16 @@
3838
return wordKey[2];
3939
},
4040
translate: function (number, withoutSuffix, key, isFuture) {
41-
var wordKey = translator.words[key];
41+
var wordKey = translator.words[key],
42+
word;
4243

4344
if (key.length === 1) {
4445
// Nominativ
4546
if (key === 'y' && withoutSuffix) return 'једна година';
4647
return isFuture || withoutSuffix ? wordKey[0] : wordKey[1];
4748
}
4849

49-
const word = translator.correctGrammaticalCase(number, wordKey);
50+
word = translator.correctGrammaticalCase(number, wordKey);
5051
// Nominativ
5152
if (key === 'yy' && withoutSuffix && word === 'годину') {
5253
return number + ' година';

‎locale/sr.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,16 @@
3838
return wordKey[2];
3939
},
4040
translate: function (number, withoutSuffix, key, isFuture) {
41-
var wordKey = translator.words[key];
41+
var wordKey = translator.words[key],
42+
word;
4243

4344
if (key.length === 1) {
4445
// Nominativ
4546
if (key === 'y' && withoutSuffix) return 'jedna godina';
4647
return isFuture || withoutSuffix ? wordKey[0] : wordKey[1];
4748
}
4849

49-
const word = translator.correctGrammaticalCase(number, wordKey);
50+
word = translator.correctGrammaticalCase(number, wordKey);
5051
// Nominativ
5152
if (key === 'yy' && withoutSuffix && word === 'godinu') {
5253
return number + ' godina';

‎meteor/package.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var packageName = 'momentjs:moment'; // https://atmospherejs.com/momentjs/momen
66
Package.describe({
77
name: packageName,
88
summary: 'Moment.js (official): parse, validate, manipulate, and display dates - official Meteor packaging',
9-
version: '2.29.2',
9+
version: '2.29.3',
1010
git: 'https://github.com/moment/moment.git'
1111
});
1212

‎min/locales.js‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10097,15 +10097,16 @@
1009710097
return wordKey[2];
1009810098
},
1009910099
translate: function (number, withoutSuffix, key, isFuture) {
10100-
var wordKey = translator$1.words[key];
10100+
var wordKey = translator$1.words[key],
10101+
word;
1010110102

1010210103
if (key.length === 1) {
1010310104
// Nominativ
1010410105
if (key === 'y' && withoutSuffix) return 'једна година';
1010510106
return isFuture || withoutSuffix ? wordKey[0] : wordKey[1];
1010610107
}
1010710108

10108-
const word = translator$1.correctGrammaticalCase(number, wordKey);
10109+
word = translator$1.correctGrammaticalCase(number, wordKey);
1010910110
// Nominativ
1011010111
if (key === 'yy' && withoutSuffix && word === 'годину') {
1011110112
return number + ' година';
@@ -10219,15 +10220,16 @@
1021910220
return wordKey[2];
1022010221
},
1022110222
translate: function (number, withoutSuffix, key, isFuture) {
10222-
var wordKey = translator$2.words[key];
10223+
var wordKey = translator$2.words[key],
10224+
word;
1022310225

1022410226
if (key.length === 1) {
1022510227
// Nominativ
1022610228
if (key === 'y' && withoutSuffix) return 'jedna godina';
1022710229
return isFuture || withoutSuffix ? wordKey[0] : wordKey[1];
1022810230
}
1022910231

10230-
const word = translator$2.correctGrammaticalCase(number, wordKey);
10232+
word = translator$2.correctGrammaticalCase(number, wordKey);
1023110233
// Nominativ
1023210234
if (key === 'yy' && withoutSuffix && word === 'godinu') {
1023310235
return number + ' godina';

0 commit comments

Comments
 (0)