Merge pull request #2660 from dalf/upd-translations

[mod] replace /translations.js with an embedded JSON

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

@@ -25,7 +25,8 @@ window.searx = (function(d) {
 
     return {
         autocompleter: script.getAttribute('data-autocompleter') === 'true',
-        method: script.getAttribute('data-method')
+        method: script.getAttribute('data-method'),
+        translations: JSON.parse(script.getAttribute('data-translations'))
     };
 })(document);
 ;/**
@@ -302,7 +303,7 @@ $(document).ready(function(){
                     }
                 })
                 .fail(function() {
-                    $(result_table_loadicon).html($(result_table_loadicon).html() + "<p class=\"text-muted\">"+could_not_load+"</p>");
+                    $(result_table_loadicon).html($(result_table_loadicon).html() + "<p class=\"text-muted\">"+searx.translations.could_not_load+"</p>");
                 });
             }
         }

searx/static/themes/oscar/src/js/01_init.js

@@ -25,6 +25,7 @@ window.searx = (function(d) {
 
     return {
         autocompleter: script.getAttribute('data-autocompleter') === 'true',
-        method: script.getAttribute('data-method')
+        method: script.getAttribute('data-method'),
+        translations: JSON.parse(script.getAttribute('data-translations'))
     };
 })(document);

searx/static/themes/oscar/src/js/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+"</p>");
+                    $(result_table_loadicon).html($(result_table_loadicon).html() + "<p class=\"text-muted\">"+searx.translations.could_not_load+"</p>");
                 });
             }
         }

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

@@ -32,7 +32,7 @@
         search_on_category_select: script.getAttribute('data-search-on-category-select') === 'true',
         infinite_scroll: script.getAttribute('data-infinite-scroll') === 'true',
         static_path: script.getAttribute('data-static-path'),
-        no_item_found: script.getAttribute('data-no-item-found')
+        translations: JSON.parse(script.getAttribute('data-translations')),
     }
 
     // update the css

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

@@ -1529,7 +1529,7 @@ module.exports = AutoComplete;
       if (searx.autocompleter) {
         searx.autocomplete = AutoComplete.call(w, {
           Url: "./autocompleter",
-          EmptyMessage: searx.no_item_found,
+          EmptyMessage: searx.translations.no_item_found,
           HttpMethod: searx.method,
           HttpHeaders: {
             "Content-type": "application/x-www-form-urlencoded",

searx/static/themes/simple/js/searx_head/00_init.js

@@ -32,7 +32,7 @@
         search_on_category_select: script.getAttribute('data-search-on-category-select') === 'true',
         infinite_scroll: script.getAttribute('data-infinite-scroll') === 'true',
         static_path: script.getAttribute('data-static-path'),
-        no_item_found: script.getAttribute('data-no-item-found')
+        translations: JSON.parse(script.getAttribute('data-translations')),
     }
 
     // update the css

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

@@ -73,7 +73,7 @@
       if (searx.autocompleter) {
         searx.autocomplete = AutoComplete.call(w, {
           Url: "./autocompleter",
-          EmptyMessage: searx.no_item_found,
+          EmptyMessage: searx.translations.no_item_found,
           HttpMethod: searx.method,
           HttpHeaders: {
             "Content-type": "application/x-www-form-urlencoded",

searx/templates/__common__/translations.js.tpl

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

searx/templates/oscar/base.html

@@ -9,7 +9,6 @@
     <meta name="referrer" content="no-referrer">
     <meta name="viewport" content="width=device-width, initial-scale=1 , maximum-scale=2.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') -%}
@@ -99,7 +98,8 @@
 
     <script src="{{ url_for('static', filename='js/searx.min.js') }}"
             data-method="{{ method or 'POST' }}"
-            data-autocompleter="{% if autocomplete %}true{% else %}false{% endif %}"></script>
+            data-autocompleter="{% if autocomplete %}true{% else %}false{% endif %}"
+            data-translations="{{ translations }}"></script>
     {% for script in scripts %}
     {{""}}<script src="{{ url_for('static', filename=script) }}"></script>
     {% endfor %}

searx/templates/simple/base.html

@@ -12,7 +12,6 @@
   <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 %}
@@ -26,7 +25,7 @@
           data-search-on-category-select="{{ 'true' if 'plugins/js/search_on_category_select.js' in scripts else 'false'}}"
           data-infinite-scroll="{{ 'true' if 'plugins/js/infinite_scroll.js' in scripts else 'false' }}"
           data-static-path="{{ url_for('static', filename='themes/simple') }}/"
-          data-no-item-found="{{ _('No item found') }}"></script>
+          data-translations="{{ translations }}"></script>
   <!--<![endif]-->
   {% block head %}
   <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ opensearch_url }}"/>

searx/webapp.py

@@ -362,6 +362,15 @@ def image_proxify(url):
                             urlencode(dict(url=url.encode(), h=h)))
 
 
+def get_translations():
+    return {
+        # when overpass AJAX request fails (on a map result)
+        'could_not_load': gettext('could not load data'),
+        # when there is autocompletion
+        'no_item_found': gettext('No item found')
+    }
+
+
 def render(template_name, override_theme=None, **kwargs):
     disabled_engines = request.preferences.engines.get_disabled()
 
@@ -421,6 +430,8 @@ def render(template_name, override_theme=None, **kwargs):
 
     kwargs['brand'] = brand
 
+    kwargs['translations'] = json.dumps(get_translations(), separators=(',', ':'))
+
     kwargs['scripts'] = set()
     kwargs['endpoint'] = 'results' if 'q' in kwargs else request.endpoint
     for plugin in request.user_plugins:
@@ -1084,14 +1095,6 @@ 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