fireinfo: Write correct name for languages.

diff --git a/www/templates/stasy-stats-geo.html b/www/templates/stasy-stats-geo.html
index ee296e749c43cdff0f1f49453d709f175e40799a..514d6b3381cda5aa5041935bdae5e9dcd4cce944 100644 (file)
--- a/www/templates/stasy-stats-geo.html
+++ b/www/templates/stasy-stats-geo.html
@@ -8,7 +8,7 @@
                This will give a short overview about what languages are configured
                on the IPFire webinterface.
        </p>
-       {{ modules.StasyTable(languages, sortby="percentage", flags=True) }}
+       {{ modules.StasyTable(languages, sortby="percentage", locale=True) }}
 
 
        <h3>{{ _("Geo locations") }}</h3>

diff --git a/www/webapp/ui_modules.py b/www/webapp/ui_modules.py
index a3964ffa041dd2b709972780c1cc150e88a5cf42..ebbc19c3e4b3bec03a0a6a1be9b71b86de46e219 100644 (file)
--- a/www/webapp/ui_modules.py
+++ b/www/webapp/ui_modules.py
@@ -8,6 +8,7 @@ import operator
 import socket
 import textile
 import tornado.escape
+import tornado.locale
 import tornado.web
 
 from tornado.database import Row
@@ -141,7 +142,7 @@ class TrackerPeerListModule(UIModule):
 
 
 class StasyTableModule(UIModule):
-       def render(self, items, sortby="key", reverse=False, percentage=False, flags=False):
+       def render(self, items, sortby="key", reverse=False, percentage=False, flags=False, locale=False):
                hundred_percent = 0
                for v in items.values():
                        hundred_percent += v
@@ -174,6 +175,17 @@ class StasyTableModule(UIModule):
                                _items.append((k, v))
                        items = _items
 
+               if locale:
+                       flags = False
+                       locales = tornado.locale.LOCALE_NAMES
+                       _items = []
+                       for k, v in items:
+                               for code, locale in locales.items():
+                                       if code.startswith(k):
+                                               k = locale["name"]
+                               _items.append((k, v))
+                       items = _items
+
                return self.render_string("modules/stasy-table.html", items=items, flags=flags)