Merge branch 'master' of https://github.com/asciimoo/searx into csp-oscar-theme

searx/engines/flickr_noapi.py

@@ -117,14 +117,10 @@ def response(resp):
             'img_format': img_format,
             'template': 'images.html'
         }
-        try:
+        result['author'] = author.encode('utf-8', 'ignore').decode('utf-8')
-            result['author'] = author
+        result['source'] = source.encode('utf-8', 'ignore').decode('utf-8')
-            result['title'] = title
+        result['title'] = title.encode('utf-8', 'ignore').decode('utf-8')
-            result['content'] = content
+        result['content'] = content.encode('utf-8', 'ignore').decode('utf-8')
-        except:
-            result['author'] = ''
-            result['title'] = ''
-            result['content'] = ''
         results.append(result)
 
     return results

searx/static/themes/oscar/js/searx.js

@@ -291,7 +291,7 @@ $(document).ready(function(){
                     }
                 })
                 .fail(function() {
-                    $(result_table_loadicon).html($(result_table_loadicon).html() + "<p class=\"text-muted\">could not load data!</p>");
+                    $(result_table_loadicon).html($(result_table_loadicon).html() + "<p class=\"text-muted\">"+could_not_load+"</p>");
                 });
             }
         }

searx/static/themes/oscar/js/searx_src/leaflet_map.js

@@ -90,7 +90,7 @@ $(document).ready(function(){
                     }
                 })
                 .fail(function() {
-                    $(result_table_loadicon).html($(result_table_loadicon).html() + "<p class=\"text-muted\">could not load data!</p>");
+                    $(result_table_loadicon).html($(result_table_loadicon).html() + "<p class=\"text-muted\">"+could_not_load+"</p>");
                 });
             }
         }

searx/static/themes/simple/js/searx.js

@@ -1314,7 +1314,7 @@ module.exports = AutoComplete;
           })
           .catch(function() {
             result_table_loadicon.classList.remove('invisible');
-            result_table_loadicon.innerHTML = "could not load data!";
+            result_table_loadicon.innerHTML = could_not_load;
           });
         }
       }

searx/static/themes/simple/js/searx_src/searx_mapresult.js

@@ -97,7 +97,7 @@
           })
           .catch(function() {
             result_table_loadicon.classList.remove('invisible');
-            result_table_loadicon.innerHTML = "could not load data!";
+            result_table_loadicon.innerHTML = could_not_load;
           });
         }
       }

searx/templates/__common__/translations.js.tpl

@@ -0,0 +1 @@
+var could_not_load = '{{ _('could not load data') }}!';

searx/templates/oscar/base.html

@@ -10,7 +10,7 @@
     <meta name="referrer" content="no-referrer">
     <meta name="viewport" content="width=device-width, initial-scale=1 , maximum-scale=1.0, user-scalable=1" />
     {% block meta %}{% endblock %}
-
+    <script src="{{ url_for('js_translations') }}"></script>
     <title>{% block title %}{% endblock %}{{ instance_name }}</title>
     <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" />
     {% if preferences.get_value('oscar-style') -%}

searx/templates/simple/base.html

@@ -12,6 +12,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
   <title>{% block title %}{% endblock %}{{ instance_name }}</title>
   {% block meta %}{% endblock %}
+  <script src="{{ url_for('js_translations') }}"></script>
   {% if rtl %}
   <link rel="stylesheet" href="{{ url_for('static', filename='css/searx-rtl.min.css') }}" type="text/css" media="screen" />
   {% else %}

searx/webapp.py

@@ -1021,6 +1021,14 @@ def config():
     })
 
 
+@app.route('/translations.js')
+def js_translations():
+    return render(
+        'translations.js.tpl',
+        override_theme='__common__',
+    ), {'Content-Type': 'text/javascript; charset=UTF-8'}
+
+
 @app.errorhandler(404)
 def page_not_found(e):
     return render('404.html'), 404