From a3e15a3df6f5502c58f82f18e09d80a2fdf7a957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= <sitbackandwait@gmail.com>
Date: Sun, 31 May 2020 20:02:58 +0200
Subject: [PATCH] Fix Farsi language in Oscar && adjust tables with RTL

---
 searx/templates/oscar/preferences.html        |  28 +++++++++---------
 .../fa_IR/LC_MESSAGES/messages.mo             | Bin 14413 -> 14403 bytes
 .../fa_IR/LC_MESSAGES/messages.po             |   2 +-
 searx/webapp.py                               |   2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index b03929df3..2211da2aa 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -174,14 +174,14 @@
                                     <th>{{ _("Avg. time") }}</th>
                                     <th>{{ _("Max time") }}</th>
                                     {% else %}
-                                    <th>{{ _("Max time") }}</th>
-                                    <th>{{ _("Avg. time") }}</th>
-                                    <th>{{ _("Time range") }}</th>
-                                    <th>{{ _("SafeSearch") }}</th>
-                                    <th>{{ _("Selected language") }}</th>
-                                    <th>{{ _("Shortcut") }}</th>
-                                    <th>{{ _("Engine name") }}</th>
-                                    <th>{{ _("Allow") }}</th>
+                                    <th class="text-right">{{ _("Max time") }}</th>
+                                    <th class="text-right">{{ _("Avg. time") }}</th>
+                                    <th class="text-right">{{ _("Time range") }}</th>
+                                    <th class="text-right">{{ _("SafeSearch") }}</th>
+                                    <th class="text-right">{{ _("Selected language") }}</th>
+                                    <th class="text-right">{{ _("Shortcut") }}</th>
+                                    <th class="text-right">{{ _("Engine name") }}</th>
+                                    <th class="text-right">{{ _("Allow") }}</th>
                                     {% endif %}
                                 </tr>
                         {% for search_engine in engines_by_category[categ] %}
@@ -256,10 +256,10 @@
                 </p>
                 <table class="table table-striped">
                     <tr>
-                        <th class="text-muted">{{ _('Name') }}</th>
-                        <th class="text-muted">{{ _('Keywords') }}</th>
-                        <th class="text-muted">{{ _('Description') }}</th>
-                        <th class="text-muted">{{ _('Examples') }}</th>
+                        <th class="text-muted{% if rtl %} text-right{% endif %}">{{ _('Name') }}</th>
+                        <th class="text-muted{% if rtl %} text-right{% endif %}">{{ _('Keywords') }}</th>
+                        <th class="text-muted{% if rtl %} text-right{% endif %}">{{ _('Description') }}</th>
+                        <th class="text-muted{% if rtl %} text-right{% endif %}">{{ _('Examples') }}</th>
                     </tr>
 
                     {% for answerer in answerers %}
@@ -285,8 +285,8 @@
                 {% if cookies %}
                 <table class="table table-striped">
                     <tr>
-                        <th class="text-muted" style="padding-right:40px;">{{ _('Cookie name') }}</th>
-                        <th class="text-muted">{{ _('Value') }}</th>
+                        <th class="text-muted{% if rtl %} text-right{% endif %}" style="padding-right:40px;">{{ _('Cookie name') }}</th>
+                        <th class="text-muted{% if rtl %} text-right{% endif %}">{{ _('Value') }}</th>
                     </tr>
 
                     {% for cookie in cookies %}
diff --git a/searx/translations/fa_IR/LC_MESSAGES/messages.mo b/searx/translations/fa_IR/LC_MESSAGES/messages.mo
index a2f50338647770a6065e78208cbb207308c65487..56c04178f62da4130dc23c491bc00f1f749d9ddf 100644
GIT binary patch
delta 1331
zcmXZbPe@cz6vy$?!ofzJaU8|5CL6P?98=5uL(~+Nwx~8qWJN_ONf9cU1QtzDL}5@Z
zT4kFgqm`kUkR<enBut7HK`tsJiy)*$NF-w4U+-?_bI+Z3&pr3t_r}{^v^_fSOO~72
z_oZfGjKs`BSb{Z}K+T`UV(h{QK1M&j#Q;uVH~zrIc%{HB9q*y?^<geP!$SOs$~#wJ
zNvmTJT4uHt8!!#;pf-4bO3;sa_!9H+6RyNL)N?Dyx)#e(8y&+;>_ipRh5z%RHtu)x
zuL_eaW@3_wAf_(&Hi)1WR%0{PV-pUe3W>2ug>7)|LM1-z;?t-OTz2s-XAkBuKZq)5
zEXhDE{NS8IAMtPeg|n!Z|19zrq;TwM;!M>1JSt&im6xX!xlP-ID&P>-<4G5fU>Wfk
zYJGB+K|h1+)n*rP6m_z?VzVeVU>0_uPIwh-u^aX7OkygA<7PWBiqvXNn74q|BiC*B
zOT2ZXs5}{K*pvOOfB{{#D%9N_M7<O3E`EYq@E$Ai8|n(8rQQjvP*=4L_5Tsn-QPy#
z>%|Nlaq$~e$G&2S{p~LUwLG1^=%iuXf<>r>&8QQ1;0+wc5!}h~_0swI>BNn=8;3A}
zDeKG@VK!D{8PaTPMip=q1MF|T40OUlq&xN+)zTRZ;ykK=V1?O!+=~h9L!ERQ{Wy<G
z>|gI4Aci60qo{YG9r<AFBI+yZ!K5ahGl=07Dxr@)s-?N8xB``UJF2h)sDzEEjoVO#
zp2H>Bg<*V%S@_ib{|<E}Ur?R-Q%V1oAYA1o%ttMZqaNJs+~?+7QFng{bMUT<2T%o#
zqY9rut)FoQ=)dA3RQ?2B$34}|a-H^>2`voPcn`)0uBDyIUU<BtrSZ&()|U2x)L3og
EA8nhG#Q*>R

