Skip to content

Commit

Permalink
Merge pull request #1 from jzaefferer/master
Browse files Browse the repository at this point in the history
Merge from main
  • Loading branch information
mh35 committed Jun 27, 2015
2 parents 581a174 + a07f46e commit 1863a27
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
@@ -1,6 +1,6 @@
language: node_js
node_js:
- 0.8
- 0.10
install:
- npm install grunt-cli -g
- npm install
4 changes: 2 additions & 2 deletions i18n/jquery.prettydate-es.js
Expand Up @@ -10,8 +10,8 @@ $.extend($.prettyDate.messages, {
days: $.prettyDate.template('hace {0} días'),
week: 'hace una semana',
weeks: $.prettyDate.template('hace {0} semanas'),
month: 'hace un més',
month: 'hace un mes',
months: $.prettyDate.template('hace {0} meses'),
year: 'hace un año',
years: $.prettyDate.template('hace {0} años')
});
});
17 changes: 17 additions & 0 deletions i18n/jquery.prettydate-he.js
@@ -0,0 +1,17 @@
/* Hebrew */
$.extend($.prettyDate.messages, {
now: 'ממש הרגע',
minute: 'לפני דקה',
minutes: $.prettyDate.template('לפני {0} דקות'),
hour: 'לפני שעה',
hours: $.prettyDate.template('לפני {0} שעות'),
yesterday: 'אתמול',
dayBeforeYesterday: 'לפני יומיים',
days: $.prettyDate.template('לפני {0} ימים'),
week: 'לפני שבוע',
weeks: $.prettyDate.template('לפני {0} שבועות'),
month: 'לפני חודש',
months: $.prettyDate.template('לפני {0} חודשים'),
year: 'לפני שנה',
years: $.prettyDate.template('לפני {0} שנים')
});
8 changes: 4 additions & 4 deletions i18n/jquery.prettydate-it.js
@@ -1,14 +1,14 @@
/* Italian */
$.extend($.prettyDate.messages, {
now: 'adesso',
minute: '1 minuto fa',
now: 'adesso',
minute: 'un minuto fa',
minutes: $.prettyDate.template('{0} minuti fa'),
hour: '1 ora fa',
hour: 'un\'ora fa',
hours: $.prettyDate.template('{0} ore fa'),
yesterday: 'ieri',
dayBeforeYesterday: 'l\'altro ieri',
days: $.prettyDate.template('{0} giorni fa'),
week: '1 settimana fa',
week: 'una settimana fa',
weeks: $.prettyDate.template('{0} settimane fa'),
month: 'un mese fa',
months: $.prettyDate.template('{0} mesi fa'),
Expand Down
17 changes: 17 additions & 0 deletions i18n/jquery.prettydate-zh-CN.js
@@ -0,0 +1,17 @@
/* Simplified Chinese */
$.extend($.prettyDate.messages, {
now: '刚刚',
minute: '1分钟前',
minutes: $.prettyDate.template('{0}分钟前'),
hour: $.prettyDate.template('1小时前'),
hours: $.prettyDate.template('{0}小时前'),
yesterday: '昨天',
dayBeforeYesterday: '前天',
days: '{0}天前',
week: '1周前',
weeks: '{0}周前',
month: '1个月前',
months: '{0}个月前',
year: '1年前',
years: $.prettyDate.template('{0}年前')
});
17 changes: 17 additions & 0 deletions i18n/jquery.prettydate-zh-TW.js
@@ -0,0 +1,17 @@
/* Traditional Chinese */
$.extend($.prettyDate.messages, {
now: '剛剛',
minute: '1分鐘前',
minutes: $.prettyDate.template('{0}分鐘前'),
hour: '1小時前',
hours: $.prettyDate.template('{0}小時前'),
yesterday: '昨天',
dayBeforeYesterday: '兩天前',
days: $.prettyDate.template('{0}天前'),
week: '1星期前',
weeks: $.prettyDate.template('{0}星期前'),
month: '1個月前',
months: $.prettyDate.template('{0}個月前'),
year: '1年前',
years: $.prettyDate.template('{0}年前')
});

0 comments on commit 1863a27

Please sign in to comment.