Skip to content

Commit

Permalink
Merge e351352 into 0c73582
Browse files Browse the repository at this point in the history
  • Loading branch information
gdgunnars committed May 25, 2021
2 parents 0c73582 + e351352 commit ec02a3f
Show file tree
Hide file tree
Showing 7 changed files with 96 additions and 15 deletions.
18 changes: 18 additions & 0 deletions locale-more-styles/da/mini.json
@@ -0,0 +1,18 @@
{
"year": "{0} år",
"month": {
"one": "{0} md.",
"other": "{0} mdr."
},
"week": {
"one": "{0} uge",
"other": "{0} uger"
},
"day": {
"one": "{0} dag",
"other": "{0} dage"
},
"hour": "{0} t.",
"minute": "{0} min.",
"second": "{0} sek."
}
26 changes: 19 additions & 7 deletions locale-more-styles/es/mini.json
@@ -1,9 +1,21 @@
{
"year": "{0}año",
"month": "{0}mes",
"week": "{0}sem.",
"day": "{0}d",
"hour": "{0}h",
"minute": "{0}m",
"second": "{0}s"
"year": {
"one": "{0} año",
"other": "{0} años"
},
"month": {
"one": "{0} mes",
"other": "{0} meses"
},
"week": "{0} sem.",
"day": {
"one": "{0} día",
"other": "{0} días"
},
"hour": {
"one": "{0} hora",
"other": "{0} horas"
},
"minute": "{0} min.",
"second": "{0} seg."
}
16 changes: 11 additions & 5 deletions locale-more-styles/fr/mini.json
@@ -1,9 +1,15 @@
{
"year": "{0} a",
"month": "{0} m.",
"year": {
"one": "{0} an",
"other": "{0} ans"
},
"month": "{0} mois",
"week": "{0} sem.",
"day": "{0} j",
"day": {
"one": "{0} jour",
"other": "{0} jours"
},
"hour": "{0} h",
"minute": "{0} min",
"second": "{0} s"
"minute": "{0} min.",
"second": "{0} sec."
}
18 changes: 18 additions & 0 deletions locale-more-styles/it/mini.json
@@ -0,0 +1,18 @@
{
"year": {
"one": "{0} anno",
"other": "{0} anni"
},
"month": {
"one": "{0} mese",
"other": "{0} mesi"
},
"week": "{0} sett.",
"day": "{0} gior.",
"hour": {
"one": "{0} ora",
"other": "{0} ore"
},
"minute": "{0} min.",
"second": "{0} sec."
}
15 changes: 15 additions & 0 deletions locale-more-styles/nl/mini.json
@@ -0,0 +1,15 @@
{
"year": "{0} jr.",
"month": "{0} mnd.",
"week": {
"one": "{0} week",
"other": "{0} wkn."
},
"day": {
"one": "{0} dag",
"other": "{0} dgn."
},
"hour": "{0} uur",
"minute": "{0} min.",
"second": "{0} sec."
}
12 changes: 12 additions & 0 deletions locale-more-styles/sv/mini.json
@@ -0,0 +1,12 @@
{
"year": "{0} år",
"month": "{0} mån.",
"week": "{0} v.",
"day": {
"one": "{0} dag",
"other": "{0} dagar"
},
"hour": "{0} tim.",
"minute": "{0} min",
"second": "{0} sek."
}
6 changes: 3 additions & 3 deletions source/style/twitter.test.js
Expand Up @@ -4,8 +4,8 @@ import { hour, minute, day, month, year } from '../steps'

describe('style/twitter', () => {
it('should fallback from "mini" to "narrow"', () => {
const timeAgo = new TimeAgo('it')
timeAgo.format(Date.now() - 3 * hour * 1000, 'twitter').should.equal('3 h fa')
const timeAgo = new TimeAgo('ccp')
timeAgo.format(Date.now() - 3 * hour * 1000, 'twitter').should.equal('3 𑄊𑄮𑄚𑄴𑄓 𑄃𑄉𑄬')
})

it('should format Twitter style relative time (English) (round: "round")', () => {
Expand Down Expand Up @@ -117,7 +117,7 @@ describe('style/twitter', () => {
const now = new Date(2016, 3, 10, 22, 59).getTime()
const formatDatePastBy = (secondsPassed) => timeAgo.format(now - secondsPassed * 1000, { now, ...twitter })

formatDatePastBy(minute).should.equal('1 min')
formatDatePastBy(minute).should.equal('1 min.')
formatDatePastBy(hour).should.equal('1 h')
formatDatePastBy(day + 62 * minute).should.equal('9 avr.')
formatDatePastBy(year).should.equal('11 avr. 2015')
Expand Down

0 comments on commit ec02a3f

Please sign in to comment.