Skip to content

Commit

Permalink
Merge pull request #67 from mugifly/1.8.x
Browse files Browse the repository at this point in the history
v1.8.0
  • Loading branch information
mugifly committed Oct 17, 2013
2 parents 5beebf3 + 0f5f857 commit 218d8aa
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 3 deletions.
12 changes: 10 additions & 2 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
Version history for query-simple-datetimepicker
https://github.com/mugifly/jquery-simple-datetimepicker/

1.7.0 2013-09-xx
1.8.0 2013-10-17 (JST)
- [Add] Portuguese locale (Thanks to: adc-tcarvalho).
- [Add] Dutch locale (Thanks to: Mondane).
- [Add] Czech locale (Thanks to: Jan Zatloukal).
- [Add] French locale (Thanks to: Jan matll42).
- [Add] Italian locale (Thanks to: Mauro Zuccato).
- [Fix] Fixing positioning when element is inside of nested relative parent (Thanks to: AddoSolutions).

1.7.0 2013-09-16
- [Add] Korean locale (Thanks to: perhapsspy).
- [Add] "futureOnly" option and bugfix (Thanks to: camiel).
- [Add] "dateOnly" option (Thanks to: logitick).
Expand Down Expand Up @@ -64,4 +72,4 @@ https://github.com/mugifly/jquery-simple-datetimepicker/

----

