Changeset 7833

Timestamp:

10 Mar 2012, 09:45:25 (13 years ago)

Author:

Henrik Bettermann

Message:

In some cases we do no longer need to know the fallback language (= portal language) because the fallback language is already set in the cookie when accessing Kofa for the first time.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• applicants/browser.py (modified) (1 diff)
• browser/pages.py (modified) (1 diff)
• hostels/browser.py (modified) (1 diff)
• students/browser.py (modified) (3 diffs)
• students/viewlets.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py

@@ -232 +232 @@
     @property
     def introduction(self):
-        portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
-        lang = self.request.cookies.get('kofa.language', portal_language)
+        # Here we know that the cookie has been set
+        lang = self.request.cookies.get('kofa.language')
         html = self.context.description_dict.get(lang,'')
         if html =='':
+            portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
             html = self.context.description_dict.get(portal_language,'')
         if html =='':

main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py

@@ -290 +290 @@
     @property
     def frontpage(self):
-        portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
-        lang = self.request.cookies.get('kofa.language', portal_language)
+        lang = self.request.cookies.get('kofa.language')
         html = self.context['configuration'].frontpage_dict.get(lang,'')
         if html =='':
+            portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
             html = self.context[
                 'configuration'].frontpage_dict.get(portal_language,'')

main/waeup.kofa/trunk/src/waeup/kofa/hostels/browser.py

@@ -261 +261 @@
         switched = [] # for log file
         switched_translated = [] # for flash message
-        portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
-        preferred_language = self.request.cookies.get(
-            'kofa.language', portal_language)
+        # Here we know that the cookie has been set
+        preferred_language = self.request.cookies.get('kofa.language')
         for bed_id in child_id:
             message = self.context[bed_id].switchReservation()

main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

@@ -662 +662 @@
     @property
     def label(self):
-        portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
-        lang = self.request.cookies.get('kofa.language', portal_language)
+        # Here we know that the cookie has been set
+        lang = self.request.cookies.get('kofa.language')
         level_title = translate(self.context.level_title, 'waeup.kofa',
             target_language=lang)
@@ -762 +762 @@
     @property
     def label(self):
-        portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
-        lang = self.request.cookies.get('kofa.language', portal_language)
+        # Here we know that the cookie has been set
+        lang = self.request.cookies.get('kofa.language')
         level_title = translate(self.context.level_title, 'waeup.kofa',
             target_language=lang)
@@ -1732 +1732 @@
     @property
     def label(self):
-        portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
-        lang = self.request.cookies.get('kofa.language', portal_language)
+        # Here we know that the cookie has been set
+        lang = self.request.cookies.get('kofa.language')
         level_title = translate(self.context.level_title, 'waeup.kofa',
             target_language=lang)

main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py

@@ -73 +73 @@
     def render(self):
         url = self.view.url(self.context.getStudent(), self.link)
-        portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
-        lang = self.request.cookies.get('kofa.language', portal_language)
+        # Here we know that the cookie has been set
+        lang = self.request.cookies.get('kofa.language')
         text = translate(self.text, 'waeup.kofa',
             target_language=lang)