From f7131dea0df1b12a84d189b9dd0c2bc18f25663a Mon Sep 17 00:00:00 2001
From: Carsten Riel <carsten@suma-ev.de>
Date: Wed, 20 Feb 2019 10:54:38 +0100
Subject: [PATCH] Update resources/lang/en/resultPage.php,
resources/lang/en/result.php, resources/lang/en/hilfe.php,
resources/lang/de/hilfe.php, resources/views/hilfe.blade.php files
---
resources/lang/de/hilfe.php | 8 ++++++++
resources/lang/en/hilfe.php | 9 ++++++++-
resources/lang/en/result.php | 17 +++++++++--------
resources/lang/en/resultPage.php | 2 +-
resources/views/hilfe.blade.php | 14 ++++++++++++++
5 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/resources/lang/de/hilfe.php b/resources/lang/de/hilfe.php
index f8ea56cd8..393387c93 100644
--- a/resources/lang/de/hilfe.php
+++ b/resources/lang/de/hilfe.php
@@ -3,6 +3,14 @@
return [
"achtung" => "Achtung, da unsere Suchmaschine ständig weiterentwickelt und verbessert wird, kann es dazu kommen, dass sich immer wieder Änderungen an Aufbau und Funktion ergeben. Wir versuchen zwar die Hilfe schnellstmöglich den Änderungen entsprechend anzupassen, können jedoch nicht ausschließen, dass es zu temporären Unstimmigkeiten in Teilen der Erklärungen kommt.",
"title" => "MetaGer - Hilfe",
+
+ "searchfield.title" => 'Das Suchfeld',
+ "searchfield.info" => 'Das Suchfeld besteht aus mehreren Teilen:',
+ "searchfield.memberkey" => 'Dem Schlüsselsymbol (nur für Vereinsmitglieder): Hier können die Mitglieder des SUMA-EV Ihren Schlüssel eingeben, um die werbefreie Suche nutzen zu können. Sie wollen das auch? Werden Sie Mitglied: <a href = "/beitritt/">Beitrittsantrag</a>',
+ "searchfield.slot" => 'Dem Suchfeld: Geben Sie hier Ihren Suchbegriff ein.',
+ "searchfield.search" => 'Der Lupe: Starten Sie die Suche.' ,
+ "result.top" => 'Auf der Ergebnisseite: Klicken / drücken Sie auf das Filterzeichen, um alle Filterfunktionen benutzen zu können.' ,
+
"stopworte.title" => "Stoppworte",
"stopworte.1" => "Wenn Sie unter den MetaGer-Suchergebnissen solche ausschließen wollen, in denen bestimmte Worte (Ausschlussworte / Stopworte) vorkommen, dann erreichen Sie das, indem Sie diese Worte mit einem Minus versehen.",
"stopworte.2" => "Beispiel: Sie suchen ein neues Auto, aber auf keinen Fall einen BMW. Ihre Eingabe lautet also:",
diff --git a/resources/lang/en/hilfe.php b/resources/lang/en/hilfe.php
index 0e5f24e14..3786b584c 100644
--- a/resources/lang/en/hilfe.php
+++ b/resources/lang/en/hilfe.php
@@ -3,6 +3,13 @@ return [
"achtung" => "Warning! Structure and functionality of our website are subject to constant development and changes. We try to update our help pages as quickly as possible, but can not prevent temporary mistakes.",
"title" => "MetaGer Help",
+ "searchfield.title" => 'The search field',
+ "searchfield.info" => 'The search field contains:',
+ "searchfield.memberkey" => 'The key symbol (only SUMA-EV members): Members can enter a private key to use the "free-of-advertising" metager search. If you want this too, just become a member: <a href = "https://metager.org/beitritt">Membership form</a>',
+ "searchfield.slot" => 'The search field: Enter your words here.',
+ "searchfield.search" => 'The magnifier: Start your search.' ,
+ "result.top" => 'On the results page: Click / Touch the filter symbol to activate all filter options.' ,
+
"stopworte.title" => "Exclude single words",
"stopworte.1" => "If you want to exclude words within the search result, you have to put a \"-\" in front of that word",
"stopworte.2" => "Example: You are looking for a new car, but no BMW. Then your search should be <div class=\"well well-sm\">new car -bmw</div>",
@@ -30,7 +37,7 @@ return [
"result.info.anonym" => '"OPEN ANONYMOUSLY": the page will be opened under the proxy protection. There is some information about the proxy further down here.',
"result.info.more" => '"MORE": you will get more options, the result changes its appearance to',
"result.info.2" => 'The new options are:',
- "result.info.saveresult" => '"Save result in TAB"(Only desktop): The result will be stored in a new TAB. It´ s used for collecting results out of several searches. This TAB appears on the right side of your screen. (info: <a href="#searchinsearch"> Search in search</a>)',
+ "result.info.saveresult" => '"Save result in TAB" (Only desktop): The result will be stored in a new TAB. It´ s used for collecting results out of several searches. This TAB appears on the right side of your screen. (info: <a href="#searchinsearch"> Search in search</a>)',
"result.info.domainnewsearch" => '"start a new search on this domain": search only on this domain.',
"result.info.hideresult" => '"Hide": hide results from this domain. You can use this filter directly after your search words (e.g. my search words -site:*.wikipedia.org), filters can be concatenated and the wildcard "*" is allowed. Do one search with a filter and store it as a bookmark. Next time -using the bookmark- you have your settings active immediately.',
diff --git a/resources/lang/en/result.php b/resources/lang/en/result.php
index 923e34995..65b25b2c6 100644
--- a/resources/lang/en/result.php
+++ b/resources/lang/en/result.php
@@ -3,12 +3,13 @@
return [
'options.headline' => 'Options',
'options.savetab' => 'Save result in TAB',
- 'options.1' => 'start a new search on this domain',
- 'options.2' => 'hide :host',
- 'options.3' => 'hide *.:domain',
- 'options.4' => 'partnershop',
- 'options.5' => 'OPEN ANONYMOUSLY',
- 'options.6' => 'OPEN IN NEW TAB',
- 'options.7' => 'OPEN',
- 'proxytext' => 'Result link is opened anonymously. Your data will not be transfered to destination servers. Eventually some links will not work as usual.'
+ 'options.1' => 'Start a new search on this domain',
+ 'options.2' => 'Hide :host',
+ 'options.3' => 'hide *.:domain',
+ 'options.4' => 'partnershop',
+ 'options.5' => 'OPEN ANONYMOUSLY',
+ 'options.6' => 'OPEN IN NEW TAB',
+ 'options.7' => 'OPEN',
+ 'options.more' => 'MORE',
+ 'proxytext' => 'Result link is opened anonymously. Your data will not be transfered to destination servers. Some links may not work as usual.'
];
\ No newline at end of file
diff --git a/resources/lang/en/resultPage.php b/resources/lang/en/resultPage.php
index 60e4e8cc4..41052716c 100644
--- a/resources/lang/en/resultPage.php
+++ b/resources/lang/en/resultPage.php
@@ -5,5 +5,5 @@ return [
"startseite" => "MetaGer start page",
"impressum" => "site notice",
'search-placeholder' => 'Your search query...',
- 'metager3' => 'You are currently on a MetaGer test version.<span class="hidden-xs"> It is used to try features before public release. Things might not work regularly. You can find our regular verion here: <a href="https://metager.de" target="_self">metager.de</a>.</span>',
+ 'metager3' => 'You are currently on a MetaGer test version.<span class="hidden-xs"> It is used to try features before public release. Things might not work regularly. You can find our regular version here: <a href="https://metager.de" target="_self">metager.de</a>.</span>',
];
diff --git a/resources/views/hilfe.blade.php b/resources/views/hilfe.blade.php
index bba230f49..524283b28 100644
--- a/resources/views/hilfe.blade.php
+++ b/resources/views/hilfe.blade.php
@@ -5,6 +5,20 @@
@section('content')
<div class="alert alert-warning" role="alert">{!! trans('hilfe.achtung') !!}</div>
<h1 class="page-title">{!! trans('hilfe.title') !!}</h1>
+
+ <section>
+ <h3>{!! trans('hilfe.searchfield.title') !!}</h3>
+ <div>
+ <p>{!! trans('hilfe.searchfield.info') !!}</p>
+ <ul class="dotlist">
+ <li>{!! trans('hilfe.searchfield.memberkey') !!}</li>
+ <li>{!! trans('hilfe.searchfield.slot') !!}</li>
+ <li>{!! trans('hilfe.searchfield.search') !!}</li>
+ <li>{!! trans('result.top') !!}</li>
+ </ul>
+ </div>
+ </section>
+
<section>
<h3>{!! trans('hilfe.stopworte.title') !!}</h3>
<div>
--
GitLab