fireinfo: Fix formatting languages

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/templates/fireinfo/profile.html b/src/templates/fireinfo/profile.html
index 498622c89ae5fe0c507464d38925724a7803f11a..7484cb1a0cdbf778c294db978090439de4d3e3ba 100644 (file)
--- a/src/templates/fireinfo/profile.html
+++ b/src/templates/fireinfo/profile.html
@@ -146,7 +146,7 @@
                                                        {% if profile.language %}
                                                                <dt class="col-md-3">{{ _("Language") }}</dt>
                                                                <dd class="col-md-9">
-                                                                       {% module LanguageName(profile.language) %}
+                                                                       {{ format_language_name(profile.language) }}
                                                                </dd>
                                                        {% end %}
                                                </dl>

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 15c76dc8312e629e4b5b871ee9373246c0becd51..e1e86bdce5c361e9de8032a006add11e40ce9f9f 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -49,6 +49,7 @@ class Application(tornado.web.Application):
                        # UI Methods
                        "ui_methods" : {
                                "format_country_name"          : self.format_country_name,
+                               "format_language_name"         : self.format_language_name,
                                "format_month_name"            : self.format_month_name,
                                "format_phone_number"          : self.format_phone_number,
                                "format_phone_number_to_e164"  : self.format_phone_number_to_e164,
@@ -280,6 +281,32 @@ class Application(tornado.web.Application):
        def format_country_name(self, handler, country_code):
                return ipfire.countries.get_name(country_code)
 
+       def format_language_name(self, handler, language):
+               _ = handler.locale.translate
+
+               if language == "de":
+                       return _("German")
+               elif language == "en":
+                       return _("English")
+               elif language == "es":
+                       return _("Spanish")
+               elif language == "fr":
+                       return _("French")
+               elif language == "it":
+                       return _("Italian")
+               elif language == "nl":
+                       return _("Dutch")
+               elif language == "pl":
+                       return _("Polish")
+               elif language == "pt":
+                       return _("Portuguese")
+               elif language == "ru":
+                       return _("Russian")
+               elif language == "tr":
+                       return _("Turkish")
+
+               return language
+
        def format_month_name(self, handler, month):
                _ = handler.locale.translate