From: Pierre Spring Date: Thu, 8 Dec 2011 08:23:05 +0000 (+0100) Subject: adds translations for localized time #17 X-Git-Tag: 1.3.0~33^2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=041975e965faeb2b96326d41c8ef25482454dd1b;p=thirdparty%2Fmoment.git adds translations for localized time #17 --- diff --git a/lang/de.js b/lang/de.js index 0b4884550..0c4a981f9 100644 --- a/lang/de.js +++ b/lang/de.js @@ -5,10 +5,11 @@ weekdays : "Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag".split("_"), weekdaysShort : "So._Mo._Di._Mi._Do._Fr._Sa.".split("_"), longDateFormat : { + XXXX: "HH:mm U\\hr", L : "DD.MM.YYYY", LL : "D. MMMM YYYY", - LLL : "D. MMMM YYYY HH:mm U\\hr", - LLLL : "dddd, D. MMMM YYYY HH:mm U\\hr" + LLL : "D. MMMM YYYY XXXX", + LLLL : "dddd, D. MMMM YYYY XXXX" }, meridiem : { AM : 'AM', diff --git a/lang/en-GB.js b/lang/en-GB.js index e03ebaa09..9ae652a7d 100644 --- a/lang/en-GB.js +++ b/lang/en-GB.js @@ -5,10 +5,11 @@ weekdays : "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"), weekdaysShort : "Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"), longDateFormat : { + XXXX : "h:mm A", L : "DD/MM/YYYY", LL : "D MMMM YYYY", - LLL : "D MMMM YYYY h:mm A", - LLLL : "dddd, D MMMM YYYY h:mm A" + LLL : "D MMMM YYYY XXXX", + LLLL : "dddd, D MMMM YYYY XXXX" }, meridiem : { AM : 'AM', diff --git a/lang/es.js b/lang/es.js index f0ebc3f04..f9e40c513 100644 --- a/lang/es.js +++ b/lang/es.js @@ -5,10 +5,11 @@ weekdays : "Domingo_Lunes_Martes_Miércoles_Jueves_Viernes_Sábado".split("_"), weekdaysShort : "Dom._Lun._Mar._Mié._Jue._Vie._Sáb.".split("_"), longDateFormat : { + XXXX : "HH:mm", L : "DD/MM/YYYY", LL : "D MMMM YYYY", - LLL : "D MMMM YYYY HH:mm", - LLLL : "dddd D MMMM YYYY HH:mm" + LLL : "D MMMM YYYY XXXX", + LLLL : "dddd D MMMM YYYY XXXX" }, meridiem : { AM : 'AM', diff --git a/lang/fr.js b/lang/fr.js index b1c59005e..745ab5a47 100644 --- a/lang/fr.js +++ b/lang/fr.js @@ -5,10 +5,11 @@ weekdays : "dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"), weekdaysShort : "dim._lun._mar._mer._jeu._ven._sam.".split("_"), longDateFormat : { + XXXX : "HH:mm", L : "DD/MM/YYYY", LL : "D MMMM YYYY", - LLL : "D MMMM YYYY HH:mm", - LLLL : "dddd D MMMM YYYY HH:mm" + LLL : "D MMMM YYYY XXXX", + LLLL : "dddd D MMMM YYYY XXXX" }, meridiem : { AM : 'AM', diff --git a/lang/it.js b/lang/it.js index 3c83cf8cc..35c408561 100644 --- a/lang/it.js +++ b/lang/it.js @@ -5,10 +5,11 @@ weekdays : "Domenica_Lunedi_Martedi_Mercoledi_Giovedi_Venerdi_Sabato".split("_"), weekdaysShort : "Dom_Lun_Mar_Mer_Gio_Ven_Sab".split("_"), longDateFormat : { + XXXX : "HH:mm", L : "DD/MM/YYYY", LL : "D MMMM YYYY", - LLL : "D MMMM YYYY HH:mm", - LLLL : "dddd, D MMMM YYYY HH:mm" + LLL : "D MMMM YYYY XXXX", + LLLL : "dddd, D MMMM YYYY XXXX" }, meridiem : { AM : 'AM', diff --git a/lang/kr.js b/lang/kr.js index a65da02f4..bcb11692e 100644 --- a/lang/kr.js +++ b/lang/kr.js @@ -5,10 +5,11 @@ weekdays : "일요일_월요일_화요일_수요일_목요일_금요일_토요일".split("_"), weekdaysShort : "일_월_화_수_목_금_토".split("_"), longDateFormat : { + XXXX : "A h시 mm분", L : "YYYY.MM.DD", LL : "YYYY년 MMMM D일", - LLL : "YYYY년 MMMM D일 A h시 mm분", - LLLL : "YYYY년 MMMM D일 dddd A h시 mm분" + LLL : "YYYY년 MMMM D일 XXXX", + LLLL : "YYYY년 MMMM D일 dddd XXXX" }, meridiem : { AM : '오전', diff --git a/lang/nb.js b/lang/nb.js index c8407ccb8..06bddedf9 100644 --- a/lang/nb.js +++ b/lang/nb.js @@ -5,10 +5,11 @@ weekdays : "søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag".split("_"), weekdaysShort : "søn_man_tir_ons_tor_fre_lør".split("_"), longDateFormat : { + XXXX : "HH:mm", L : "YYYY-MM-DD", LL : "D MMMM YYYY", - LLL : "D MMMM YYYY HH:mm", - LLLL : "dddd D MMMM YYYY HH:mm" + LLL : "D MMMM YYYY XXXX", + LLLL : "dddd D MMMM YYYY XXXX" }, meridiem : { AM : 'AM', diff --git a/lang/nl.js b/lang/nl.js index d753ab49a..eec72d9bb 100644 --- a/lang/nl.js +++ b/lang/nl.js @@ -5,10 +5,11 @@ weekdays : "zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag".split("_"), weekdaysShort : "zo._ma._di._wo._do._vr._za.".split("_"), longDateFormat : { + XXXX : "HH:mm", L : "DD-MM-YYYY", LL : "D MMMM YYYY", - LLL : "D MMMM YYYY HH:mm", - LLLL : "dddd D MMMM YYYY HH:mm" + LLL : "D MMMM YYYY XXXX", + LLLL : "dddd D MMMM YYYY XXXX" }, meridiem : { AM : 'AM', diff --git a/lang/pl.js b/lang/pl.js index ad7fae552..470eb70f9 100644 --- a/lang/pl.js +++ b/lang/pl.js @@ -27,10 +27,11 @@ weekdays : "niedziela_poniedziałek_wtorek_środa_czwartek_piątek_sobota".split("_"), weekdaysShort : "nie_pon_wt_śr_czw_pt_sb".split("_"), longDateFormat : { + XXXX : "HH:mm", L : "DD-MM-YYYY", LL : "D MMMM YYYY", - LLL : "D MMMM YYYY HH:mm", - LLLL : "dddd, D MMMM YYYY HH:mm" + LLL : "D MMMM YYYY XXXX", + LLLL : "dddd, D MMMM YYYY XXXX" }, meridiem : { AM : 'AM', diff --git a/lang/pt.js b/lang/pt.js index 1f1464a4a..b89a6d13f 100644 --- a/lang/pt.js +++ b/lang/pt.js @@ -5,10 +5,11 @@ weekdays : "Domingo_Segunda-feira_Terça-feira_Quarta-feira_Quinta-feira_Sexta-feira_Sábado".split("_"), weekdaysShort : "Dom_Seg_Ter_Qua_Qui_Sex_Sáb".split("_"), longDateFormat : { + XXXX : "HH:mm", L : "DD/MM/YYYY", LL : "D \\de MMMM \\de YYYY", - LLL : "D \\de MMMM \\de YYYY HH:mm", - LLLL : "dddd, D \\de MMMM \\de YYYY HH:mm" + LLL : "D \\de MMMM \\de YYYY XXXX", + LLLL : "dddd, D \\de MMMM \\de YYYY XXXX" }, meridiem : { AM : 'AM', diff --git a/lang/ru.js b/lang/ru.js index db5097f49..97eb9c1aa 100644 --- a/lang/ru.js +++ b/lang/ru.js @@ -5,10 +5,11 @@ weekdays : "воскресенье_понедельник_вторник_среда_четверг_пятница_суббота".split("_"), weekdaysShort : "вск_пнд_втр_срд_чтв_птн_суб".split("_"), longDateFormat : { + XXXX : "HH:mm", L : "DD-MM-YYYY", LL : "D MMMM YYYY", - LLL : "D MMMM YYYY HH:mm", - LLLL : "dddd, D MMMM YYYY HH:mm" + LLL : "D MMMM YYYY XXXX", + LLLL : "dddd, D MMMM YYYY XXXX" }, // It needs checking (adding) russian plurals and cases. relativeTime : { future : "через %s", diff --git a/lang/sv.js b/lang/sv.js index 584b56b94..2cf6256f4 100644 --- a/lang/sv.js +++ b/lang/sv.js @@ -5,10 +5,11 @@ weekdays : "söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag".split("_"), weekdaysShort : "sön_mån_tis_ons_tor_fre_lör".split("_"), longDateFormat : { + XXXX : "HH:mm", L : "YYYY-MM-DD", LL : "D MMMM YYYY", - LLL : "D MMMM YYYY HH:mm", - LLLL : "dddd D MMMM YYYY HH:mm" + LLL : "D MMMM YYYY XXXX", + LLLL : "dddd D MMMM YYYY XXXX" }, meridiem : { AM : 'AM', diff --git a/moment.js b/moment.js index 14b27f8fa..b6cad21e1 100644 --- a/moment.js +++ b/moment.js @@ -183,7 +183,7 @@ case 'LL' : case 'LLL' : case 'LLLL' : - case 'XXXX': + case 'XXXX' : return formatDate(date, moment.longDateFormat[input]); // DEFAULT default : @@ -395,7 +395,7 @@ weekdays : "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"), weekdaysShort : "Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"), longDateFormat : { - XXXX: "h:mm A", + XXXX : "h:mm A", L : "MM/DD/YYYY", LL : "MMMM D YYYY", LLL : "MMMM D YYYY XXXX",