From 466fda5253633552a980f07e18c2d273c05e50f6 Mon Sep 17 00:00:00 2001 From: karl Date: Tue, 31 May 2016 12:48:44 +0200 Subject: [PATCH] =?UTF-8?q?+=20=C3=9Cbersetzungen=20f=C3=BCr=20die=20Seite?= =?UTF-8?q?ntitel=20*=20Impressum=20zu=20Site=20Notice=20ge=C3=A4ndert=20*?= =?UTF-8?q?=20Widget=20Seite=20auf=20Routes.php=20eingef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/routes.php | 25 ++++++++++++++++--------- public/css/widget.css | 7 +++++++ resources/lang/de/impressum.php | 2 ++ resources/lang/de/titles.php | 13 +++++++++++++ resources/lang/en/impressum.php | 2 ++ resources/lang/en/staticPages.php | 2 +- resources/lang/en/titles.php | 13 +++++++++++++ resources/views/impressum.blade.php | 2 +- 8 files changed, 55 insertions(+), 11 deletions(-) create mode 100644 public/css/widget.css create mode 100644 resources/lang/de/titles.php create mode 100644 resources/lang/en/titles.php diff --git a/app/Http/routes.php b/app/Http/routes.php index 18df07b0..41b47489 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -17,39 +17,39 @@ Route::get('/', function() { return view('index', [ - 'title' => 'MetaGer: Sicher suchen & finden, Privatsphäre schützen', + 'title' => trans('titles.index'), 'homeIcon']); }); Route::get('impressum', function() { return view('impressum') - ->with('title', 'Impressum - MetaGer') + ->with('title', trans('titles.impressum')) ->with('css', 'impressum.css'); }); Route::get('about', function() { return view('about') - ->with('title', 'Über Uns - MetaGer') + ->with('title', trans('titles.about')) ->with('css', 'about.css'); }); Route::get('team', function() { return view('team.team') - ->with('title', 'Team - MetaGer') + ->with('title', trans('titles.team')) ->with('css', 'team.css'); }); Route::get('team/pubkey-wsb', function() { return view('team.pubkey-wsb') - ->with('title', 'Team - MetaGer'); + ->with('title', trans('titles.team')); }); Route::get('kontakt', function() { return view('kontakt.kontakt') - ->with('title', 'Kontakt - MetaGer') + ->with('title', trans('titles.kontakt')) ->with('css', 'kontakt.css') ->with('js', ['openpgp.min.js','kontakt.js']); }); @@ -61,7 +61,7 @@ Route::get('spende', function() { return view('spende') - ->with('title', 'Spenden - MetaGer') + ->with('title', trans('titles.spende')) ->with('css', 'donation.css'); }); Route::post('spende', 'MailController@donation'); @@ -69,16 +69,23 @@ Route::get('datenschutz', function() { return view('datenschutz') - ->with('title', 'Datenschutz und Privatsphäre - MetaGer') + ->with('title', trans('titles.datenschutz')) ->with('css', 'privacy.css'); }); Route::get('hilfe', function() { return view('hilfe') - ->with('title', 'Hilfe - MetaGer') + ->with('title', trans('titles.hilfe')) ->with('css', 'help.css'); }); + Route::get('widget', function() + { + return view('widget') + ->with('title', trans('titles.widget')) + ->with('css', 'widget.css'); + }); + Route::get('meta/meta.ger3', 'MetaGerSearch@test'); }); diff --git a/public/css/widget.css b/public/css/widget.css new file mode 100644 index 00000000..45e7719f --- /dev/null +++ b/public/css/widget.css @@ -0,0 +1,7 @@ +*{ + +} + +p { + white-space: pre-wrap; +} \ No newline at end of file diff --git a/resources/lang/de/impressum.php b/resources/lang/de/impressum.php index 08fc448e..2b937768 100644 --- a/resources/lang/de/impressum.php +++ b/resources/lang/de/impressum.php @@ -1,6 +1,8 @@ 'Impressum', + 'headline.1' => 'SUMA-EV - Verein für freien Wissenszugang (e.V.)', 'headline.2' => 'in Kooperation mit der', diff --git a/resources/lang/de/titles.php b/resources/lang/de/titles.php new file mode 100644 index 00000000..bd320e15 --- /dev/null +++ b/resources/lang/de/titles.php @@ -0,0 +1,13 @@ + 'MetaGer: Sicher suchen & finden, Privatsphäre schützen', + 'impressum' => 'Impressum - MetaGer', + 'about' => 'Über Uns - MetaGer', + 'team' => 'Team - MetaGer', + 'kontakt' => 'Kontakt - MetaGer', + 'spende' => 'Spenden - MetaGer', + 'datenschutz' => 'Datenschutz und Privatsphäre - MetaGer', + 'hilfe' => 'Hilfe - MetaGer', + 'widget' => 'MetaGer Widget' +]; \ No newline at end of file diff --git a/resources/lang/en/impressum.php b/resources/lang/en/impressum.php index 96ec7c3e..187e9e6e 100644 --- a/resources/lang/en/impressum.php +++ b/resources/lang/en/impressum.php @@ -1,6 +1,8 @@ 'Site Notice', + 'headline.1' => 'SUMA-EV - Verein für freien Wissenszugang (e.V.)', 'headline.2' => 'in cooperation with the', diff --git a/resources/lang/en/staticPages.php b/resources/lang/en/staticPages.php index 9b7198d4..5d61d987 100644 --- a/resources/lang/en/staticPages.php +++ b/resources/lang/en/staticPages.php @@ -8,7 +8,7 @@ return [ 'nav5' => 'Contact', 'nav6' => 'Team', 'nav7' => 'About us', - 'nav8' => 'Impressum', + 'nav8' => 'Site Notice', 'nav9' => 'Help', 'nav10' => 'Widget', 'nav11' => 'Associator', diff --git a/resources/lang/en/titles.php b/resources/lang/en/titles.php new file mode 100644 index 00000000..67c4be27 --- /dev/null +++ b/resources/lang/en/titles.php @@ -0,0 +1,13 @@ + 'MetaGer: Search and Find Savely, Protect Privacy', + 'impressum' => 'Site Notice - MetaGer', + 'about' => 'About Us - MetaGer', + 'team' => 'Team - MetaGer', + 'kontakt' => 'Contact - MetaGer', + 'spende' => 'Donation - MetaGer', + 'datenschutz' => 'Privacy - MetaGer', + 'hilfe' => 'Help - MetaGer', + 'widget' => 'MetaGer Widget' +]; \ No newline at end of file diff --git a/resources/views/impressum.blade.php b/resources/views/impressum.blade.php index 5372509d..fc07d444 100644 --- a/resources/views/impressum.blade.php +++ b/resources/views/impressum.blade.php @@ -3,7 +3,7 @@ @section('title', $title ) @section('content') -

Impressum

+

{{ trans('impressum.title') }}

{{ trans('impressum.headline.1') }}

{{ trans('impressum.headline.2') }} Leibniz Universität Hannover

{{ trans('impressum.info.1') }} SUMA-EV

-- GitLab