This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 9e35e23de7d045090d136071a9301cc529cbc988 (commit)
from 18b69e84d9210fbb58a696c96b9db88fa1d57717 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=9e35e23de7d045090d136071a9301cc529cbc988
commit 9e35e23de7d045090d136071a9301cc529cbc988
Author: Stéphane-Eymeric Bredthauer <[email protected]>
Date: Mon Dec 12 12:55:26 2016 +0100
Tracker: datetime forma fix
diff --git a/src/common/tracker/include/ArtifactTypeHtml.class.php
b/src/common/tracker/include/ArtifactTypeHtml.class.php
index ffafcb4..38a56b6 100644
--- a/src/common/tracker/include/ArtifactTypeHtml.class.php
+++ b/src/common/tracker/include/ArtifactTypeHtml.class.php
@@ -1106,7 +1106,8 @@ class ArtifactTypeHtml extends ArtifactType {
*/
function renderDatetime($extra_field_id, $datetime, $attrs = array()) {
if (!$datetime=='') {
- $datetime = date('Y-m-d H:i',$datetime);
+ $datetime_format = _('Y-m-d H:i');
+ $datetime = date($datetime_format,$datetime);
}
return html_e('input', array_merge(array('type'=>'text',
'name'=>'extra_fields['.$extra_field_id.']', 'class'=>'datetimepicker',
'value'=>$datetime),$attrs));
}
diff --git a/src/www/include/jquery_plugins.php
b/src/www/include/jquery_plugins.php
index a075a4c..681e295 100644
--- a/src/www/include/jquery_plugins.php
+++ b/src/www/include/jquery_plugins.php
@@ -28,6 +28,7 @@ function init_datetimepicker() {
if (!in_array($language_code,array('en-GB','pt-BR','sr-YU','zh-TW'))) {
$language_code = substr($language_code, 0, 2);
}
- $javascript = "$.datetimepicker.setLocale('".$language_code."');
$('.datetimepicker').datetimepicker({format:'Y-m-d H:i'});";
+ $datetime_format = _('Y-m-d H:i');
+ $javascript = "$.datetimepicker.setLocale('".$language_code."');
$('.datetimepicker').datetimepicker({format:".$datetime_format."'});";
return html_e('script', array( 'type'=>'text/javascript'),
'//<![CDATA['."\n".'$(function(){'.$javascript.'});'."\n".'//]]>');
}
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/include/ArtifactTypeHtml.class.php | 3 ++-
src/www/include/jquery_plugins.php | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
