marc 8 vuotta sitten
vanhempi
commit
92c6e88ad3
5 muutettua tiedostoa jossa 7 lisäystä ja 8 poistoa
  1. 1
    2
      AUTHORS.rst
  2. 1
    1
      searx/engines/mediawiki.py
  3. 0
    2
      searx/languages.py
  4. 3
    3
      tests/robot/test_basic.robot
  5. 2
    0
      utils/update_languages.py

+ 1
- 2
AUTHORS.rst Näytä tiedosto

@@ -43,7 +43,7 @@ generally made searx better:
43 43
 - Kang-min Liu
44 44
 - Kirill Isakov
45 45
 - Guilhem Bonnefille
46
-- Marc Abonce Seguin
46
+- Marc Abonce Seguin @a01200356
47 47
 - @jibe-b
48 48
 - Christian Pietsch @pietsch
49 49
 - @Maxqia
@@ -55,7 +55,6 @@ generally made searx better:
55 55
 - Ammar Najjar @ammarnajjar
56 56
 - @stepshal
57 57
 - François Revol @mmuman
58
-- marc @a01200356
59 58
 - Harry Wood @harry-wood
60 59
 - Thomas Renard @threnard
61 60
 - Pydo `<https://github.com/pydo>`_

+ 1
- 1
searx/engines/mediawiki.py Näytä tiedosto

@@ -15,7 +15,7 @@
15 15
 from json import loads
16 16
 from string import Formatter
17 17
 from urllib import urlencode, quote
18
-from searx.engines.wikipedia import supported_engines
18
+from searx.engines.wikipedia import supported_languages
19 19
 
20 20
 # engine dependent config
21 21
 categories = ['general']

+ 0
- 2
searx/languages.py Näytä tiedosto

@@ -176,9 +176,7 @@ language_codes = (
176 176
     (u"sh", u"Srpskohrvatski / Српскохрватски", u"", u"Serbo-Croatian"),
177 177
     (u"si", u"සිංහල", u"", u"Sinhalese"),
178 178
     (u"sk-SK", u"Slovenčina", u"Slovenská republika", u"Slovak"),
179
-    (u"sl", u"Slovenščina", u"", u"Slovenian"),
180 179
     (u"sl-SI", u"Slovenščina", u"Slovenija", u"Slovenian"),
181
-    (u"sl-SL", u"Slovenščina", u"Sierra Leone", u"Slovenian"),
182 180
     (u"sn", u"Chishona", u"", u""),
183 181
     (u"so", u"Soomaali", u"", u""),
184 182
     (u"sq", u"Shqip", u"", u"Albanian"),

+ 3
- 3
tests/robot/test_basic.robot Näytä tiedosto

@@ -101,11 +101,11 @@ Change search language
101 101
     Page Should Contain  about
102 102
     Page Should Contain  preferences
103 103
     Go To  http://localhost:11111/preferences
104
-    List Selection Should Be  language  Automatic
105
-    Select From List  language  Turkish (Turkey) - tr_TR
104
+    List Selection Should Be  language  Default language
105
+    Select From List  language  Türkçe (Türkiye) - tr-TR
106 106
     Submit Preferences
107 107
     Go To  http://localhost:11111/preferences
108
-    List Selection Should Be  language  Turkish (Turkey) - tr_TR
108
+    List Selection Should Be  language  Türkçe (Türkiye) - tr-TR
109 109
 
110 110
 Change autocomplete
111 111
     Page Should Contain  about

+ 2
- 0
utils/update_languages.py Näytä tiedosto

@@ -35,7 +35,9 @@ languages = {}
35 35
 # To filter out invalid codes and dialects.
36 36
 def valid_code(lang_code):
37 37
     # filter invalid codes
38
+    # sl-SL is technically not invalid, but still a mistake
38 39
     if lang_code[:2] == 'xx'\
40
+       or lang_code == 'sl-SL'\
39 41
        or lang_code == 'jw'\
40 42
        or lang_code[-2:] == 'UK'\
41 43
        or lang_code[-2:] == 'XA'\