X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLocale.pm;h=4fc7a5ee0da13a4e3f08eb63ea81892b18861139;hb=fba56a49429a170e00a0f26f15784303eb99e108;hp=15b57df38570267625db779af1e61f4bcb42199d;hpb=3711d95e5e6f1df8c1950c033f4c3549a7c126fd;p=kivitendo-erp.git diff --git a/SL/Locale.pm b/SL/Locale.pm index 15b57df38..4fc7a5ee0 100644 --- 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) = @_; - 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 {