mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 06:38:00 +02:00
Code Issues Releases Wiki Activity

Language fix for datetimepicker()

Browse Source
This commit is contained in:
Cameron
2013-11-21 19:43:00 -08:00
parent 9ab74b665c
commit 459ffe40de
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_admin/header.php
View File

@@ -64,7 +64,13 @@ function loadJSAddons()
e107::css('core', 'bootstrap-datetimepicker/css/datetimepicker.css', 'jquery'); e107::css('core', 'bootstrap-datetimepicker/css/datetimepicker.css', 'jquery');
e107::js('core', 'bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js', 'jquery', 2); e107::js('core', 'bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js', 'jquery', 2);
$bs_date_link = "bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.".e_LAN.".js";
if(e_LAN != 'en' && file_exists(e_WEB_JS.$bs_date_link)) // load datetime picker language file.
{
// e107::getMessage()->addDebug("Loading ".$bs_date_link);
e107::js('core', $bs_date_link, 'jquery', 2);
}
e107::js('core', 'jquery.elastic.js', 'jquery', 2); e107::js('core', 'jquery.elastic.js', 'jquery', 2);
e107::js('core', 'jquery.at.caret.min.js', 'jquery', 2); e107::js('core', 'jquery.at.caret.min.js', 'jquery', 2);

2
e107_handlers/form_handler.php
View File

@@ -662,7 +662,7 @@ class e_form
} }
else else
{ {
$text .= "<input class='{$class} input-xlarge' type='text' size='{$size}' name='{$name}' id='{$id}' value='{$value}' data-date-format='{$dformat}' data-date-ampm='{$ampm}' data-date-firstday='{$firstDay}' {$required} />"; $text .= "<input class='{$class} input-xlarge' type='text' size='{$size}' name='{$name}' id='{$id}' value='{$value}' data-date-format='{$dformat}' data-date-ampm='{$ampm}' data-date-language='".e_LAN."' data-date-firstday='{$firstDay}' {$required} />";
} }
// $text .= "ValueFormat: ".$dateFormat." Value: ".$value; // $text .= "ValueFormat: ".$dateFormat." Value: ".$value;

7
e107_web/js/core/all.jquery.js
View File

@@ -156,13 +156,13 @@ $(document).ready(function()
// https://github.com/smalot/bootstrap-datetimepicker // https://github.com/smalot/bootstrap-datetimepicker
$("input.e-date").each(function() { $("input.e-date").each(function() {
$(this).datetimepicker({ $(this).datetimepicker({
minView: 'month', minView: 'month',
maxView: 'decade', maxView: 'decade',
autoclose: true, autoclose: true,
format: $(this).attr("data-date-format"), format: $(this).attr("data-date-format"),
weekStart: $(this).attr("data-date-firstday") weekStart: $(this).attr("data-date-firstday"),
language: $(this).attr("data-date-language")
}); });
}); });
@@ -171,7 +171,8 @@ $(document).ready(function()
autoclose: true, autoclose: true,
format: $(this).attr("data-date-format"), format: $(this).attr("data-date-format"),
weekStart: $(this).attr("data-date-firstday"), weekStart: $(this).attr("data-date-firstday"),
showMeridian: $(this).attr("data-date-ampm") showMeridian: $(this).attr("data-date-ampm"),
language: $(this).attr("data-date-language")
}); });
}); });