Skip to content

Commit d842e1c

Browse files
committed
Fix #15: Correct ordinal suffix
1 parent 43e73d4 commit d842e1c

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

CHANGE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Change Log: `php-date-formatter`
77

88
- (enh #20, #18): Add UMD support for AMD, node, browser globals.
99
- (enh #19): Enhance `parseData` for formats where year, month or day is optional.
10+
- (bug #15): Correct ordinal suffix.
1011
- (enh #14): Remove usage of reserved word as function attribute.
1112
- (enh #10): Better handling of escaped characters in string format.
1213

js/php-date-formatter.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,11 @@
146146
if (!vFormatParts || vFormatParts.length === 0) {
147147
throw new Error("Invalid date format definition.");
148148
}
149+
for (i = vFormatParts.length - 1; i >= 0; i--) {
150+
if (vFormatParts[i] === 'S') {
151+
vFormatParts.splice(i, 1);
152+
}
153+
}
149154
vDateParts = vDate.replace(self.separators, '\0').split('\0');
150155
for (i = 0; i < vDateParts.length; i++) {
151156
vDatePart = vDateParts[i];
@@ -193,7 +198,7 @@
193198
case 'g':
194199
case 'h':
195200
vMeriIndex = (vFormatParts.indexOf('a') > -1) ? vFormatParts.indexOf('a') :
196-
(vFormatParts.indexOf('A') > -1) ? vFormatParts.indexOf('A') : -1;
201+
((vFormatParts.indexOf('A') > -1) ? vFormatParts.indexOf('A') : -1);
197202
mer = vDateParts[vMeriIndex];
198203
if (vMeriIndex !== -1) {
199204
vMeriOffset = $h.compare(mer, vSettings.meridiem[0]) ? 0 :

js/php-date-formatter.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)