Browse Source

Merge branch 'master' into master

Michael Vieira 6 years ago
parent
commit
eb0abb0825
No account linked to committer's email

+ 6
- 0
AUTHORS.rst View File

@@ -77,3 +77,9 @@ generally made searx better:
77 77
 - @pyrrh0n1c
78 78
 - @cclauss
79 79
 - QGW @moon2l
80
+- Pierre-Alain Toret @daftaupe
81
+- Matthew Olmsted @icegiant
82
+- Michael Tran @trankmichael
83
+- Joseph Nuthalapati @josephkiranbabu
84
+- @maiki
85
+- Richard Didier @zeph33

+ 13
- 0
CHANGELOG.rst View File

@@ -1,3 +1,16 @@
1
+0.14.0 2018.02.19
2
+=================
3
+
4
+- New theme: oscar-logicodev dark
5
+- New engines
6
+
7
+  - AskSteem (general)
8
+- Autocompleter fix for py3
9
+- Engine fixes (pdbe, pubmed, gigablast, google, yacy, bing videos, microsoft academic)
10
+- "All" option is removed from languages
11
+- Minor UI changes
12
+- Translation updates
13
+
1 14
 0.13.1 2017.11.23
2 15
 =================
3 16
 

+ 2
- 10
manage.sh View File

@@ -3,14 +3,6 @@
3 3
 BASE_DIR="$(dirname -- "`readlink -f -- "$0"`")"
4 4
 export PATH="$BASE_DIR/node_modules/.bin":$PATH
5 5
 
6
-# the script can be sourced to update the PATH
7
-# see https://stackoverflow.com/questions/2683279/how-to-detect-if-a-script-is-being-sourced
8
-if [ $_ != $0 ]; then
9
-    unset BASE_DIR
10
-    # sourced : exit now
11
-    return
12
-fi
13
-
14 6
 # subshell
15 7
 PYTHONPATH="$BASE_DIR"
16 8
 SEARX_DIR="$BASE_DIR/searx"
