From 4ca0d8cb0fd6c0e6b1301a6e8577aea6d928e9dc Mon Sep 17 00:00:00 2001
From: Adam Tauber <asciimoo@gmail.com>
Date: Mon, 15 Jun 2020 18:25:05 +0200
Subject: [PATCH 1/3] [enh] add translatable strings to javascript - closes
 #461

---
 searx/static/themes/oscar/js/searx.js         |   2 +-
 searx/static/themes/oscar/js/searx.min.js     | Bin 5217 -> 5215 bytes
 .../themes/oscar/js/searx_src/leaflet_map.js  |   2 +-
 .../static/themes/simple/js/searx.head.min.js | Bin 775 -> 742 bytes
 searx/static/themes/simple/js/searx.js        |   2 +-
 searx/static/themes/simple/js/searx.min.js    | Bin 23952 -> 23911 bytes
 .../static/themes/simple/js/searx.min.js.map  | Bin 30399 -> 30418 bytes
 .../simple/js/searx_src/searx_mapresult.js    |   2 +-
 searx/templates/oscar/base.html               |   2 +-
 searx/templates/simple/base.html              |   1 +
 searx/webapp.py                               |   8 ++++++++
 11 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/searx/static/themes/oscar/js/searx.js b/searx/static/themes/oscar/js/searx.js
index c93f597fe..2cd9ca26a 100644
--- a/searx/static/themes/oscar/js/searx.js
+++ b/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>");
                 });
             }
         }
diff --git a/searx/static/themes/oscar/js/searx.min.js b/searx/static/themes/oscar/js/searx.min.js
index 08aba2b4be8b580419795dfec39f60f0dd9f736e..52a58800bac2cb584261db6484ed3175d9ab381b 100644
GIT binary patch
delta 42
ycmaE;abIJCB$J`(M(HDb;_BMT`K382@p<_r@j3a4DcVXl`UQ4Mn}6_SvH}1>Fb<vo

delta 44
zcmcbw@la!eB$I*hM(HDblF9j{IVlQx`6UWD`H3kCDTyVCiZ=QMcIunI@ny0C0AocD
AUH||9

diff --git a/searx/static/themes/oscar/js/searx_src/leaflet_map.js b/searx/static/themes/oscar/js/searx_src/leaflet_map.js
index 3c8c616b1..06931b474 100644
--- a/searx/static/themes/oscar/js/searx_src/leaflet_map.js
+++ b/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>");
                 });
             }
         }
diff --git a/searx/static/themes/simple/js/searx.head.min.js b/searx/static/themes/simple/js/searx.head.min.js
index 00c711c793e6b8f82330c89bbd61c39c7610ad77..8cd0df3d6c23c6b44c605586daecf189227202b6 100644
GIT binary patch
delta 24
fcmZo?d&W9Jir3Io*T78I$iT=zp+;e&$9^UNQ3(c+

delta 57
zcmaFH+RipXO3%Pd*T6#8$iUE2p++I2q@<wON?$)cvm~Q5NiR7+S3j{hIWsdiKVQE%
MHL<8-qxya(0R5&DDgXcg

diff --git a/searx/static/themes/simple/js/searx.js b/searx/static/themes/simple/js/searx.js
index e191f2487..3e9ad3e7f 100644
--- a/searx/static/themes/simple/js/searx.js
+++ b/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;
           });
         }
       }
diff --git a/searx/static/themes/simple/js/searx.min.js b/searx/static/themes/simple/js/searx.min.js
index 42e8a845c9e05adbf2bcdd1017b6e691c220c097..264a7fb4282b57ca032ab7f17a900c95b1cd6c80 100644
GIT binary patch
delta 46
zcmbQRoALQB#tBlqhNij(X1YcOMg|Hs3L8B(`SB&^m*%9z=jE5g=j11*Y!>iu-~#|^
CX%D#o

delta 87
zcmaF9i*dqk#tBk-24=bj7P>|ThL#F73K=CO1;tkS`stY^8Kp^j$@#hZiN(p8nYsD-
r`o*b<MHL&>H~EPvCFhssq$uR&mnh`qC#EQ*B$gy9Ds6u5*T4q=Bx4@Z

