From 8ec984acf7c46bde9a1da0e060503218e33e5b25 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20B=C3=BCren?= Date: Sun, 30 Jul 2017 09:29:33 +0200 Subject: [PATCH] =?utf8?q?vergessene=20Backend-Funktion=20f=C3=BCr=20E-Mai?= =?utf8?q?l-Vorbelegung?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Ferner eine Fußnote als Hinweis zur Vorbelegungs-Funktion gesetzt. --- SL/Form.pm | 32 +++++++++++++++++++ locale/de/all | 2 ++ .../webpages/common/_send_email_dialog.html | 4 ++- 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/SL/Form.pm b/SL/Form.pm index 470809f77..f29c60128 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -1375,6 +1375,38 @@ sub generate_email_subject { return $subject; } +sub generate_email_body { + $main::lxdebug->enter_sub(); + my ($self) = @_; + # simple german and english will work grammatically (most european languages as well) + # Dear Mr Alan Greenspan: + # Sehr geehrte Frau Meyer, + # A l’attention de Mme Villeroy, + # Gentile Signora Ferrari, + my $body = ''; + + if ($self->{cp_id}) { + my $givenname = SL::DB::Contact->load_cached($self->{cp_id})->cp_givenname; # for qw(gender givename name); + my $name = SL::DB::Contact->load_cached($self->{cp_id})->cp_name; # for qw(gender givename name); + my $gender = SL::DB::Contact->load_cached($self->{cp_id})->cp_gender; # for qw(gender givename name); + my $mf = $gender eq 'f' ? 'female' : 'male'; + $body = GenericTranslations->get(translation_type => "salutation_$mf", language_id => $self->{language_id}); + $body .= ' ' . $givenname . ' ' . $name if $body; + } else { + $body = GenericTranslations->get(translation_type => "salutation_general", language_id => $self->{language_id}); + } + + return undef unless $body; + + $body .= GenericTranslations->get(translation_type =>"salutation_punctuation_mark", language_id => $self->{language_id}) . "\n"; + $body .= GenericTranslations->get(translation_type =>"preset_text_$self->{formname}", language_id => $self->{language_id}); + + $body = $main::locale->unquote_special_chars('HTML', $body); + + $main::lxdebug->leave_sub(); + return $body; +} + sub cleanup { $main::lxdebug->enter_sub(); diff --git a/locale/de/all b/locale/de/all index 4df7f503d..52e36df15 100755 --- a/locale/de/all +++ b/locale/de/all @@ -36,6 +36,7 @@ $self->{texts} = { '...done' => '...fertig', '...on the TODO list' => '...auf der Aufgabenliste', '0% tax with taxkey' => '0% Steuer mit Steuerschlüssel ', + '1)' => '1)', '1. Quarter' => '1. Quartal', '2 years' => '2 Jahre', '2. Quarter' => '2. Quartal', @@ -3310,6 +3311,7 @@ $self->{texts} = { 'Time/cost estimate actions' => 'Aktionen für Kosten-/Zeitabschätzung', 'Timerange' => 'Zeitraum', 'Timestamp' => 'Uhrzeit', + 'Tired of copying always nice phrases for this message? Click here to use the new preset message option!' => 'Müde vom vielen Copy & Paste aus vorherigen Anschreiben? Hier klicken, um E-Mail-Texte vorzudefinieren!', 'Title' => 'Titel', 'To' => 'An', 'To (email)' => 'An', diff --git a/templates/webpages/common/_send_email_dialog.html b/templates/webpages/common/_send_email_dialog.html index 51565a6f3..e875af6b4 100644 --- a/templates/webpages/common/_send_email_dialog.html +++ b/templates/webpages/common/_send_email_dialog.html @@ -50,7 +50,9 @@ - [% LxERP.t8("Message") %] + [% LxERP.t8("Message") %] + [% L.link("generictranslations.pl?action=edit_email_strings", "1)", title=LxERP.t8('Tired of copying always nice phrases for this message? Click here to use the new preset message option!'), target="_blank") %] + [% L.textarea_tag("email_form.message", email_form.message, rows="15" cols="80" wrap="soft") %] -- 2.20.1