Thanks to contributors!
Thanks to contributors!
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ Thank you to:
* [perhapsspy](https://github.com/perhapsspy)
* [camiel](https://github.com/camiel)
* [logitick](https://github.com/logitick)
* [adc-tcarvalho](https://github.com/adc-tcarvalho)
* [Mondane](https://github.com/Mondane)
* [AddoSolutions](https://github.com/AddoSolutions)
* [Jan Zatloukal](http://rotten77.cz/)
* [matll42](https://github.com/matll42)
* Mauro Zuccato

## License and author

Expand Down
5 changes: 5 additions & 0 deletions jquery.simple-dtpicker.html
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,11 @@ <h5>Available locales:</h5>
<li>"tr" : Turkish - Thanks to: <a href="https://github.com/myfell">myfell</a></li>
<li>"es" : Spanish - Thanks to: <a href="https://github.com/maw">maw</a></li>
<li>"ko" : Korean - Thanks to: <a href="https://github.com/perhapsspy">perhapsspy</a></li>
<li>"pt" : Portuguese - Thanks to: <a href="https://github.com/adc-tcarvalho">adc-tcarvalho</a></li>
<li>"nl" : Dutch (Naderlands) - Thanks to: <a href="https://github.com/Mondane">Mondane</a></li>
<li>"cz" : Czech - Thanks to: <a href="http://rotten77.cz/">Jan Zatloukal</a></li>
<li>"fr" : French - Thanks to: <a href="https://github.com/matll42">matll42</a></li>
<li>"it" : Italian - Thanks to: Mauro Zuccato</li>
</ul>

<h4>Change the interval of minute ("minuteInterval": 15)</h4>
Expand Down
13 changes: 13 additions & 0 deletions jquery.simple-dtpicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@
var DAYS_OF_WEEK_DE = ['So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'];
var DAYS_OF_WEEK_SV = ['Sö', 'Må', 'Ti', 'On', 'To', 'Fr', 'Lö'];
var DAYS_OF_WEEK_ID = ['Min','Sen','Sel', 'Rab', 'Kam', 'Jum', 'Sab'];
var DAYS_OF_WEEK_IT = ['Dom','Lun','Mar', 'Mer', 'Gio', 'Ven', 'Sab'];
var DAYS_OF_WEEK_TR = ['Pz', 'Pzt', 'Sal', 'Çar', 'Per', 'Cu', 'Cts'];
var DAYS_OF_WEEK_ES = ['dom', 'lun', 'mar', 'miér', 'jue', 'vié', 'sáb'];
var DAYS_OF_WEEK_KO = ['일', '월', '화', '수', '목', '금', '토'];
var DAYS_OF_WEEK_NL = ['zo', 'ma', 'di', 'wo', 'do', 'vr', 'za'];
var DAYS_OF_WEEK_CZ = ['Ne', 'Po', 'Út', 'St', 'Čt', 'Pá', 'So'];
var DAYS_OF_WEEK_FR = ['Dim', 'Lun', 'Mar', 'Mer', 'Jeu', 'Ven', 'Sam'];

var MONTHS_EN = [ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" ];
var MONTHS_RU = [ "Янв", "Фев", "Мар", "Апр", "Май", "Июн", "Июл", "Авг", "Сен", "Окт", "Ноя", "Дек" ];
var MONTHS_BR = [ "Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro" ];
Expand All @@ -27,10 +30,12 @@
var MONTHS_DE = [ "Jan", "Feb", "März", "Apr", "Mai", "Juni", "Juli", "Aug", "Sept", "Okt", "Nov", "Dez" ];
var MONTHS_SV = [ "Jan", "Feb", "Mar", "Apr", "Maj", "Juni", "Juli", "Aug", "Sept", "Okt", "Nov", "Dec" ];
var MONTHS_ID = [ "Jan", "Feb", "Mar", "Apr", "Mei", "Jun", "Jul", "Agu", "Sep", "Okt", "Nov", "Des" ];
var MONTHS_IT = [ "Gen", "Feb", "Mar", "Apr", "Mag", "Giu", "Lug", "Ago", "Set", "Ott", "Nov", "Dic" ];
var MONTHS_TR = [ "Ock", "Şub", "Mar", "Nis", "May", "Haz", "Tem", "Agu", "Eyl", "Ekm", "Kas", "Arlk" ];
var MONTHS_ES = [ "ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic" ];
var MONTHS_KO = [ "1월", "2월", "3월", "4월", "5월", "6월", "7월", "8월", "9월", "10월", "11월", "12월" ];
var MONTHS_NL = [ "jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec" ];
var MONTHS_CZ = [ "Led", "Úno", "Bře", "Dub", "Kvě", "Čer", "Čvc", "Srp", "Zář", "Říj", "Lis", "Pro" ];
var MONTHS_FR = [ "Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre" ];

var PickerObjects = [];
Expand Down Expand Up @@ -117,6 +122,8 @@
format = "YYYY/MM/DD hh:mm";
}else if(locale == "ru"){
format = "DD.MM.YYYY hh:mm";
}else if(locale == "it"){
format = "DD/MM/YYYY hh:mm";
}else if (locale == "br"){
format = "DD/MM/YYYY hh:mm";
}else if (locale == "de"){
Expand All @@ -125,6 +132,8 @@
format = "DD/MM/YYYY hh:mm";
}else if (locale === "nl"){
format = "DD-MM-YYYY hh:mm";
}else if (locale === "cz"){
format = "DD.MM.YYYY hh:mm";
}else if (locale === "fr"){
format = "DD-MM-YYYY hh:mm";
}else{
Expand Down Expand Up @@ -346,6 +355,8 @@
daysOfWeek = DAYS_OF_WEEK_SV;
} else if (locale == "id"){
daysOfWeek = DAYS_OF_WEEK_ID;
} else if (locale == "it"){
daysOfWeek = DAYS_OF_WEEK_IT;
} else if (locale == "tr"){
daysOfWeek = DAYS_OF_WEEK_TR;
} else if (locale === "es"){
Expand Down Expand Up @@ -438,6 +449,8 @@
$now_month.text(date.getFullYear() + " - " + MONTHS_SV[date.getMonth()]);
} else if(locale == "id"){
$now_month.text(date.getFullYear() + " - " + MONTHS_ID[date.getMonth()]);
} else if(locale == "it"){
$now_month.text(date.getFullYear() + " - " + MONTHS_IT[date.getMonth()]);
} else if(locale == "tr"){
$now_month.text(date.getFullYear() + " - " + MONTHS_TR[date.getMonth()]);
} else if(locale == "es"){
Expand Down
2 changes: 1 addition & 1 deletion simple-dtpicker.jquery.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "simple-dtpicker",
"title": "jquery-simple-datetimepicker",
"version": "1.7.0",
"version": "1.8.0",
"author": {
"name": "Masanori Ohgita",
"url": "https://github.com/mugifly"
Expand Down

0 comments on commit 218d8aa

Please sign in to comment.