diff --git a/searx/static/themes/simple/js/searx.min.js.map b/searx/static/themes/simple/js/searx.min.js.map
index d7a1eeac82a871923e974a6c7a544b8df82d325b..81e7ddffa3758da64d411856870d18b660b90655 100644
GIT binary patch
delta 1334
zcmZuxO>ZMb5S4E+2sW2RyG!_x5E9^C{E^8zD<nj9&tz~MYvQ#hw)Ya*6U!OLGvl$x
zV-tkDe*rZo!~uQ)5>kG^UN~^(%mslsk>eh?AgXG@Zi2Xs+*Q@D>b-jHr<b{(FLOWq
zvH7YOEhZ<&VU!$CqW;OnZ<}9sUS95tGYO5ADmL{Or|!qbfv^C4Iqiu$Kt1Y;CP34d
z!UHu?q6Sb?RN*So0qCSR$|Ak#-`T$zn@dDc$+fGU{r|bTl%fSHy;gQ6tNJ_t-tCeU
zBMIu^wUk$+Ox}>92Ub~a>mPk17hnA4f1i7$>M%NfR6Dr1ID=d+)XyfvTl0ZfNPy2I
zlSs55+<)mRwvdVbHrUQD+e9srJNlR4ZvM=r(*no%J9wB6_%xEK{v`Bw7hTE)QVEB3
zQJ@Y&i((GYw?1pLa7(V6OH<fj?Wi67YgpPSm{j7O>$}nMM#Q+@N<WF-S{sik<8r<?
zbwwYbPaRMf8<me;n!P6)xDw!><2JGF`|almN8l_ID}zY783bN%<~+)CRMfOqHD{kv
zL+gPQK5C=ioPKQ>b(-A8CTc)f2Wg*cDu>j!@o%~XsoIfPu&eB<{&V_K?ty+Ue*eR;
zi=(QQ<bhd>CYlI6hH4R9HPfF>)R^gYyp@aeH*o>C^i%xC#;8NhT8X}l@7<0c(ZL~+
z!8z@-BMW+K_QC7t1GEdYB2x?jhHQ{=W{|n=&+e?lCJ(#XqcVoHsrgg|*&*!;mrYED
zMvc?~r5|S+*;m=1#*I<o`dG$?D6s<8)jsdDUid6fsup=|Tly@M!=2aAAQc8dlL>?_
zy@5l6M78$VWX|{oM2Rn>LJru8x$@{*BT!6&;EytAw5kKjSR;#h8>F>Wrl$ifCKk)-
z0AqPt4LN41pUfY<Q{-EXl83Jt)k3DJEN49`9yw$<*3aff-k<_Cm1SK?DjT~^gs|IH
zJxL1dT^HXPTCWEPeZs7Ugyt1pTubd-j@ZZlp;cj8_!mGPHjiG2QET&f_^5CJ9irL1
z8nWPt5}KvLW=YH{k7?=G7Ef=Dyi9JKKQvEm{rlqW`|*p|M9w_6NPL8K)?r}t#<CqY
mkx8h_>AQKqhpiESPFwo(G{1=v2a0>CiONK_J=I^Og?|7?TaJSO

delta 1353
zcmZ`(O=}xh6h%7;QsQFLriDTwWYOpa*<(#?k=1=~MiW^Uqlq+@#!!kh5t6L=(8x1`
zYzqDbDJAbGWYJY=!F1hKvrji&WR*>JA)7!ph4$VzNr-8>5%ccnx#ym%KVO!9e_8tV
z#m2>(jUNUTw#A{d7WqB-<IMeBJ76ZjoJSsO1GM8Ia{!#F{Cjr&+w_tx<meKqU@d@_
zpe(n^1^|Q0Vab2O2Kyfg%VaX&?CJZet6&{~&T;oc2&bG)If%vw{rtxNhija9U~Y?T
z`PaN&iZ8Al|6KY+w^e8S5&gx*lLeGYfh>oUtI3#U8~}UJFe~|eczg4$E#s?w9Ms(9
zvz~<bRwe7xtTEq_ufi`XbC+Hj*X5^Cqq0!1DNkiDnqNB^k}u?f*&qVJ1c-w`K8-dv
zGUYkp2D8A_#g2R(ZI$;73isEN#owKWs*<0N$z~=U=98;UuO1tL*eQ6>j>zJwOfPcL
z10(8|3#<&S*rkCyqSFEOIqMSzqiO%W!zNsTS(I1}ixO8b!%h@RFOr`vf2(V4Qi6-6
z#8^#|jubSltCsc7-Gf}{90T@*rOSVocT077H~FR=3=xo6a|H`1(+P)cfuy635WsFh
zz0y%<sTw;~OO;+XX`(gHd66c6NvgQFXUSLP>LHnWt4FIZuf_N2+a|KXt{o}u?8(~d
zR((BYJ&cMCHUXF@866k&B_8F(oD`83*wl9IKt5buKVJ;UZKXrz;^;*R@*@ri@lip~
zJ8#%hjj>Yun8#hDSAgQwT94Qq=bY0a;PSB54xcLW?7&eI5;fz6qwohVomE#urq97_
z7I0>lN}Q@><jqEGM($HyCoGPJ${!Z0=;?)crly)(qYaqbTydcWOL#P<*0?VcOQy<t
zG}{A<YRbna{6<3+>74qczzI2Xepa;H@<}X{nJlOEiberq$<L&jYUMi)mbCi1JWs2;
zcU-(hRG~+$9;hiNO3w`!x70f0)sIcNC7-98HAP3OuK?n8p_&Ione!Ibo=<;YfY*+|
zQbU(FvOlg?#|6`9ii}!QzRAA69sBQX0blw`9myfu%<jTc%PQ9AAnHIG`OV7IBW@xi
XkgNRW2EJ^lHFE<S#g-MxpYrOz+jo!k

diff --git a/searx/static/themes/simple/js/searx_src/searx_mapresult.js b/searx/static/themes/simple/js/searx_src/searx_mapresult.js
index 869d07da0..267ac94cb 100644
--- a/searx/static/themes/simple/js/searx_src/searx_mapresult.js
+++ b/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;
           });
         }
       }
diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html
index cd3d23df5..839619976 100644
--- a/searx/templates/oscar/base.html
+++ b/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') -%}
diff --git a/searx/templates/simple/base.html b/searx/templates/simple/base.html
index 650ef771c..5cb1e1757 100644
--- a/searx/templates/simple/base.html
+++ b/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 %}
diff --git a/searx/webapp.py b/searx/webapp.py
index 2ba8ccfb8..68be25584 100755
--- a/searx/webapp.py
+++ b/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

From 32f7877235f87f1dcfabc271e5c92539bbcdac9a Mon Sep 17 00:00:00 2001
From: Adam Tauber <asciimoo@gmail.com>
Date: Mon, 15 Jun 2020 19:15:24 +0200
Subject: [PATCH 2/3] [fix] resolve flickr_noapi encoding issues

---
 searx/engines/flickr_noapi.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/searx/engines/flickr_noapi.py b/searx/engines/flickr_noapi.py
index c8ee34f7a..1cbb3e0a9 100644
--- a/searx/engines/flickr_noapi.py
+++ b/searx/engines/flickr_noapi.py
@@ -117,14 +117,10 @@ def response(resp):
             'img_format': img_format,
             'template': 'images.html'
         }
-        try:
-            result['author'] = author
-            result['title'] = title
-            result['content'] = content
-        except:
-            result['author'] = ''
-            result['title'] = ''
-            result['content'] = ''
+        result['author'] = author.encode('utf-8', 'ignore').decode('utf-8')
+        result['source'] = source.encode('utf-8', 'ignore').decode('utf-8')
+        result['title'] = title.encode('utf-8', 'ignore').decode('utf-8')
+        result['content'] = content.encode('utf-8', 'ignore').decode('utf-8')
         results.append(result)
 
     return results

From 0dc5bdb6ef602d00456eb1db96d45e2f42b2b7a4 Mon Sep 17 00:00:00 2001
From: Adam Tauber <asciimoo@gmail.com>
Date: Mon, 15 Jun 2020 20:11:12 +0200
Subject: [PATCH 3/3] [fix] add missing template file

---
 searx/templates/__common__/translations.js.tpl | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 searx/templates/__common__/translations.js.tpl

diff --git a/searx/templates/__common__/translations.js.tpl b/searx/templates/__common__/translations.js.tpl
new file mode 100644
index 000000000..8453aba69
--- /dev/null
+++ b/searx/templates/__common__/translations.js.tpl
@@ -0,0 +1 @@
+var could_not_load = '{{ _('could not load data') }}!';