@@ -56,7 +48,7 @@ install_geckodriver() {
56 48
 
57 49
     if [ -z "$1" ]; then
58 50
         if [ -z "$VIRTUAL_ENV" ]; then
59
-            echo "geckodriver can't be installed because VIRTUAL_ENV is not set, you should download it from\n  $GECKODRIVER_URL"
51
+            printf "geckodriver can't be installed because VIRTUAL_ENV is not set, you should download it from\n  %s" "$GECKODRIVER_URL"
60 52
             exit
61 53
         else
62 54
             GECKODRIVER_DIR="$VIRTUAL_ENV/bin"
@@ -66,7 +58,7 @@ install_geckodriver() {
66 58
         mkdir -p -- "$GECKODRIVER_DIR"
67 59
     fi
68 60
 
69
-    echo "Installing $GECKODRIVER_DIR/geckodriver from\n  $GECKODRIVER_URL"
61
+    printf "Installing %s/geckodriver from\n  %s" "$GECKODRIVER_DIR" "$GECKODRIVER_URL"
70 62
 
71 63
     FILE="`mktemp`"
72 64
     wget -qO "$FILE" -- "$GECKODRIVER_URL" && tar xz -C "$GECKODRIVER_DIR" -f "$FILE" geckodriver

+ 4
- 4
searx/engines/__init__.py View File

@@ -230,12 +230,12 @@ def load_engines(engine_list):
230 230
 
231 231
 def initialize_engines(engine_list):
232 232
     load_engines(engine_list)
233
-    for engine in engines.items():
233
+    for engine_name, engine in engines.items():
234 234
         if hasattr(engine, 'init'):
235
-            init_fn = getattr(engine, engine_attr)
235
+            init_fn = getattr(engine, 'init')
236 236
 
237 237
             def engine_init():
238 238
                 init_fn()
239
-                logger.debug('%s engine initialized', engine_data['name'])
240
-            logger.debug('Starting background initialization of %s engine', engine_data['name'])
239
+                logger.debug('%s engine initialized', engine_name)
240
+            logger.debug('Starting background initialization of %s engine', engine_name)
241 241
             threading.Thread(target=engine_init).start()

+ 44
- 0
searx/engines/asksteem.py View File

@@ -0,0 +1,44 @@
1
+"""
2
+ Asksteem (general)
3
+
4
+ @website     https://asksteem.com/
5
+ @provide-api yes
6
+
7
+ @using-api   yes
8
+ @results     JSON (https://github.com/Hoxly/asksteem-docs/wiki)
9
+ @stable      yes
10
+ @parse       url, title, content
11
+"""
12
+
13
+from json import loads
14
+from searx.url_utils import urlencode
15
+
16
+# engine dependent config
17
+categories = ['general']
18
+paging = True
19
+language_support = False
20
+disabled = True
21
+
22
+# search-url
23
+search_url = 'https://api.asksteem.com/search?{params}'
24
+result_url = 'https://steemit.com/@{author}/{title}'
25
+
26
+
27
+# do search-request
28
+def request(query, params):
29
+    url = search_url.format(params=urlencode({'q': query, 'pg': params['pageno']}))
30
+    params['url'] = url
31
+    return params
32
+
33
+
34
+# get response from search-request
35
+def response(resp):
36
+    json = loads(resp.text)
37
+
38
+    results = []
39
+
40
+    for result in json.get('results', []):
41
+        results.append({'url': result_url.format(author=result['author'], title=result['permlink']),
42
+                        'title': result['title'],
43
+                        'content': result['summary']})
44
+    return results

+ 75
- 0
searx/engines/microsoft_academic.py View File

@@ -0,0 +1,75 @@
1
+"""
2
+Microsoft Academic (Science)
3
+
4
+@website     https://academic.microsoft.com
5
+@provide-api yes
6
+@using-api   no
7
+@results     JSON
8
+@stable      no
9
+@parse       url, title, content
10
+"""
11
+
12
+from datetime import datetime
13
+from json import loads
14
+from uuid import uuid4
15
+
16
+from searx.url_utils import urlencode
17
+from searx.utils import html_to_text
18
+
19
+categories = ['images']
20
+paging = True
21
+result_url = 'https://academic.microsoft.com/api/search/GetEntityResults?{query}'
22
+
23
+
24
+def request(query, params):
25
+    correlation_id = uuid4()
26
+    msacademic = uuid4()
27
+    time_now = datetime.now()
28
+
29
+    params['url'] = result_url.format(query=urlencode({'correlationId': correlation_id}))
30
+    params['cookies']['msacademic'] = str(msacademic)
31
+    params['cookies']['ai_user'] = 'vhd0H|{now}'.format(now=str(time_now))
32
+    params['method'] = 'POST'
33
+    params['data'] = {
34
+        'Query': '@{query}@'.format(query=query),
35
+        'Limit': 10,
36
+        'Offset': params['pageno'] - 1,
37
+        'Filters': '',
38
+        'OrderBy': '',
39
+        'SortAscending': False,
40
+    }
41
+
42
+    return params
43
+
44
+
45
+def response(resp):
46
+    results = []
47
+    response_data = loads(resp.text)
48
+
49
+    for result in response_data['results']:
50
+        url = _get_url(result)
51
+        title = result['e']['dn']
52
+        content = _get_content(result)
53
+        results.append({
54
+            'url': url,
55
+            'title': html_to_text(title),
56
+            'content': html_to_text(content),
57
+        })
58
+
59
+    return results
60
+
61
+
62
+def _get_url(result):
63
+    if 's' in result['e']:
64
+        return result['e']['s'][0]['u']
65
+    return 'https://academic.microsoft.com/#/detail/{pid}'.format(pid=result['id'])
66
+
67
+
68
+def _get_content(result):
69
+    if 'd' in result['e']:
70
+        content = result['e']['d']
71
+        if len(content) > 300:
72
+            return content[:300] + '...'
73
+        return content
74
+
75
+    return ''

+ 7
- 9
searx/settings.yml View File

@@ -66,6 +66,10 @@ engines:
66 66
     categories : science
67 67
     timeout : 4.0
68 68
 
69
+  - name : asksteem
70
+    engine : asksteem
71
+    shortcut : as
72
+
69 73
   - name : base
70 74
     engine : base
71 75
     shortcut : bs
@@ -398,15 +402,7 @@ engines:
398 402
     shortcut : lo
399 403
 
400 404
   - name : microsoft academic
401
-    engine : json_engine
402
-    paging : True
403
-    search_url : https://academic.microsoft.com/api/search/GetEntityResults?query=%40{query}%40&filters=&offset={pageno}&limit=8&correlationId=undefined
404
-    results_query : results
405
-    url_query : u
406
-    title_query : dn
407
-    content_query : d
408
-    page_size : 8
409
-    first_page_num : 0
405
+    engine : microsoft_academic
410 406
     categories : science
411 407
     shortcut : ma
412 408
 
@@ -719,6 +715,7 @@ locales:
719 715
     eo : Esperanto (Esperanto)
720 716
     es : Español (Spanish)
721 717
     fi : Suomi (Finnish)
718
+    fil : Wikang Filipino (Filipino)
722 719
     fr : Français (French)
723 720
     he : עברית (Hebrew)
724 721
     hr : Hrvatski (Croatian)
@@ -737,6 +734,7 @@ locales:
737 734
     tr : Türkçe (Turkish)
738 735
     uk : українська мова (Ukrainian)
739 736
     zh : 中文 (Chinese)
737
+    zh_TW : 國語 (Taiwanese Mandarin)
740 738
 
741 739
 doi_resolvers :
742 740
   oadoi.org : 'https://oadoi.org/'

BIN
searx/translations/es/LC_MESSAGES/messages.mo View File


+ 5
- 4
searx/translations/es/LC_MESSAGES/messages.po View File

@@ -5,11 +5,12 @@
5 5
 # Translators:
6 6
 # Adam Tauber <asciimoo@gmail.com>, 2015
7 7
 # Alejandro León Aznar, 2014
8
-# Alejandro León Aznar, 2014-2017
8
+# Alejandro León Aznar, 2014-2018
9 9
 # Carmen Fernández B., 2016
10 10
 # juanda097 <juanda097@protonmail.ch>, 2016
11 11
 # juanda097 <juanda097@protonmail.ch>, 2017
12 12
 # Marc Abonce Seguin, 2016
13
+# Marc Abonce Seguin, 2018
13 14
 # Oscar <ocf@openmailbox.org>, 2015
14 15
 # rivera valdez <riveravaldezmail@gmail.com>, 2016
15 16
 # wefwefew ewfewfewf <nnnedmz0d@moakt.ws>, 2016
@@ -18,8 +19,8 @@ msgstr ""
18 19
 "Project-Id-Version: searx\n"
19 20
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
20 21
 "POT-Creation-Date: 2017-11-01 21:31+0100\n"
21
-"PO-Revision-Date: 2017-12-18 06:34+0000\n"
22
-"Last-Translator: juanda097 <juanda097@protonmail.ch>\n"
22
+"PO-Revision-Date: 2018-02-16 05:29+0000\n"
23
+"Last-Translator: Marc Abonce Seguin\n"
23 24
 "Language-Team: Spanish (http://www.transifex.com/asciimoo/searx/language/es/)\n"
24 25
 "MIME-Version: 1.0\n"
25 26
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -738,7 +739,7 @@ msgstr "Atajo"
738 739
 #: searx/templates/oscar/preferences.html:164
739 740
 #: searx/templates/oscar/preferences.html:174
740 741
 msgid "Selected language"
741
-msgstr "Elegir idioma"
742
+msgstr "Idioma elegido"
742 743
 
743 744
 #: searx/templates/oscar/preferences.html:166
744 745
 #: searx/templates/oscar/preferences.html:172

BIN
searx/translations/fil/LC_MESSAGES/messages.mo View File


+ 1014
- 0
searx/translations/fil/LC_MESSAGES/messages.po
File diff suppressed because it is too large
View File


BIN
searx/translations/nl/LC_MESSAGES/messages.mo View File


+ 30
- 30
searx/translations/nl/LC_MESSAGES/messages.po View File

@@ -4,15 +4,15 @@
4 4
 # 
5 5
 # Translators:
6 6
 # André Koot <meneer@tken.net>, 2014-2017
7
-# Nathan Follens, 2015-2017
7
+# Nathan Follens, 2015-2018
8 8
 # Rejo Zenger <rejo@zenger.nl>, 2016-2017
9 9
 msgid ""
10 10
 msgstr ""
11 11
 "Project-Id-Version: searx\n"
12 12
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
13 13
 "POT-Creation-Date: 2017-11-01 21:31+0100\n"
14
-"PO-Revision-Date: 2017-12-17 17:06+0000\n"
15
-"Last-Translator: André Koot <meneer@tken.net>\n"
14
+"PO-Revision-Date: 2018-02-15 22:43+0000\n"
15
+"Last-Translator: Nathan Follens\n"
16 16
 "Language-Team: Dutch (http://www.transifex.com/asciimoo/searx/language/nl/)\n"
17 17
 "MIME-Version: 1.0\n"
18 18
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +27,7 @@ msgstr "time-out"
27 27
 
28 28
 #: searx/search.py:144
29 29
 msgid "request exception"
30
-msgstr "aanvraag uitzondering"
30
+msgstr "aanvraaguitzondering"
31 31
 
32 32
 #: searx/search.py:151
33 33
 msgid "unexpected crash"
@@ -55,7 +55,7 @@ msgstr "afbeeldingen"
55 55
 
56 56
 #: searx/webapp.py:141
57 57
 msgid "videos"
58
-msgstr "video's"
58
+msgstr "videos"
59 59
 
60 60
 #: searx/webapp.py:142
61 61
 msgid "it"
@@ -115,7 +115,7 @@ msgstr "Snelheid zoekmachine (sec)"
115 115
 
116 116
 #: searx/engines/__init__.py:198 searx/engines/flycheck___init__.py:205
117 117
 msgid "Page loads (sec)"
118
-msgstr "Pagina laadt (sec)"
118
+msgstr "Laden van pagina’s (sec)"
119 119
 
120 120
 #: searx/engines/__init__.py:202 searx/engines/flycheck___init__.py:209
121 121
 #: searx/templates/oscar/results.html:95
@@ -145,7 +145,7 @@ msgstr "Dit object is vervangen door"
145 145
 
146 146
 #: searx/engines/pubmed.py:74
147 147
 msgid "No abstract is available for this publication."
148
-msgstr "Voor deze publicatie is geen samenvatting beschikbaar."
148
+msgstr "Voor deze publicatie is geen abstract beschikbaar."
149 149
 
150 150
 #: searx/plugins/https_rewrite.py:32
151 151
 msgid "Rewrite HTTP links to HTTPS if possible"
@@ -157,7 +157,7 @@ msgstr "Oneindig scrollen"
157 157
 
158 158
 #: searx/plugins/infinite_scroll.py:4
159 159
 msgid "Automatically load next page when scrolling to bottom of current page"
160
-msgstr "Automatisch nieuwe pagina laden bij het bereiken van de onderkant van de huidige pagina"
160
+msgstr "Volgende pagina automatisch laden bij bereiken van de onderkant van de huidige pagina"
161 161
 
162 162
 #: searx/plugins/oa_doi_rewrite.py:9
163 163
 msgid "Open Access DOI rewrite"
@@ -195,11 +195,11 @@ msgstr "Zoekopdracht onmiddellijk uitvoeren wanneer een categorie geselecteerd w
195 195
 msgid ""
196 196
 "Displays your IP if the query is \"ip\" and your user agent if the query "
197 197
 "contains \"user agent\"."
198
-msgstr "Geeft je IP-adres weer als de zoekopdracht \"ip\" is en je gebruikersagent als de zoekopdracht \"user agent\" bevat."
198
+msgstr "Geeft je IP-adres weer als de zoekopdracht ‘ip’ is en je gebruikersagent als de zoekopdracht ‘user agent’ bevat."
199 199
 
200 200
 #: searx/plugins/tracker_url_remover.py:26
201 201
 msgid "Tracker URL remover"
202
-msgstr "Tracker-URL verwijderaar"
202
+msgstr "Tracker-URL-verwijderaar"
203 203
 
204 204
 #: searx/plugins/tracker_url_remover.py:27
205 205
 msgid "Remove trackers arguments from the returned URL"
@@ -213,7 +213,7 @@ msgstr "Sneltoetsen als in Vim"
213 213
 msgid ""
214 214
 "Navigate search results with Vim-like hotkeys (JavaScript required). Press "
215 215
 "\"h\" key on main or result page to get help."
216
-msgstr "Blader door zoekresultaten met sneltoetsen zoals die in Vim (JavaScript vereist). Druk op \"h\" op de hoofdpagina of de pagina met resultaten voor hulp."
216
+msgstr "Blader door zoekresultaten met sneltoetsen zoals die in Vim (JavaScript vereist). Druk op ‘h’ op de hoofdpagina of de pagina met resultaten voor hulp."
217 217
 
218 218
 #: searx/templates/courgette/404.html:4 searx/templates/legacy/404.html:4
219 219
 #: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4
@@ -282,7 +282,7 @@ msgstr "Zoektaal"
282 282
 #: searx/templates/simple/languages.html:2
283 283
 #: searx/templates/simple/preferences.html:42
284 284
 msgid "Default language"
285
-msgstr "Standaard taal"
285
+msgstr "Standaardtaal"
286 286
 
287 287
 #: searx/templates/courgette/preferences.html:24
288 288
 #: searx/templates/legacy/preferences.html:25
@@ -365,7 +365,7 @@ msgstr "Geen"
365 365
 #: searx/templates/pix-art/preferences.html:39
366 366
 #: searx/templates/simple/preferences.html:131
367 367
 msgid "Themes"
368
-msgstr "Thema's"
368
+msgstr "Themas"
369 369
 
370 370
 #: searx/templates/courgette/preferences.html:83
371 371
 msgid "Color"
@@ -538,21 +538,21 @@ msgstr "Zoekmachinestatistieken"
538 538
 #: searx/templates/legacy/result_templates/images.html:4
539 539
 #: searx/templates/pix-art/result_templates/images.html:4
540 540
 msgid "original context"
541
-msgstr "originele inhoud"
541
+msgstr "oorspronkelijke context"
542 542
 
543 543
 #: searx/templates/courgette/result_templates/torrent.html:7
544 544
 #: searx/templates/legacy/result_templates/torrent.html:11
545 545
 #: searx/templates/oscar/result_templates/torrent.html:6
546 546
 #: searx/templates/simple/result_templates/torrent.html:9
547 547
 msgid "Seeder"
548
-msgstr "Aanbieder"
548
+msgstr "Seeders"
549 549
 
550 550
 #: searx/templates/courgette/result_templates/torrent.html:7
551 551
 #: searx/templates/legacy/result_templates/torrent.html:11
552 552
 #: searx/templates/oscar/result_templates/torrent.html:6
553 553
 #: searx/templates/simple/result_templates/torrent.html:9
554 554
 msgid "Leecher"
555
-msgstr "Ophaler"
555
+msgstr "Leechers"
556 556
 
557 557
 #: searx/templates/courgette/result_templates/torrent.html:9
558 558
 #: searx/templates/legacy/result_templates/torrent.html:9
@@ -597,7 +597,7 @@ msgstr "Uit"
597 597
 #: searx/templates/oscar/macros.html:34 searx/templates/oscar/macros.html:48
598 598
 #: searx/templates/simple/macros.html:43
599 599
 msgid "cached"
600
-msgstr "gecached"
600
+msgstr "gecachet"
601 601
 
602 602
 #: searx/templates/oscar/advanced.html:4
603 603
 msgid "Advanced settings"
@@ -673,7 +673,7 @@ msgstr "Welke taal wil je gebruiken voor het zoeken?"
673 673
 #: searx/templates/oscar/preferences.html:48
674 674
 #: searx/templates/simple/preferences.html:128
675 675
 msgid "Change the language of the layout"
676
-msgstr "Wijzig de taal van de layout"
676
+msgstr "Wijzig de taal van de lay-out"
677 677
 
678 678
 #: searx/templates/oscar/preferences.html:58
679 679
 #: searx/templates/simple/preferences.html:60
@@ -690,7 +690,7 @@ msgid ""
690 690
 "Change how forms are submited, <a "
691 691
 "href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\""
692 692
 " rel=\"external\">learn more about request methods</a>"
693
-msgstr "Bepaal hoe de formulieren worden ingestuurd, <a href=\"http://nl.wikipedia.org/wiki/Hypertext_Transfer_Protocol#HTTP-requests\" rel=\"external\">lees meer over request methodes</a>"
693
+msgstr "Bepaal hoe de formulieren worden ingestuurd, <a href=\"http://nl.wikipedia.org/wiki/Hypertext_Transfer_Protocol#HTTP-requests\" rel=\"external\">lees meer over opvraagmethodes</a>"
694 694
 
695 695
 #: searx/templates/oscar/preferences.html:87
696 696
 #: searx/templates/simple/preferences.html:71
@@ -700,7 +700,7 @@ msgstr "Filteren op inhoud"
700 700
 #: searx/templates/oscar/preferences.html:97
701 701
 #: searx/templates/simple/preferences.html:139
702 702
 msgid "Change searx layout"
703
-msgstr "Wijzig searx layout"
703
+msgstr "Opmaak van searx aanpassen"
704 704
 
705 705
 #: searx/templates/oscar/preferences.html:106
706 706
 #: searx/templates/oscar/preferences.html:111
@@ -714,13 +714,13 @@ msgstr "Stijl"
714 714
 
715 715
 #: searx/templates/oscar/preferences.html:122
716 716
 msgid "Open Access DOI resolver"
717
-msgstr "Open Access DOI oplossen"
717
+msgstr "Open Access DOI herschrijven"
718 718
 
719 719
 #: searx/templates/oscar/preferences.html:123
720 720
 msgid ""
721 721
 "Redirect to open-access versions of publications when available (plugin "
722 722
 "required)"
723
-msgstr "Doorverwijzen naar vrij toegankelijke versies van publicaties indien beschikbaar (plug-in vereist)"
723
+msgstr "Doorverwijzen naar vrij toegankelijke versies van publicaties, indien beschikbaar (plug-in vereist)"
724 724
 
725 725
 #: searx/templates/oscar/preferences.html:163
726 726
 #: searx/templates/oscar/preferences.html:175
@@ -753,7 +753,7 @@ msgstr "Max. duur"
753 753
 
754 754
 #: searx/templates/oscar/preferences.html:248
755 755
 msgid "This is the list of searx's instant answering modules."
756
-msgstr "Dit is het overzicht van searx's direct antwoordende modules."
756
+msgstr "Dit is het overzicht van de instantantwoordmodules van searx."
757 757
 
758 758
 #: searx/templates/oscar/preferences.html:252
759 759
 msgid "Name"
@@ -791,7 +791,7 @@ msgstr "Waarde"
791 791
 
792 792
 #: searx/templates/oscar/preferences.html:301
793 793
 msgid "Search URL of the currently saved preferences"
794
-msgstr "Zoek-URL van de momenteel opgeslagen voorkeuren"
794
+msgstr "Zoek-URL van de huidig opgeslagen voorkeuren"
795 795
 
796 796
 #: searx/templates/oscar/preferences.html:301
797 797
 msgid ""
@@ -815,7 +815,7 @@ msgstr "Zoekmachines konden geen resultaten ophalen"
815 815
 
816 816
 #: searx/templates/oscar/results.html:131
817 817
 msgid "Links"
818
-msgstr "Links"
818
+msgstr "Koppelingen"
819 819
 
820 820
 #: searx/templates/oscar/search.html:8
821 821
 #: searx/templates/oscar/search_full.html:11
@@ -855,7 +855,7 @@ msgstr "Vorig jaar"
855 855
 #: searx/templates/oscar/messages/first_time.html:6
856 856
 #: searx/templates/oscar/messages/no_data_available.html:3
857 857
 msgid "Heads up!"
858
-msgstr "Heads up!"
858
+msgstr "Opgelet!"
859 859
 
860 860
 #: searx/templates/oscar/messages/first_time.html:7
861 861
 msgid "It look like you are using searx first time."
@@ -881,7 +881,7 @@ msgstr "Zoekmachines konden geen resultaten ophalen."
881 881
 #: searx/templates/oscar/messages/no_results.html:10
882 882
 #: searx/templates/simple/messages/no_results.html:10
883 883
 msgid "Please, try again later or find another searx instance."
884
-msgstr "Probeer het later opnieuw, of gebruik een andere searx zoekserver."
884
+msgstr "Probeer het later opnieuw, of gebruik een andere instantie van searx."
885 885
 
886 886
 #: searx/templates/oscar/messages/no_results.html:14
887 887
 #: searx/templates/simple/messages/no_results.html:14
@@ -893,7 +893,7 @@ msgstr "Sorry!"
893 893
 msgid ""
894 894
 "we didn't find any results. Please use another query or search in more "
895 895
 "categories."
896
-msgstr "we kregen geen resultaat. Probeer een andere opvraag of zoek in meer categorieën."
896
+msgstr "We konden geen resultaten vinden. Probeer een andere zoekopdracht, of zoek in meer categorieën."
897 897
 
898 898
 #: searx/templates/oscar/messages/save_settings_successfull.html:7
899 899
 msgid "Well done!"
@@ -901,11 +901,11 @@ msgstr "Goed gedaan!"
901 901
 
902 902
 #: searx/templates/oscar/messages/save_settings_successfull.html:8
903 903
 msgid "Settings saved successfully."
904
-msgstr "Instellingen succesvol opgeslagen."
904
+msgstr "Instellingen opgeslagen."
905 905
 
906 906
 #: searx/templates/oscar/messages/unknow_error.html:7
907 907
 msgid "Oh snap!"
908
-msgstr "Oops!"
908
+msgstr "Oeps!"
909 909
 
910 910
 #: searx/templates/oscar/messages/unknow_error.html:8
911 911
 msgid "Something went wrong."

BIN
searx/translations/pt_BR/LC_MESSAGES/messages.mo View File


+ 7
- 6
searx/translations/pt_BR/LC_MESSAGES/messages.po View File

@@ -8,13 +8,14 @@
8 8
 # Guimarães Mello <maeslor@cryptolab.net>, 2017
9 9
 # Neton Brício <fervelinux@gmail.com>, 2015
10 10
 # pizzaiolo, 2016
11
+# Shizuka 静香 <deusadaji@gmail.com>, 2018
11 12
 msgid ""
12 13
 msgstr ""
13 14
 "Project-Id-Version: searx\n"
14 15
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
15 16
 "POT-Creation-Date: 2017-11-01 21:31+0100\n"
16
-"PO-Revision-Date: 2017-11-13 19:51+0000\n"
17
-"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n"
17
+"PO-Revision-Date: 2018-02-04 10:39+0000\n"
18
+"Last-Translator: Shizuka 静香 <deusadaji@gmail.com>\n"
18 19
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/asciimoo/searx/language/pt_BR/)\n"
19 20
 "MIME-Version: 1.0\n"
20 21
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -745,7 +746,7 @@ msgstr "Intervalo de tempo"
745 746
 #: searx/templates/oscar/preferences.html:171
746 747
 #: searx/templates/simple/preferences.html:92
747 748
 msgid "Avg. time"
748
-msgstr "Avg.tempo"
749
+msgstr "Tempo médio"
749 750
 
750 751
 #: searx/templates/oscar/preferences.html:168
751 752
 #: searx/templates/oscar/preferences.html:170
@@ -813,7 +814,7 @@ msgstr "Tente pesquisar por:"
813 814
 #: searx/templates/oscar/results.html:100
814 815
 #: searx/templates/simple/results.html:25
815 816
 msgid "Engines cannot retrieve results"
816
-msgstr "Os motores de busca não podem obter resultados"
817
+msgstr "Os motores de busca não conseguiram obter resultados"
817 818
 
818 819
 #: searx/templates/oscar/results.html:131
819 820
 msgid "Links"
@@ -832,7 +833,7 @@ msgstr "estatísticas"
832 833
 #: searx/templates/oscar/time-range.html:3
833 834
 #: searx/templates/simple/time-range.html:3
834 835
 msgid "Anytime"
835
-msgstr "A qualquer tempo"
836
+msgstr "A qualquer momento"
836 837
 
837 838
 #: searx/templates/oscar/time-range.html:6
838 839
 #: searx/templates/simple/time-range.html:6
@@ -861,7 +862,7 @@ msgstr "Atenção!"
861 862
 
862 863
 #: searx/templates/oscar/messages/first_time.html:7
863 864
 msgid "It look like you are using searx first time."
864
-msgstr "Parece que você está usando searx primeira vez."
865
+msgstr "Parece que você está usando o searx pela primeira vez."
865 866
 
866 867
 #: searx/templates/oscar/messages/no_cookies.html:3
867 868
 msgid "Information!"

BIN
searx/translations/zh_Hant_TW/LC_MESSAGES/messages.mo View File


+ 1014
- 0
searx/translations/zh_Hant_TW/LC_MESSAGES/messages.po
File diff suppressed because it is too large
View File


+ 2
- 2
searx/version.py View File

@@ -18,8 +18,8 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
18 18
 
19 19
 # version of searx
20 20
 VERSION_MAJOR = 0
21
-VERSION_MINOR = 13
22
-VERSION_BUILD = 1
21
+VERSION_MINOR = 14
22
+VERSION_BUILD = 0
23 23
 
24 24
 VERSION_STRING = "{0}.{1}.{2}".format(VERSION_MAJOR,
25 25
                                       VERSION_MINOR,

+ 3
- 0
searx/webapp.py View File

@@ -165,6 +165,9 @@ def get_locale():
165 165
        and request.form['locale'] in settings['locales']:
166 166
         locale = request.form['locale']
167 167
 
168
+    if locale == 'zh_TW':
169
+        locale = 'zh_Hant_TW'
170
+
168 171
     return locale
169 172
 
170 173