From 6a751412f2815f29cc8c7a1143197beb0f7c8dc3 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 9 Jul 2007 13:02:56 +0000
Subject: [PATCH] =?utf8?q?Beim=20Versenden=20per=20Email=20eine=20anst?=
 =?utf8?q?=C3=A4ndige=20=C3=9Cberschrift=20anzeigen=20und=20nicht=20"email?=
 =?utf8?q?=20oe".?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 SL/Form.pm        | 14 +++++++++++---
 bin/mozilla/io.pl |  3 +--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/SL/Form.pm b/SL/Form.pm
index 978a01596..d1dbfb631 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -982,8 +982,10 @@ Content-Length: $numbytes
   $main::lxdebug->leave_sub();
 }
 
-sub generate_attachment_filename {
-  my ($self) = @_;
+sub get_formname_translation {
+  my ($self, $formname) = @_;
+
+  $formname ||= $self->{formname};
 
   my %formname_translations = (
      bin_list            => $main::locale->text('Bin List'),
@@ -1000,7 +1002,13 @@ sub generate_attachment_filename {
      storno_packing_list => $main::locale->text('Storno Packing List'),
   );
 
-  my $attachment_filename = $formname_translations{$self->{"formname"}};
+  return $formname_translations{$formname}
+}
+
+sub generate_attachment_filename {
+  my ($self) = @_;
+
+  my $attachment_filename = $self->get_formname_translation();
   my $prefix = 
       (grep { $self->{"type"} eq $_ } qw(invoice credit_note)) ? "inv"
     : ($self->{"type"} =~ /_quotation$/)                       ? "quo"
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index b27d22867..f783c19c0 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1321,8 +1321,7 @@ sub edit_e_mail {
     $form->{"email"} = $form->{"cp_email"};
   }
 
-  $form->{ $form->{vc} } =~ /--/;
-  $title = $locale->text('E-mail') . " $`";
+  $title = $locale->text('E-mail') . " " . $form->get_formname_translation();
 
   $form->{oldmedia} = $form->{media};
   $form->{media}    = "email";
-- 
2.20.1