Changeset 7701

Timestamp:

25 Feb 2012, 06:53:45 (13 years ago)

Author:

Henrik Bettermann

Message:

Define preferred languages in SIRPUtils and merge language viewlets to a single viewlet.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• browser/viewlets.py (modified) (3 diffs)
• utils/utils.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/browser/viewlets.py

@@ -18 +18 @@
 import grok
 from urllib import urlencode
-from zope.component import getMultiAdapter, queryAdapter
+from zope.component import getMultiAdapter, queryAdapter, getUtility
 from zope.interface import Interface
 from zope.location.interfaces import ISite
@@ -29 +29 @@
     IFacultiesContainer, IFaculty, IDepartment, ICourse, ICertificate,
     ICertificateCourse, IBreadcrumbContainer, IUniversity, IUsersContainer)
-from waeup.sirp.interfaces import (ISIRPObject, ISIRPXMLExporter,
-                                   ISIRPXMLImporter, IDataCenter, IUserAccount)
+from waeup.sirp.interfaces import (
+    ISIRPUtils, ISIRPObject, ISIRPXMLExporter,
+    ISIRPXMLImporter, IDataCenter, IUserAccount)
 from waeup.sirp.browser.layout import SIRPPage, default_primary_nav_template
 from waeup.sirp.utils.helpers import get_user_account
@@ -207 +208 @@
                     )
 
-class LanguageLink(grok.Viewlet):
-    """ An entry in the language selector.
-
-    This is only a baseclass that won't be rendered actually. Deriving
-    viewlets can override certain values and will be rendered with the
-    values set here as default.
-    """
-    grok.baseclass()
+class LanguagesLink(grok.Viewlet):
+    """ The language selector itself.
+    """
     grok.viewletmanager(LanguageManager)
     grok.context(ISIRPObject)
     grok.require('waeup.Public')
-    lang = 'de'
-    title = u'Deutsch'
+    title = u'Languages'
 
     def render(self):
-        args = {'lang':self.lang, 'view_name':self.view.__name__}
-        url = self.view.url(
-            self.context) + '/@@change_language?%s' % urlencode(args)
-        return u'| <a href="%s" title="%s">%s</a> ' % (url,self.title,self.lang)
-
-class English(LanguageLink):
-    """A link to switch to English.
-    """
-    lang = 'en'
-    title = u'English'
-
-class French(LanguageLink):
-    """A link to switch to French.
-    """
-    lang = 'fr'
-    title = u'Fran&ccedil;ais'
-
-class German(LanguageLink):
-    """A link to switch to German.
-    """
-    lang = 'de'
-    title = u'Deutsch'
-
-class Hausa(LanguageLink):
-    """A link to switch to Hausa.
-    """
-    lang = 'ha'
-    title = u'Hausa'
-
-class Yoruba(LanguageLink):
-    """A link to switch to Yoruba.
-    """
-    lang = 'yo'
-    title = u'Yoruba'
-
+        preferred_languages = getUtility(ISIRPUtils).PREFERRED_LANGUAGES_DICT
+        html = u''
+        for key, value in sorted(
+            preferred_languages.items(), key=lambda lang: lang[1][0]):
+            args = {'lang':key, 'view_name':self.view.__name__}
+            url = self.view.url(
+                self.context) + '/@@change_language?%s' % urlencode(args)
+            html += u'| <a href="%s" title="%s">%s</a> ' % (url, value[1], key)
+        return html
 
 # Problem with circular references. Disabled for now...

main/waeup.sirp/trunk/src/waeup/sirp/utils/utils.py

@@ -43 +43 @@
     # (e.g. object histories).
     PORTAL_LANGUAGE = 'en'
+
+    PREFERRED_LANGUAGES_DICT = {
+        'en':(1, u'English'),
+        'fr':(2, u'Français'),
+        'de':(3, u'Deutsch'),
+        'ha':(4, u'Hausa'),
+        'yo':(5, u'Yoruba'),
+        }
 
     def getInstTypeDict(self):