git.iko.soy/searx
on master help sign in
[fix] translate engine errors to Occitan when configured
commitbce3830b8dd9322e4e93d0003aa86e03c03e2dca authorNoémi Ványi <sitbackandwait@gmail.com> dateFri 17 Apr 2020, 16:31 (7 years ago) parentba7c8d7
3 files changed+19−16
compare with master
unifiedsplit
searx/results.py+2−2 searx/search.py+5−12 searx/webapp.py+12−2
searx/results.py+2−2
@@ -345,8 +345,8 @@ class ResultContainer(object):
345345 return 0
346346 return resultnum_sum / len(self._number_of_results)
347347
348− def add_unresponsive_engine(self, engine_error):
349− self.unresponsive_engines.add(engine_error)
348+ def add_unresponsive_engine(self, engine_name, error_type, error_message=None):
349+ self.unresponsive_engines.add((engine_name, error_type, error_message))
350350
351351 def add_timing(self, engine_name, engine_time, page_load_time):
352352 self.timings.append({
searx/search.py+5−12
@@ -127,11 +127,7 @@ def search_one_offline_request_safe(engine_name, query, request_params, result_c
127127 logger.exception('engine {0} : invalid input : {1}'.format(engine_name, e))
128128 except Exception as e:
129129 record_offline_engine_stats_on_error(engine, result_container, start_time)
130−
131− result_container.add_unresponsive_engine((
132− engine_name,
133− u'{0}: {1}'.format(gettext('unexpected crash'), e),
134− ))
130+ result_container.add_unresponsive_engine(engine_name, 'unexpected crash', str(e))
135131 logger.exception('engine {0} : exception : {1}'.format(engine_name, e))
136132
137133
@@ -186,24 +182,21 @@ def search_one_http_request_safe(engine_name, query, request_params, result_cont
186182 engine.stats['errors'] += 1
187183
188184 if (issubclass(e.__class__, requests.exceptions.Timeout)):
189− result_container.add_unresponsive_engine((engine_name, gettext('timeout')))
185+ result_container.add_unresponsive_engine(engine_name, 'timeout')
190186 # requests timeout (connect or read)
191187 logger.error("engine {0} : HTTP requests timeout"
192188 "(search duration : {1} s, timeout: {2} s) : {3}"
193189 .format(engine_name, engine_time, timeout_limit, e.__class__.__name__))
194190 requests_exception = True
195191 elif (issubclass(e.__class__, requests.exceptions.RequestException)):
196− result_container.add_unresponsive_engine((engine_name, gettext('request exception')))
192+ result_container.add_unresponsive_engine(engine_name, 'request exception')
197193 # other requests exception
198194 logger.exception("engine {0} : requests exception"
199195 "(search duration : {1} s, timeout: {2} s) : {3}"
200196 .format(engine_name, engine_time, timeout_limit, e))
201197 requests_exception = True
202198 else:
203− result_container.add_unresponsive_engine((
204− engine_name,
205− u'{0}: {1}'.format(gettext('unexpected crash'), e),
206− ))
199+ result_container.add_unresponsive_engine(engine_name, 'unexpected crash', str(e))
207200 # others errors
208201 logger.exception('engine {0} : exception : {1}'.format(engine_name, e))
209202
@@ -238,7 +231,7 @@ def search_multiple_requests(requests, result_container, start_time, timeout_lim
238231 remaining_time = max(0.0, timeout_limit - (time() - start_time))
239232 th.join(remaining_time)
240233 if th.isAlive():
241− result_container.add_unresponsive_engine((th._engine_name, gettext('timeout')))
234+ result_container.add_unresponsive_engine(th._engine_name, 'timeout')
242235 logger.warning('engine timeout: {0}'.format(th._engine_name))
243236
244237
searx/webapp.py+12−2
@@ -626,7 +626,7 @@ def index():
626626 'corrections': list(result_container.corrections),
627627 'infoboxes': result_container.infoboxes,
628628 'suggestions': list(result_container.suggestions),
629− 'unresponsive_engines': list(result_container.unresponsive_engines)},
629+ 'unresponsive_engines': __get_translated_errors(result_container.unresponsive_engines)}, # noqa
630630 default=lambda item: list(item) if isinstance(item, set) else item),
631631 mimetype='application/json')
632632 elif output_format == 'csv':
@@ -694,7 +694,7 @@ def index():
694694 corrections=correction_urls,
695695 infoboxes=result_container.infoboxes,
696696 paging=result_container.paging,
697− unresponsive_engines=result_container.unresponsive_engines,
697+ unresponsive_engines=__get_translated_errors(result_container.unresponsive_engines),
698698 current_language=match_language(search_query.lang,
699699 LANGUAGE_CODES,
700700 fallback=request.preferences.get_value("language")),
@@ -705,6 +705,16 @@ def index():
705705 )
706706
707707
708+def __get_translated_errors(unresponsive_engines):
709+ translated_errors = []
710+ for unresponsive_engine in unresponsive_engines:
711+ error_msg = gettext(unresponsive_engine[1])
712+ if unresponsive_engine[2]:
713+ error_msg = "{} {}".format(error_msg, unresponsive_engine[2])
714+ translated_errors.append((unresponsive_engine[0], error_msg))
715+ return translated_errors
716+
717+
708718@app.route('/about', methods=['GET'])
709719def about():
710720 """Render about page"""