marc пре 8 година
родитељ
комит
92c6e88ad3
5 измењених фајлова са 7 додато и 8 уклоњено
  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 Прегледај датотеку

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

+ 1
- 1
searx/engines/mediawiki.py Прегледај датотеку

15
 from json import loads
15
 from json import loads
16
 from string import Formatter
16
 from string import Formatter
17
 from urllib import urlencode, quote
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
 # engine dependent config
20
 # engine dependent config
21
 categories = ['general']
21
 categories = ['general']

+ 0
- 2
searx/languages.py Прегледај датотеку

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

+ 3
- 3
tests/robot/test_basic.robot Прегледај датотеку

101
     Page Should Contain  about
101
     Page Should Contain  about
102
     Page Should Contain  preferences
102
     Page Should Contain  preferences
103
     Go To  http://localhost:11111/preferences
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
     Submit Preferences
106
     Submit Preferences
107
     Go To  http://localhost:11111/preferences
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
 Change autocomplete
110
 Change autocomplete
111
     Page Should Contain  about
111
     Page Should Contain  about

+ 2
- 0
utils/update_languages.py Прегледај датотеку

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