X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLocale.pm;h=ccf494343e9fbf843ced5e3acd17738ed6af8fa8;hb=d74921657d967900bded4aaf4805647e9cf83562;hp=5016900fe29bce569057d5e3d4c95d08173c93d3;hpb=dd70b2b0ab95ac40943e8562589a5542c815e4f4;p=kivitendo-erp.git diff --git a/SL/Locale.pm b/SL/Locale.pm index 5016900fe..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);