projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:kivitendo/kivitendo-erp
[kivitendo-erp.git]
/
SL
/
Locale.pm
diff --git
a/SL/Locale.pm
b/SL/Locale.pm
index
15b57df
..
4fc7a5e
100644
(file)
--- a/
SL/Locale.pm
+++ b/
SL/Locale.pm
@@
-383,7
+383,12
@@
sub parse_date_to_object {
sub format_date_object_to_time {
my ($self, $datetime, %params) = @_;
sub format_date_object_to_time {
my ($self, $datetime, %params) = @_;
- return $datetime->strftime('%H:%M');
+ my $format = $::myconfig{timeformat} || 'hh:mm';
+ $format =~ s/hh/\%H/;
+ $format =~ s/mm/\%M/;
+ $format =~ s/ss/\%S/;
+
+ return $datetime->strftime($format);
}
sub format_date_object {
}
sub format_date_object {