Skip to content

Commit

Permalink
Merge pull request #1804 from rbonvall/develop
Browse files Browse the repository at this point in the history
Spanish locale: del→de before year

@changelog
@section lang-bugfix
@description del→de before year in spanish
  • Loading branch information
ichernev committed Aug 20, 2014
2 parents d4d3d1f + 0f6c36e commit d61ec6b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions locale/es.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
longDateFormat : {
LT : 'H:mm',
L : 'DD/MM/YYYY',
LL : 'D [de] MMMM [del] YYYY',
LLL : 'D [de] MMMM [del] YYYY LT',
LLLL : 'dddd, D [de] MMMM [del] YYYY LT'
LL : 'D [de] MMMM [de] YYYY',
LLL : 'D [de] MMMM [de] YYYY LT',
LLLL : 'dddd, D [de] MMMM [de] YYYY LT'
},
calendar : {
sameDay : function () {
Expand Down
12 changes: 6 additions & 6 deletions test/locale/es.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ exports['locale:es'] = {
['a A', 'pm PM'],
['[the] DDDo [day of the year]', 'the 45º day of the year'],
['L', '14/02/2010'],
['LL', '14 de febrero del 2010'],
['LLL', '14 de febrero del 2010 15:25'],
['LLLL', 'domingo, 14 de febrero del 2010 15:25'],
['LL', '14 de febrero de 2010'],
['LLL', '14 de febrero de 2010 15:25'],
['LLLL', 'domingo, 14 de febrero de 2010 15:25'],
['l', '14/2/2010'],
['ll', '14 de feb. del 2010'],
['lll', '14 de feb. del 2010 15:25'],
['llll', 'dom., 14 de feb. del 2010 15:25']
['ll', '14 de feb. de 2010'],
['lll', '14 de feb. de 2010 15:25'],
['llll', 'dom., 14 de feb. de 2010 15:25']
],
b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
i;
Expand Down

0 comments on commit d61ec6b

Please sign in to comment.