hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-11 03:53:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix localization in datepicker - admin

Browse Source
This commit is contained in:
Mike Ng
2017-08-14 10:26:52 +04:00
parent 888440529e
commit a0cad9ec8f
3 changed files with 86 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/www/common/js/components/common.js
View File

@@ -1,4 +1,5 @@
var p4 = p4 || {};
var datepickerLang = [];
var commonModule = (function ($, p4) {
$(document).ready(function () {
@@ -13,7 +14,7 @@ var commonModule = (function ($, p4) {
var locale = $.cookie('locale');
var jq_date = p4.lng = typeof locale !== "undefined" ? locale.split('_').reverse().pop() : 'en';
var jq_date = p4.lng = typeof locale !== "undefined" ? locale.split('_').reverse().pop() : $('html').attr('lang');
if (jq_date == 'en') {
jq_date = 'en-GB';
@@ -21,6 +22,7 @@ var commonModule = (function ($, p4) {
$.datepicker.setDefaults({showMonthAfterYear: false});
$.datepicker.setDefaults($.datepicker.regional[jq_date]);
datepickerLang = $.datepicker.regional[jq_date];
var cache = $('#mainMenu .helpcontextmenu');
$('.context-menu-item', cache).hover(function () {

12
templates/web/admin/editusers_timelimit.html.twig
View File

@@ -37,9 +37,13 @@
</form>
<script type="text/javascript">
datePicker();
function datePicker()
{
$(document).ready(function () {
$.datepicker.setDefaults(datepickerLang);
datePicker();
});
function datePicker()
{
var dates = $('.dmin, .dmax');
$('.dmin').datepicker({
defaultDate: -10,
@@ -73,5 +77,5 @@ function datePicker()
var instance = $('.dmax').data("datepicker");
$('.dmax').datepicker("option", 'minDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_from}}", instance.settings));
{% endif %}
}
}
</script>

11
templates/web/admin/editusers_timelimit_sbas.html.twig
View File

@@ -33,9 +33,12 @@
</form>
<script type="text/javascript">
datePicker();
function datePicker()
{
$(document).ready(function () {
$.datepicker.setDefaults(datepickerLang);
datePicker();
});
function datePicker()
{
var dates = $('.dmin, .dmax');
$('.dmin').datepicker({
defaultDate: -10,
@@ -73,5 +76,5 @@ function datePicker()
$('.dmax').datepicker("option", 'minDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_from}}", instance.settings));
}
{% endif %}
}
}
</script>