From b078dacca2320a20a573cc77dfe5f7e7aa1426a0 Mon Sep 17 00:00:00 2001
From: Dominik Pfennig <dominik@suma-ev.de>
Date: Tue, 6 Sep 2016 11:31:19 +0200
Subject: [PATCH] =?UTF-8?q?Texte=20ge=C3=A4ndert.=20Au=C3=9Ferdem=20gelang?=
=?UTF-8?q?en=20englische=20Spender=20nun=20auch=20auf=20die=20englische?=
=?UTF-8?q?=20Dankesseite?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Http/Controllers/MailController.php | 3 ++-
app/Http/routes.php | 4 ++--
resources/lang/en/spenden.php | 26 ++++++++++++-------------
3 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/app/Http/Controllers/MailController.php b/app/Http/Controllers/MailController.php
index d95346534..a536f3b8c 100644
--- a/app/Http/Controllers/MailController.php
+++ b/app/Http/Controllers/MailController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
+use LaravelLocalization;
use Mail;
class MailController extends Controller
@@ -114,7 +115,7 @@ class MailController extends Controller
} else {
$data = ['name' => $request->input('Name', 'Keine Angabe'), 'telefon' => $request->input('Telefon', 'Keine Angabe'), 'kontonummer' => $request->input('Kontonummer'), 'bankleitzahl' => $request->input('Bankleitzahl'), 'email' => $request->input('email', 'anonymous-user@metager.de'), 'nachricht' => $request->input('Nachricht')];
$data = base64_encode(serialize($data));
- return redirect(url('/spende/danke', ['data' => $data]));
+ return redirect(LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), route("danke", ['data' => $data])));
}
}
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 34b622fba..7d9d8d970 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -72,13 +72,13 @@ Route::group(
->with('css', 'donation.css')
->with('navbarFocus', 'foerdern');
});
- Route::get('spende/danke/{data}', function ($data) {
+ Route::get('spende/danke/{data}', ['as' => 'danke', function ($data) {
return view('spende.danke')
->with('title', trans('titles.spende'))
->with('css', ['donation.css', 'danke.css'])
->with('navbarFocus', 'foerdern')
->with('data', unserialize(base64_decode($data)));
- });
+ }]);
Route::get('partnershops', function () {
return view('spende.partnershops')
->with('title', trans('titles.partnershops'))
diff --git a/resources/lang/en/spenden.php b/resources/lang/en/spenden.php
index 6c272056c..7d3223789 100644
--- a/resources/lang/en/spenden.php
+++ b/resources/lang/en/spenden.php
@@ -1,9 +1,8 @@
<?php
return [
- 'headline.1' => 'Your Donation for SUMA-EV and MetaGer',
- 'headline.2' => 'Help us keep open search engines stay open on the internet. The digital knowledge of the world must stay free from state or concern paternalism and be publicly accessible.',
-
+ 'headline.1' => 'Your Donation for MetaGer to SUMA-EV',
+ 'headline.2' => 'Please help to keep free and open search engines free and open on the Internet. The digital knowledge of the world must stay free from surveillance and control by governments or companies and must be publicly accessible to everyone.',
'bankinfo.1' => 'By bank transfer',
'bankinfo.2' => 'SUMA-EV
IBAN: DE64 4306 0967 4075 0332 01
@@ -31,22 +30,23 @@ your E-Mail adress on the money transfer form.',
'lastschrift.10' => 'Your information is transmitted encrypted and is not read by a third party. The amount you enter will be debited from your account by us. SUMA-EV only uses your information for accounting; Your information is not passed on. Donations to the SUMA-EV are tax-deductible, because the association is recognized as charitable by the Finanzamt Hannover Nord (revenue board), listed in the register of associations, Amtsgericht Hannover under VR200033. A certificate for single donations above 200,-EUR is sent automatically. For donations below 200,-EUR an account current is enough for tax-deduction.',
'about.0' => 'About us',
- 'about.1.1' => 'The german search engine MetaGer is operated and constantly refined by the SUMA-EV - Verein für freien Wissenszugang. We are a charitable association, one of our goals is the development and operation of search engines. We do not receive any public funds and therefore are relying on your donations.
-Help us preserve and develop open search engines on the internet.
-You can do this by donating on our website. Or if you want to help open search engines on the long run:',
+ 'about.1.1' => 'The German search engine MetaGer is operated and permanently refined by SUMA-EV - Verein für freien Wissenszugang. We are a charitable NGO and one of our goals is the development and operation of search engines. We do not receive any public funds and therefore are relying on your donations.
+Please help to preserve and develop free and open search engines on the Internet. You can do this by donating on our website.
+Or if you want to help open search engines on the long run:',
'about.1.2' => 'Become a SUMA-EV member',
'about.2.1' => 'If you donate more than 50,-EUR or become a member of the',
- 'about.2.2' => ', you get to namely appear on our',
+ 'about.2.2' => ', you or your company might appear on our',
'about.2.3' => 'members and sponsors page',
- 'about.2.4' => 'with your homepage (if avaylable). (If you want this, please tell us in your donation message.)',
+ 'about.2.4' => 'linked to
+your homepage (if available). If you want that, please tell us within your donation message.',
'about.2.5' => 'Or become SUMA-EV sponsor!',
'about.3.1' => 'Every form of support',
- 'about.3.2' => 'helps open search engines and open knowledge access to have a chance on the internet. Open Knowledge access also includes that neither your information is monitored, nor your internet adresses and connection data is collected. We anonymise your internet adress during search, it is not stored and not passed on. Open internet search without surveillance:',
- 'about.4.1' => 'Another possibility to help MetaGer is to make your next online purchase at a MetaGer support shop. We became part of the',
- 'about.4.2' => 'to be able to be helped this way. The project unites around 400 online shops (from Amazon to Zooplus), that all declared to donate around 6% of every sale. Instead of directly browsing the online shop, use this link next time: ',
+ 'about.3.2' => 'helps open search engines and open knowledge access to have a chance on the Internet. Open Knowledge access also includes that neither your information is monitored, nor your Internet adresses and connection data is collected. We anonymise your Internet adress during search, it is not stored and not passed on. Open Internet search without surveillance:',
+ 'about.4.1' => 'Another possibility to help MetaGer is to make your next online purchase via a MetaGer support shop. We became part of the',
+ 'about.4.2' => 'to be able to be supported this way. The project unites around 700 online shops (from Amazon to Zooplus), that all declared to donate around 6% of every sale. Instead of directly browsing the online shop, use this link next time: ',
'about.4.3' => 'and click below the search term box on',
- 'about.4.4' => 'Make your purchase at MetaGer support shops - click here!',
- 'about.4.5' => 'This click brings you to the boost project shop selection. There you choose your shop and keep on shopping as usual. That is all. If enough people do this, we do not need ads anymore. Just two clicks for you - a chance for open knowledge access for the digital world.',
+ 'about.4.4' => '"Purchase at affiliate shop" - click here!',
+ 'about.4.5' => 'This click brings you to the boost project shop selection. There you choose your shop and keep on shopping as usual. That is all. If enough people do this, we do not need ads anymore. Just two clicks for you - a chance for open knowledge access for the digital world.',
'danke.title' => 'Thank you very much!! We received your donation message for MetaGer to SUMA-EV',
'danke.nachricht' => 'If you submitted your contact data we will notify you personally soon.',
'danke.kontrolle' => 'The following message has reached us:',
--
GitLab