From f53d2777f7b4f93c67b505c589b06a9f226c4022 Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Tue, 2 Feb 2021 15:41:59 +0100
Subject: [PATCH] removed direct mail option
---
resources/lang/de/kontakt.php | 4 ----
resources/lang/en/kontakt.php | 4 ----
resources/lang/es/kontakt.php | 5 -----
resources/lang/fr/kontakt.php | 1 -
resources/views/kontakt/kontakt.blade.php | 13 +------------
5 files changed, 1 insertion(+), 26 deletions(-)
diff --git a/resources/lang/de/kontakt.php b/resources/lang/de/kontakt.php
index a9e314727..50e411deb 100644
--- a/resources/lang/de/kontakt.php
+++ b/resources/lang/de/kontakt.php
@@ -10,10 +10,6 @@ Alternativ können Sie uns natürlich auch per <a href="mailto:support@suma-ev.d
'form.6' => 'Ihre Nachricht',
'form.7' => 'Betreff',
'form.8' => 'Senden',
-
- 'mail.1' => 'Per E-Mail',
- 'mail.2' => 'Sie können uns auch direkt eine E-Mail an die folgende Adresse schicken: <a href="mailto::mail">:mail</a>',
- 'mail.3' => 'Falls Sie diese verschlüsseln wollen, finden Sie nachfolgend unseren öffentlichen OpenPGP-Schlüssel:',
'letter.1' => 'Per Brief-Post',
'letter.2' => 'Wir ziehen es vor, auf digitalem Wege kontaktiert zu werden.
Wenn Sie jedoch eine postalische Kontaktaufnahme als unbedingt nötig erachten,
diff --git a/resources/lang/en/kontakt.php b/resources/lang/en/kontakt.php
index df70727c6..f0698cb74 100644
--- a/resources/lang/en/kontakt.php
+++ b/resources/lang/en/kontakt.php
@@ -10,10 +10,6 @@ return [
'form.6' => 'Your message',
'form.7' => 'Subject',
'form.8' => 'Send',
-
- 'mail.1' => 'By Email',
- 'mail.2' => 'You can also email us directly at: <a href="mailto::mail">:mail</a>',
- 'mail.3' => 'If you want to encrypt your email you can use our following public OpenPGP-Key:',
'letter.1' => 'By Letter Mail',
'letter.2' => 'We prefer digital contact. However, if you consider it neccessary to contact us postally, you can mail us at:',
'letter.3' => 'SUMA-EV
diff --git a/resources/lang/es/kontakt.php b/resources/lang/es/kontakt.php
index 27ca5fb7b..fd305efe9 100644
--- a/resources/lang/es/kontakt.php
+++ b/resources/lang/es/kontakt.php
@@ -9,11 +9,6 @@ return [
"form.6" => "Su mensaje",
'form.7' => '<strong>Su mensaje será encryptada antes de mandarla <a href="http://openpgpjs.org/.">OpenPGP.js</a> para esto necesitamos Javascript.</strong> Sino tiene activado Javascript su mensaje será enviada sin encryptación.',
"form.8" => "Encriptar y enviar",
-
- "mail.1" => "Por email",
- "mail.2" => 'Nos puede mandar un email directamente a la siguiente direccion: <a href="mailto::mail">:mail</a>',
- "mail.3" => "Si la quiere encriptar, puede ver nuestra llave pública de OpenPGP aquÃ:",
-
"letter.1" => "Por carta",
"letter.2" => "Preferimos que nos contacte por medios digitales. Si lo ve indispensable contactarnos vÃa correo fisico, nos puede escribir a la siguiente dirección:",
"letter.3" => "SUMA-EV Röselerstr. 3 30159 Hannover Germany",
diff --git a/resources/lang/fr/kontakt.php b/resources/lang/fr/kontakt.php
index 0e3558380..a6c697073 100644
--- a/resources/lang/fr/kontakt.php
+++ b/resources/lang/fr/kontakt.php
@@ -3,7 +3,6 @@
return [
"headline.1" => "Contact",
"form.6" => "Votre message",
- "mail.1" => "Par Email",
"letter.1" => "Par courrier postal",
"letter.3" => "SUMA-EV Röselerstr. 3 30159 Hannover Allemagne"
];
\ No newline at end of file
diff --git a/resources/views/kontakt/kontakt.blade.php b/resources/views/kontakt/kontakt.blade.php
index 305b1b254..004e37fe0 100644
--- a/resources/views/kontakt/kontakt.blade.php
+++ b/resources/views/kontakt/kontakt.blade.php
@@ -35,18 +35,7 @@
<button title="" data-original-title="" class="btn btn-default encrypt-btn" type="submit">{!! trans('kontakt.form.8') !!}</button>
</div>
</form>
- </div>
- <div class="card-heavy">
- <h2>{!! trans('kontakt.mail.1') !!}</h2>
- @if(LaravelLocalization::getCurrentLocale() === "de")
- <p>{!! trans('kontakt.mail.2', ["mail" => "support@suma-ev.de"]) !!}</p>
- <p>{!! trans('kontakt.mail.3') !!}</p>
- <textarea id="pubkey" style="width:50%" rows="8" readonly>@include('kontakt/pgp')</textarea>
- @else
- <p>{!! trans('kontakt.mail.2', ["mail" => "support@metager.org"]) !!}</p>
- @endif
-
- </div>
+ </div>
<div class="card-heavy">
<h2>{!! trans('kontakt.letter.1') !!}</h2>
<p>{!! trans('kontakt.letter.2') !!}</p>
--
GitLab