projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
locales.pl: mehrere t8() in einer Zeile richtig behandeln
[kivitendo-erp.git]
/
SL
/
Locale.pm
diff --git
a/SL/Locale.pm
b/SL/Locale.pm
index
8fa3780
..
5503c1b
100644
(file)
--- a/
SL/Locale.pm
+++ b/
SL/Locale.pm
@@
-328,7
+328,7
@@
sub date {
} elsif ($myconfig->{dateformat} eq "yyyy-mm-dd") {
# Use German syntax with the ISO date style "yyyy-mm-dd" because
} elsif ($myconfig->{dateformat} eq "yyyy-mm-dd") {
# Use German syntax with the ISO date style "yyyy-mm-dd" because
- #
Lx-Office
is mainly used in Germany or German speaking countries.
+ #
kivitendo
is mainly used in Germany or German speaking countries.
if (defined $longformat && $longformat == 0) {
$mm++;
$dd = "0$dd" if ($dd < 10);
if (defined $longformat && $longformat == 0) {
$mm++;
$dd = "0$dd" if ($dd < 10);
@@
-403,8
+403,7
@@
sub format_date_object {
my ($self, $datetime, %params) = @_;
my $format = $::myconfig{dateformat} || 'yyyy-mm-dd';
my ($self, $datetime, %params) = @_;
my $format = $::myconfig{dateformat} || 'yyyy-mm-dd';
- $format =~ s/yyyy/\%Y/;
- $format =~ s/yy/\%y/;
+ $format =~ s/yy(?:yy)?/\%Y/;
$format =~ s/mm/\%m/;
$format =~ s/dd/\%d/;
$format =~ s/mm/\%m/;
$format =~ s/dd/\%d/;