delta 1341
zcmXZbTS!z<6vpvYq^6eRWlSd<FJqaFm3HxxP)wm_4@M9LK@o{zk%dApiFOE-DC|Pu
zO9efZ1c{nYf@M*X(1j$d8S5cP=z^#aL{HNH>ztSQ?Y+<Jwbx$joENQcTL(MhooX}t
zo@bVUp?tG6tiUR)N3CDNF!o|LKEou8VG7RRUHpwXc(cH41wKN>8^J7mjfMCP6*nPd
zj@2>937PG|Moh;0r~`&j0Y))^?=TmC;Cf6Tn*LXcTd*2+Pz$DF7b>A%{2vc>@Tj-`
zzR)pS$HFWNK1^Th9uPup+>On644ZHql}MOPO0357Fe>mVZ{C5bz;$na$Fm<ZSsz0s
zH03Z*3BP*IV?6UkT)?;@x8#3N8+=@Q4p*aEkyz{o458vwA>FjSs05nvAfET;6IjZ8
z3bo&f+hF#XK`vgzNz}~_gw57qBc`K+y5TLX#Rpi1v$!0CB^-)HNUnAc14}49(rz2r
z=<b_D#mU-a<|nL`FrcayLG|t=)?ueNe~H@g1<P>()q<kU?hPZTRyClWpGNim9xC1-
zuEYs%{t?xJIZWexTSh(NSy+X-X%Hh=hT7PMy0L>da2%iFA+E2N&d*Of)?oua#}xE!
zrA?TNmAC_`y0xJaxQ!{CZ-WeU!!e{f_5oE=+vdKMiKqkucm$8*E*wGK^e-l1;&wN%
zA0y1en1*Li??NZ?;n-EwSJaP=7Tz$($9Yu1RO+ab7NF)kQ5o+?CDw!rcoubVJNmF2
zgV>81IE?A|%6mSIYRNBDWtLV@e+39uxB-h%8_Q9D+~;}1Tfczn{WZ+QK5za6mCz?t
z;xnlIs=LhgEJMYw#~wUd$y3^CKUvVmK$W|peE3Roi$5be66=n2O+SndMF;X@m!o~3
LdxjVDYP0_VKuMU7

diff --git a/searx/translations/fa_IR/LC_MESSAGES/messages.po b/searx/translations/fa_IR/LC_MESSAGES/messages.po
index 6689dafe7..28cfd1ed6 100644
--- a/searx/translations/fa_IR/LC_MESSAGES/messages.po
+++ b/searx/translations/fa_IR/LC_MESSAGES/messages.po
@@ -109,7 +109,7 @@ msgstr "توابع آماری"
 
 #: searx/answerers/statistics/answerer.py:54
 msgid "Compute {functions} of the arguments"
-msgstr "پردازش {عملکرد های} نشانوند ها<br>"
+msgstr "پردازش {functions} نشانوند ها<br>"
 
 #: searx/engines/__init__.py:194
 msgid "Engine time (sec)"
diff --git a/searx/webapp.py b/searx/webapp.py
index 8c3531069..f3f5f21b8 100755
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -144,7 +144,7 @@ if not searx_debug \
 
 babel = Babel(app)
 
-rtl_locales = ['ar', 'arc', 'bcc', 'bqi', 'ckb', 'dv', 'fa', 'glk', 'he',
+rtl_locales = ['ar', 'arc', 'bcc', 'bqi', 'ckb', 'dv', 'fa', 'fa_IR', 'glk', 'he',
                'ku', 'mzn', 'pnb', 'ps', 'sd', 'ug', 'ur', 'yi']
 
 # used when translating category names