X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLocale.pm;h=ccf494343e9fbf843ced5e3acd17738ed6af8fa8;hb=98f37c1019ea0e80d5a45a5633a0a182a43cbf9a;hp=8a2caa2c0bfb7e335b046f88eb94a075ea4508e5;hpb=a1a9bb961ab49ee053cb208ea01e17430d0ca836;p=kivitendo-erp.git diff --git a/SL/Locale.pm b/SL/Locale.pm index 8a2caa2c0..ccf494343 100644 --- a/SL/Locale.pm +++ b/SL/Locale.pm @@ -214,6 +214,8 @@ sub text { 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 { @@ -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 - # 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); @@ -547,7 +549,7 @@ __END__ =head1 NAME -Locale - Functions for dealing with locale-dependant information +Locale - Functions for dealing with locale-dependent information =head1 SYNOPSIS