From 5f302d71e46314db0ca3f50c85a2caaac1befd37 Mon Sep 17 00:00:00 2001
From: Hartmut Holzgraefe <hartmut@php.net>
Date: Thu, 19 Jan 2023 20:48:45 +0000
Subject: [PATCH] merge

---
 .../map-full-parts/rendering-status.html         |  2 +-
 www/maposmatic/templates/maposmatic/maps.html    |  2 +-
 www/maposmatic/templatetags/extratags.py         | 16 ++++++++--------
 www/settings.py                                  | 12 ++++++------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html b/www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html
index be349e75..0f50090c 100644
--- a/www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html
+++ b/www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html
@@ -34,7 +34,7 @@
       </table>
       
       <div>
-      {{ map.status|job_status_to_str:map.resultmsg }}
+      {{ map.status|job_status_to_str }}
       </div>
 
       <div style="height: 2em"></div>
diff --git a/www/maposmatic/templates/maposmatic/maps.html b/www/maposmatic/templates/maposmatic/maps.html
index 32295666..70d53559 100644
--- a/www/maposmatic/templates/maposmatic/maps.html
+++ b/www/maposmatic/templates/maposmatic/maps.html
@@ -186,7 +186,7 @@
 	  {% else %}
 	  <a class="btn disabled tooltipped"
              data-placement="top"
-             data-original-title="{{ map.status|job_status_to_str:map.resultmsg }}">
+             data-original-title="{{ map.status|job_status_to_str }}">
             <i class="fas fa-ban"></i> {% trans "Download" %}
 	  </a>
 	  {% endif %}
diff --git a/www/maposmatic/templatetags/extratags.py b/www/maposmatic/templatetags/extratags.py
index 628229b5..2280a9e9 100644
--- a/www/maposmatic/templatetags/extratags.py
+++ b/www/maposmatic/templatetags/extratags.py
@@ -43,20 +43,20 @@ _alert_err  = "<div class='alert alert-danger'  role='alert'>"
 _alert_end  = "</div>"
 
 @register.filter()
-def job_status_to_str(value, arg="Rendering failed", autoescape=True):
-    if value == 0:
+def job_status_to_str(value):
+    if value.status == 0:
         return mark_safe(_alert_info + str(_("Waiting for rendering to begin...")) + _alert_end)
-    elif value == 1:
+    elif value.status == 1:
         return mark_safe(_alert_info + str(_("The rendering is in progress...")) + _alert_end)
-    elif value == 2:
-        if arg == 'ok':
+    elif value.status == 2:
+        if value.resultmsg == 'ok':
             return mark_safe(_alert_ok + str(_("Rendering was successful.")) + _alert_end)
         else:
             if www.settings.CONTACT_EMAIL:
-                return mark_safe(_alert_err + str(_("%(arg)s!<br/>Please check the error log or contact %(email)s for more information." % {'arg': arg, 'email': www.settings.CONTACT_EMAIL})) + _alert_end)
+                return mark_safe(_alert_err + str(_("%(arg)s!<br/>Please check the error log or contact %(email)s for more information." % {'arg': value.resultmsg, 'email': www.settings.CONTACT_EMAIL})) + _alert_end)
             else:
-                return mark_safe( _alert_err + _str(_("%(arg)s! Please check the error log for more information.") % {'arg': arg}) + _alert_end)
-    elif value == 3:
+                return mark_safe( _alert_err + _str(_("%(arg)s! Please check the error log for more information.") % {'arg': value.resultmsg}) + _alert_end)
+    elif value.status == 3:
         if arg == 'ok':
             return mark_safe(_alert_info + str(_("Rendering is obsolete: the rendering was successful, but the files are no longer available.")) + _alert_end)
         else:
diff --git a/www/settings.py b/www/settings.py
index c1d8f9cc..5b2b5fb5 100644
--- a/www/settings.py
+++ b/www/settings.py
@@ -220,6 +220,7 @@ MAP_LANGUAGES = {
     "ca_AD.UTF-8": "Andorra",
     "ar_AE.UTF-8": "دولة الإمارات العربية المتحدة",
     "en_AG":       "Antigua and Barbuda",
+    "sq_AL.UTF-8": "Albanian",
     "es_AR.UTF-8": "Argentina",
     "de_AT.UTF-8": "Österreich",
     "en_AU.UTF-8": "Australia",
@@ -257,10 +258,12 @@ MAP_LANGUAGES = {
     "en_HK.UTF-8": "Hong Kong",
     "es_HN.UTF-8": "Honduras",
     "hr_HR.UTF-8": "Republika Hrvatska",
+    "hu_HU.UTF-8": "Hungarian",
     "id_ID.UTF-8": "Bahasa Indonesia",
     "en_IE.UTF-8": "Ireland",
     "en_IN":       "India",
     "ar_IQ.UTF-8": "العراق",
+    "fa_IR.UTF-8": "فارسی",
     "it_IT.UTF-8": "Italia",
     "ar_JO.UTF-8": "الأردنّ‎",
     "ar_KW.UTF-8": "الكويت",
@@ -287,13 +290,16 @@ MAP_LANGUAGES = {
     "es_PY.UTF-8": "Paraguay",
     "ar_QA.UTF-8": "دولة قطر",
     "ro_RO.UTF-8": "Românesc",
+    "sr_RS.UTF-8": "Serbian",
     "ru_RU.UTF-8": "Русский",
     "ar_SA.UTF-8": "المملكة العربية السعودية",
     "ar_SD.UTF-8": "السودان",
     "en_SG.UTF-8": "Singapore",
+    "sk_SK.UTF-8": "Slovakien",
     "es_SV.UTF-8": "El Salvador",
     "ar_SY.UTF-8": "سوريا",
     "ar_TN.UTF-8": "تونس",
+    "tr_TR.UTF-8": "Türkçe",
     "en_US.UTF-8": "United States",
     "es_US.UTF-8": "Estados Unidos de América",
     "uk_UA.UTF-8": "Україна",
@@ -302,12 +308,6 @@ MAP_LANGUAGES = {
     "ar_YE.UTF-8": "اليَمَن",
     "en_ZA.UTF-8": "South Africa",
     "en_ZW.UTF-8": "Zimbabwe",
-    "tr_TR.UTF-8": "Türkçe",
-    "sk_SK.UTF-8": "Slovakien",
-    "hu_HU.UTF-8": "Hungarian",
-    "fa_IR.UTF-8": "فارسی",
-    "sq_AL.UTF-8": "Albanian",
-    "sr_RS.UTF-8": "Serbian",
 #    "C": _(u"No localization"),
 }