From 12035234e6d39063f6af74f1375526b60faf1305 Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Tue, 15 Dec 2020 09:16:57 +0100
Subject: [PATCH] fixed some localization problems
---
resources/lang/de/spende.php | 4 ++--
resources/lang/en/spende.php | 4 ++--
resources/views/spende/spende.blade.php | 9 ++++++---
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/resources/lang/de/spende.php b/resources/lang/de/spende.php
index 4b7195945..9f4dc052b 100644
--- a/resources/lang/de/spende.php
+++ b/resources/lang/de/spende.php
@@ -2,7 +2,7 @@
return [
'headline.1' => 'Ihre Spende für SUMA-EV und MetaGer',
- 'headline.2' => 'Mit Ihrer Spende unterstützen Sie den Erhalt und die Weiterentwicklung der unabhängigen Suchmaschine metager.de und die Arbeit des gemeinnützigen Trägervereins SUMA-EV. <a href="/about" rel="noopener" target=_blank>Mehr erfahren</a> und <a href="/beitritt" target="_blank" rel="noopener">Mitglied werden.</a>.',
+ 'headline.2' => 'Mit Ihrer Spende unterstützen Sie den Erhalt und die Weiterentwicklung der unabhängigen Suchmaschine metager.de und die Arbeit des gemeinnützigen Trägervereins SUMA-EV. <a href=":aboutlink" rel="noopener" target=_blank>Mehr erfahren</a> und <a href=":beitrittlink" target="_blank" rel="noopener">Mitglied werden.</a>.',
'headline.3' => 'Welchen Betrag möchten Sie spenden?',
'headline.4' => 'Wie regelmäßig möchten Sie spenden?',
@@ -21,7 +21,7 @@ return [
'head.lastschrift' => 'Lastschrift',
'ueberweisung' => 'Ãœberweisung',
- 'paypal' => 'Paypal',
+ 'paypal' => 'Paypal / Kreditkarte',
'bankinfo.1' => 'Um für den SUMA-EV unseren Trägerverein zu spenden, brauchen Sie nur eine Überweisung auf folgendes Konto zu tätigen:',
diff --git a/resources/lang/en/spende.php b/resources/lang/en/spende.php
index e92817691..b89f9bdf0 100644
--- a/resources/lang/en/spende.php
+++ b/resources/lang/en/spende.php
@@ -2,7 +2,7 @@
return [
"headline.1" => "Your Donation for MetaGer to SUMA-EV",
- "headline.2" => 'With your donation: you support maintenance and development of the independent search engine metager.org and its supporting association SUMA-EV. <a href="https://metager.org/about" rel="noopener" target=_blank>Read more</a> and <a href="https://metager.org/beitritt" target="_blank" rel="noopener">become a member.</a>',
+ "headline.2" => 'With your donation: you support maintenance and development of the independent search engine metager.org and its supporting association SUMA-EV. <a href=":aboutlink" rel="noopener" target=_blank>Read more</a> and <a href=":beitrittlink" target="_blank" rel="noopener">become a member.</a>',
'headline.3' => 'How much would you like to donate?',
'headline.4' => 'How frequent do you want to donate?',
@@ -22,7 +22,7 @@ return [
'head.lastschrift' => 'Sepa direct debit',
'ueberweisung' => 'Bank transfer',
- 'paypal' => 'Paypal',
+ 'paypal' => 'Paypal / Credit Card',
"bankinfo.1" => "By bank transfer",
"bankinfo.2" => "SUMA-EV",
diff --git a/resources/views/spende/spende.blade.php b/resources/views/spende/spende.blade.php
index 358dd6fb2..b3602254d 100644
--- a/resources/views/spende/spende.blade.php
+++ b/resources/views/spende/spende.blade.php
@@ -7,8 +7,11 @@
@section('content')
<div id="donation">
<div class="section">
- <h1>{!! trans('spende.headline.1') !!}</h1>
- <p>{!! trans('spende.headline.2') !!}</p>
+ <h1>@lang('spende.headline.1')</h1>
+ <p>@lang('spende.headline.2', [
+ 'aboutlink' => LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), '/about'),
+ 'beitrittlink' => LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), '/beitritt')
+ ])</p>
</div>
<div class="two-col">
@@ -71,7 +74,7 @@
<h3>{!! trans('spende.headline.3') !!}</h3>
<div class="amount-row">
- <input type="radio" value="5" class="amount-radio" name="amount" id="amount-5euro" required="required"checked="checked"> <label for="amount-5euro" class="amount-label">5€</label>
+ <input type="radio" value="5" class="amount-radio" name="amount" id="amount-5euro" required="required" checked="checked"> <label for="amount-5euro" class="amount-label">5€</label>
<input type="radio" value="10" class="amount-radio" name="amount" id="amount-10euro" required="required"><label for="amount-10euro" class="amount-label">10€</label>
<input type="radio" value="15" class="amount-radio" name="amount" id="amount-15euro" required="required"><label for="amount-15euro" class="amount-label">15€</label>
<input type="radio" value="20" class="amount-radio" name="amount" id="amount-20euro" required="required"><label for="amount-20euro" class="amount-label">20€</label>
--
GitLab