$locale->text() so erweitert, dass weitere Argumente direkt an Form::format_string...

diff --git a/SL/Locale.pm b/SL/Locale.pm
index a6756fefeae0d3024ffb68ca6d1521aef13f8e1b..5454e74c572db506396b352dc08a2f01ed7c8919 100644 (file)
--- a/SL/Locale.pm
+++ b/SL/Locale.pm
@@ -91,13 +91,20 @@ sub new {
 }
 
 sub text {
 }
 
 sub text {

-  my ($self, $text) = @_;
+  my $self = shift;
+  my $text = shift;

 
   if (exists $self->{texts}->{$text}) {
 
   if (exists $self->{texts}->{$text}) {

-    return $self->{iconv}->convert($self->{texts}->{$text});
+    $text = $self->{iconv}->convert($self->{texts}->{$text});
+  } else {
+    $text = $self->{iconv_english}->convert($text);

   }
 
   }
 

-  return $self->{iconv_english}->convert($text);
+  if (@_) {
+    $text = Form->format_string($text, @_);
+  }
+
+  return $text;

 }
 
 sub findsub {
 }
 
 sub findsub {

diff --git a/locale/de/locales.pl b/locale/de/locales.pl
index 5bf561091e1220ffbfb7e40eff573648ff4b0220..70ca6d20e47c72647f2f913a6a859211de302b84 100755 (executable)
--- a/locale/de/locales.pl
+++ b/locale/de/locales.pl
@@ -277,7 +277,7 @@ sub extract_text_between_parenthesis {
       } elsif (($cur_char eq '"') || ($cur_char eq '\'')) {
         $inside_string = $cur_char;
 
       } elsif (($cur_char eq '"') || ($cur_char eq '\'')) {
         $inside_string = $cur_char;
 

-      } elsif ($cur_char eq ")") {
+      } elsif (($cur_char eq ")") || ($cur_char eq ',')) {

         return ($text, substr($line, $pos + 1));
       }
 
         return ($text, substr($line, $pos + 1));
       }