Merge branch 'master' into engines/unsplash

1 files changed, 22 insertions, 8 deletions

diff --git a/searx/settings.yml b/searx/settings.yml
index d47fd59f4..f4d6e537c 100644
--- a/searx/settings.yml
+++ b/searx/settings.yml
@@ -579,14 +579,6 @@ engines:
     timeout : 6.0
     disabled : True
 
-  - name : ixquick
-    engine : startpage
-    base_url : 'https://www.ixquick.eu/'
-    search_url : 'https://www.ixquick.eu/do/search'
-    shortcut : iq
-    timeout : 6.0
-    disabled : True
-
   - name : swisscows
     engine : swisscows
     shortcut : sw
@@ -723,6 +715,20 @@ engines:
     page_size : 10
     disabled : True
 
+  - name : mojeek
+    shortcut: mjk
+    engine: xpath
+    paging : True
+    search_url : https://www.mojeek.com/search?q={query}&s={pageno}
+    results_xpath: /html/body//div[@class="results"]/ul[@class="results-standard"]/li
+    url_xpath : ./h2/a/@href
+    title_xpath : ./h2
+    content_xpath : ./p[@class="s"]
+    suggestion_xpath : /html/body//div[@class="top-info"]/p[@class="top-info spell"]/a
+    first_page_num : 1
+    page_size : 10
+    disabled : True
+
 #  - name : yacy
 #    engine : yacy
 #    shortcut : ya
@@ -741,21 +747,27 @@ locales:
     en : English
     ar : العَرَبِيَّة (Arabic)
     bg : Български (Bulgarian)
+    ca : Català (Catalan)
     cs : Čeština (Czech)
+    cy : Cymraeg (Welsh)
     da : Dansk (Danish)
     de : Deutsch (German)
     el_GR : Ελληνικά (Greek_Greece)
     eo : Esperanto (Esperanto)
     es : Español (Spanish)
+    eu : Euskara (Basque)
+    fa_IR : (fārsī) فارسى (Persian)
     fi : Suomi (Finnish)
     fil : Wikang Filipino (Filipino)
     fr : Français (French)
+    gl : Galego (Galician)
     he : עברית (Hebrew)
     hr : Hrvatski (Croatian)
     hu : Magyar (Hungarian)
     it : Italiano (Italian)
     ja : 日本語 (Japanese)
     nl : Nederlands (Dutch)
+    nl_BE : Vlaams (Dutch_Belgium)
     pl : Polski (Polish)
     pt : Português (Portuguese)
     pt_BR : Português (Portuguese_Brazil)
@@ -765,8 +777,10 @@ locales:
     sl : Slovenski (Slovene)
     sr : српски (Serbian)
     sv : Svenska (Swedish)
+    te : తెలుగు (telugu)
     tr : Türkçe (Turkish)
     uk : українська мова (Ukrainian)
+    vi : tiếng việt (㗂越)
     zh : 中文 (Chinese)
     zh_TW : 國語 (Taiwanese Mandarin)