projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Progress genauer anzeigen
[kivitendo-erp.git]
/
SL
/
Locale.pm
diff --git
a/SL/Locale.pm
b/SL/Locale.pm
index
8a2caa2
..
ccf4943
100644
(file)
--- a/
SL/Locale.pm
+++ b/
SL/Locale.pm
@@
-214,6
+214,8
@@
sub text {
my $self = shift;
my $text = shift;
my $self = shift;
my $text = shift;
+ return $text->translated if (ref($text) || '') eq 'SL::Locale::String';
+
if ($self->{texts}->{$text}) {
$text = $self->{iconv}->convert($self->{texts}->{$text});
} else {
if ($self->{texts}->{$text}) {
$text = $self->{iconv}->convert($self->{texts}->{$text});
} else {
@@
-326,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);
@@
-547,7
+549,7
@@
__END__
=head1 NAME
=head1 NAME
-Locale - Functions for dealing with locale-depend
a
nt information
+Locale - Functions for dealing with locale-depend
e
nt information
=head1 SYNOPSIS
=head1 SYNOPSIS