Bei fehlender Übersetzung nicht übersetzten Begriff zurückggeben.

Conflicts:

	SL/Template/Plugin/LxERP.pm

diff --git a/SL/Template/Plugin/LxERP.pm b/SL/Template/Plugin/LxERP.pm
index df6cb6ad6cb4944131bb4e96f0063a5eceeef60c..8f3a9980dc4eecce184a5273eafd6e9aa77ed904 100644 (file)
--- a/SL/Template/Plugin/LxERP.pm
+++ b/SL/Template/Plugin/LxERP.pm
@@ -109,7 +109,7 @@ sub abs {
 sub t8 {
   my ($self, $text, $args) = @_;
   $self->{locale} ||= Locale->new($::myconfig{countrycode}, 'all');
 sub t8 {
   my ($self, $text, $args) = @_;
   $self->{locale} ||= Locale->new($::myconfig{countrycode}, 'all');

-  return $self->{locale}->text($text, @{ $args || [] });
+  return $self->{locale}->text($text, @args) || $text;

 }
 
 1;
 }
 
 1;

diff --git a/SL/Template/Plugin/T8.pm b/SL/Template/Plugin/T8.pm
index 339faa94157a1a59fb7a47403eee10170939df75..e736e0cd24635ca360bf20abe704a836be40db73 100644 (file)
--- a/SL/Template/Plugin/T8.pm
+++ b/SL/Template/Plugin/T8.pm
@@ -18,7 +18,7 @@ sub init {
 
 sub filter {
   my ($self, $text, $args) = @_;
 
 sub filter {
   my ($self, $text, $args) = @_;

-  return $locale->text($text, @{ $args || [] });
+  return $locale->text($text, @{ $args || [] }) || $text;

 }
 
 return 'SL::Template::Plugin::T8';
 }
 
 return 'SL::Template::Plugin::T8';