[brand] searxng is a fork from searx

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>

AUTHORS.rst

@@ -1,21 +1,16 @@
-Searx was created by Adam Tauber and is maintained by Adam Tauber, Noémi Ványi, @pofilo, Gaspard d'Hautefeuille and Émilien Devos.
+searxng is a fork from `searx <https://github.com/searx/searx>`_ and is
+maintained by Alexandre Flament (`@dalf <https://github.com/dalf>`_) and Markus
+Heiser (`@return42 <https://github.com/return42>`_)
 
-Major contributing authors:
+People who have submitted patches/translations, reported bugs, consulted
+features or generally made searx better:
 
-- Adam Tauber <asciimoo@gmail.com> `@asciimoo <https://github.com/asciimoo>`_
+- Adam Tauber `@asciimoo <https://github.com/asciimoo>`_
-- Matej Cotman
+- Émilien Devos `@unixfox <https://github.com/unixfox>`_
-- Thomas Pointhuber
+- Thomas Pointhuber `pointhi <https://github.com/pointhi>`_
-- Alexandre Flament `@dalf <https://github.com/dalf>`_
+- Noémi Ványi `@kvch <https://github.com/kvch>`_
-- @Cqoicebordel
+- `@Cqoicebordel <https://github.com/Cqoicebordel>`_
-- Noémi Ványi
+- Marc Abonce Seguin `@MarcAbonce <https://github.com/MarcAbonce>`_
-- Marc Abonce Seguin @a01200356
-- @pofilo
-- Markus Heiser @return42
-- Émilien Devos @unixfox
-- Alexandre Flament
-
-People who have submitted patches/translations, reported bugs, consulted features or
-generally made searx better:
 
 - Laszlo Hammerl
 - Stefan Marsiske

searx/settings.yml

@@ -1,6 +1,6 @@
 general:
     debug : False # Debug mode, only for development
-    instance_name : "searx" # displayed name
+    instance_name : "searxng" # displayed name
     contact_url: False # mailto:contact@example.com
 
 brand:

searx/templates/__common__/about.html

@@ -1,24 +1,23 @@
 <div{% if rtl %} dir="ltr"{% endif %}>
-  <h1>About <a href="{{ url_for('index') }}">searx</a></h1>
+  <h1>About <a href="{{ url_for('index') }}">searxng</a></h1>
 
   <p>
-    Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>,
+    SearxNG is a fork from the well-known <a href="https://github.com/searx/searx">searx</a>
+    <a href="https://en.wikipedia.org/wiki/Metasearch_engine"> metasearch engine</a>,
     aggregating the results of other <a href="{{ url_for('preferences') }}">search engines</a>
     while not storing information about its users.
   </p>
 
-  <p>More about searx...</p>
+  <p>More about searxng ...</p>
 
   <ul>
-    <li><a href="https://github.com/searx/searx">github</a></li>
+    <li><a href="{{ brand.GIT_URL }}">github</a></li>
-    <li><a href="https://twitter.com/Searx_engine">twitter</a></li>
-    <li>IRC: #searx @ freenode (<a href="https://kiwiirc.com/client/irc.freenode.com/searx">webclient</a>)</li>
     <li><a href="https://www.transifex.com/projects/p/searx/">transifex</a></li>
   </ul>
 
   <hr />
 
-  <h2>Why use searx?</h2>
+  <h2>Why use it?</h2>
 
   <ul>
     <li>
@@ -31,7 +30,7 @@
     </li>
     <li>
       Searx is free software, the code is 100% open and you can help to make it
-      better.  See more on <a href="https://github.com/searx/searx">github</a>.
+      better.  See more on <a href="{{ brand.GIT_URL }}">github</a>.
     </li>
   </ul>
 
@@ -49,11 +48,11 @@
 
     It provides basic privacy by mixing your queries with searches on other
     platforms without storing search data. Queries are made using a POST request
-    on every browser (except Chromium-based browsers*).  Therefore they show up 
+    on every browser (except Chromium-based browsers*).  Therefore they show up
     in neither our logs, nor your url history. In the case of Chromium-based
     browser users there is an exception: searx uses the search bar to perform GET
     requests.
-    
+
     Searx can be added to your browser's search bar; moreover, it can be set as
     the default search engine.
   </p>
@@ -80,9 +79,9 @@
   <h2>How can I make it my own?</h2>
 
   <p>
-    Searx appreciates your concern regarding logs, so take the
+    Searx appreciates your concern regarding logs, so take the code from
-    code from the <a href="https://github.com/searx/searx">original searx project</a> and
+    the <a href="{{ brand.GIT_URL }}">original searx project</a> and run it
-    run it yourself!
+    yourself!
   </p>
   <p>
     Add your searx instance to this <a href="{{ brand.PUBLIC_INSTANCES }}"> list

tests/robot/__init__.py

@@ -20,7 +20,7 @@ def test_404(browser):
 def test_about(browser):
     browser.visit(url)
     browser.click_link_by_text('about')
-    assert browser.is_text_present('Why use searx?')
+    assert browser.is_text_present('Why use it?')
 
 
 def test_preferences(browser):

tests/unit/test_webapp.py

@@ -96,7 +96,7 @@ class ViewsTestCase(SearxTestCase):
     def test_search_empty_html(self):
         result = self.app.post('/search', data={'q': ''})
         self.assertEqual(result.status_code, 200)
-        self.assertIn(b'<span class="instance pull-left"><a href="/">searx</a></span>', result.data)
+        self.assertIn(b'<span class="instance pull-left"><a href="/">searxng</a></span>', result.data)
 
     def test_search_empty_json(self):
         result = self.app.post('/search', data={'q': '', 'format': 'json'})
@@ -186,7 +186,7 @@ class ViewsTestCase(SearxTestCase):
     def test_about(self):
         result = self.app.get('/about')
         self.assertEqual(result.status_code, 200)
-        self.assertIn(b'<h1>About <a href="/">searx</a></h1>', result.data)
+        self.assertIn(b'<h1>About <a href="/">searxng</a></h1>', result.data)
 
     def test_preferences(self):
         result = self.app.get('/preferences')