Changeset 7718 for main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser.py

Timestamp:

28 Feb 2012, 19:34:51 (13 years ago)

Author:

Henrik Bettermann

Message:

Internationalize hostels package.

Remove exception catcher in switchReservations and corresponding test.

When testing the hostel configuration manually I found out that the beds_reserved list attribute of halls
only changed during the lifetime of a running instance. After restarting the portal all changes were gone.
Also "hostel._p_changed = True" didn't help. The only solution was to reassign the attribute to ensure persistance.

Unfortunately, the current tests don't catch such a malfunction. This has to be improved.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser.py (modified) (19 diffs)

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

@@ -20 +20 @@
 import grok
 import sys
+from zope.i18n import translate
+from zope.component import getUtility
 from waeup.sirp.browser import (
     SIRPEditFormPage, SIRPAddFormPage, SIRPDisplayFormPage,
@@ -30 +32 @@
     ManageActionButton, PrimaryNavTab)
 from waeup.sirp.browser.layout import jsaction, action
-from waeup.sirp.interfaces import ISIRPObject
+from waeup.sirp.interfaces import ISIRPObject, ISIRPUtils
+from waeup.sirp.interfaces import MessageFactory as _
 from waeup.sirp.hostels.vocabularies import NOT_OCCUPIED
 from waeup.sirp.hostels.hostel import Hostel
 from waeup.sirp.hostels.interfaces import (
     IHostelsContainer, IHostel, IBed, IBedAllocateStudent)
-
-from waeup.sirp.interfaces import MessageFactory as _
 
 def write_log_message(view, message):
@@ -51 +52 @@
     fields_string = ' + '.join(changed_fields)
     view.context._p_changed = True
-    view.flash('Form has been saved.')
+    view.flash(_('Form has been saved.'))
     if fields_string:
         write_log_message(view, 'saved: % s' % fields_string)
@@ -75 +76 @@
     """
     grok.context(IHostelsContainer)
-    title = u'Hostels'
+    title = _(u'Hostels')
 
 class HostelBreadcrumb(Breadcrumb):
@@ -92 +93 @@
     def title(self):
         co = self.context.getBedCoordinates()
-        return 'Block %s, Room %s, Bed %s' % (co[1], co[2], co[3])
+        return _('Block ${a}, Room ${b}, Bed ${c}',
+            mapping = {'a':co[1], 'b':co[2], 'c':co[3]})
 
 class HostelsContainerPage(SIRPDisplayFormPage):
@@ -101 +103 @@
     grok.require('waeup.viewHostels')
     grok.template('containerpage')
-    label = 'Accommodation Section'
+    label = _('Accommodation Section')
     pnav = 5
 
@@ -109 +111 @@
     grok.view(HostelsContainerPage)
     grok.require('waeup.manageHostels')
-    text = 'Manage accommodation section'
+    text = _('Manage accommodation section')
 
 class HostelsContainerManagePage(SIRPDisplayFormPage):
@@ -119 +121 @@
     grok.template('containermanagepage')
     pnav = 5
-    label = 'Manage accommodation section'
+    label = _('Manage accommodation section')
 
     def update(self):
@@ -127 +129 @@
     # It's quite dangerous to remove entire hostels with its content (beds).
     # Thus, this remove method should be combined with an archiving function.
-    @jsaction('Remove selected')
+    @jsaction(_('Remove selected'))
     def delHostels(self, **data):
         form = self.request.form
@@ -141 +143 @@
         return
 
-    @action('Add hostel', validator=NullValidator)
+    @action(_('Add hostel'), validator=NullValidator)
     def addSubunit(self, **data):
         self.redirect(self.url(self.context, 'addhostel'))
@@ -153 +155 @@
     grok.name('addhostel')
     #grok.template('hosteladdpage')
-    form_fields = grok.AutoFields(IHostel)
-    label = 'Add hostel'
-    pnav = 5
-
-    @action('Create hostel')
+    form_fields = grok.AutoFields(IHostel).omit('beds_reserved')
+    label = _('Add hostel')
+    pnav = 5
+
+    @action(_('Create hostel'))
     def addHostel(self, **data):
         hostel = Hostel()
@@ -166 +168 @@
             self.context.addHostel(hostel)
         except KeyError:
-            self.flash('The hostel already exists.')
+            self.flash(_('The hostel already exists.'))
             return
-        self.flash('Hostel created.')
+        self.flash(_('Hostel created.'))
         write_log_message(self, 'added: % s' % data['hostel_name'])
         self.redirect(self.url(self.context[hostel.hostel_id], 'index'))
@@ -191 +193 @@
     grok.view(HostelDisplayFormPage)
     grok.require('waeup.manageHostels')
-    text = 'Manage'
+    text = _('Manage')
     target = 'manage'
 
@@ -201 +203 @@
     grok.require('waeup.manageHostels')
     form_fields = grok.AutoFields(IHostel).omit('hostel_id')
+    form_fields['beds_reserved'].for_display = True
     grok.template('hostelmanagepage')
-    label = 'Manage hostel'
-    pnav = 5
-    taboneactions = ['Save']
-    tabtwoactions = ['Update all beds',
-        'Switch reservation of selected beds',
-        'Release selected beds']
+    label = _('Manage hostel')
+    pnav = 5
+    taboneactions = [_('Save')]
+    tabtwoactions = [_('Update all beds'),
+        _('Switch reservation of selected beds'),
+        _('Release selected beds')]
     not_occupied = NOT_OCCUPIED
 
@@ -226 +229 @@
         return
 
-    @action('Save')
+    @action(_('Save'))
     def save(self, **data):
         msave(self, **data)
         return
 
-    @action('Update all beds')
+    @action(_('Update all beds'))
     def updateBeds(self, **data):
         removed, added, modified, modified_beds = self.context.updateBeds()
         message = '%d empty beds removed, %d beds added, %d occupied beds modified (%s)' % (
             removed, added, modified, modified_beds)
-        self.flash(message)
+        flash_message = _(
+            '${a} empty beds removed, ${b} beds added, '
+            + '${c} occupied beds modified (${d})',
+            mapping = {'a':removed, 'b':added, 'c':modified, 'd':modified_beds})
+        self.flash(flash_message)
         write_log_message(self, message)
         self.redirect(self.url(self.context, '@@manage')+'?tab2')
         return
 
-    @action('Switch reservation of selected beds')
+    @action(_('Switch reservation of selected beds'))
     def switchReservations(self, **data):
         form = self.request.form
@@ -247 +254 @@
             child_id = form['val_id']
         else:
-            self.flash('No item selected.')
+            self.flash(_('No item selected.'))
             self.redirect(self.url(self.context, '@@manage')+'?tab2')
             return
         if not isinstance(child_id, list):
             child_id = [child_id]
-        switched = []
+        switched = [] # for log file
+        switched_translated = [] # for flash message
+        portal_language = getUtility(ISIRPUtils).PORTAL_LANGUAGE
+        preferred_language = self.request.cookies.get(
+            'sirp.language', portal_language)
         for bed_id in child_id:
-            try:
-                message = self.context[bed_id].switchReservation()
-                switched.append('%s (%s)' % (bed_id,message))
-            except:
-                self.flash('Could not switch %s: %s: %s' % (
-                        id, sys.exc_info()[0], sys.exc_info()[1]))
-                self.redirect(self.url(self.context, '@@manage')+'?tab2')
-                return
+            message = self.context[bed_id].switchReservation()
+            switched.append('%s (%s)' % (bed_id,message))
+            m_translated = translate(message, 'waeup.sirp',
+                target_language=preferred_language)
+            switched_translated.append('%s (%s)' % (bed_id,m_translated))
         if len(switched):
             message = ', '.join(switched)
-            self.flash('Successfully switched beds: %s' % message)
+            m_translated = ', '.join(switched_translated)
+            self.flash(_('Successfully switched beds: ${a}',
+                mapping = {'a':m_translated}))
             write_log_message(self, 'switched: %s' % message)
             self.redirect(self.url(self.context, '@@manage')+'?tab2')
         return
 
-    @action('Release selected beds')
+    @action(_('Release selected beds'))
     def releaseBeds(self, **data):
         form = self.request.form
@@ -275 +285 @@
             child_id = form['val_id']
         else:
-            self.flash('No item selected.')
+            self.flash(_('No item selected.'))
             self.redirect(self.url(self.context, '@@manage')+'?tab2')
             return
@@ -287 +297 @@
         if len(released):
             message = ', '.join(released)
-            self.flash('Successfully released beds: %s' % message)
+            self.flash(_('Successfully released beds: ${a}',
+                mapping = {'a':message}))
             write_log_message(self, 'released: %s' % message)
             self.redirect(self.url(self.context, '@@manage')+'?tab2')
         else:
-            self.flash('No allocated bed selected.')
+            self.flash(_('No allocated bed selected.'))
             self.redirect(self.url(self.context, '@@manage')+'?tab2')
         return
@@ -303 +314 @@
     form_fields = grok.AutoFields(IBedAllocateStudent).omit(
         'bed_id').omit('bed_number').omit('bed_type')
-    label = 'Allocate student'
-    pnav = 5
-
-    @action('Save')
+    label = _('Allocate student')
+    pnav = 5
+
+    @action(_('Save'))
     def save(self, **data):
         msave(self, **data)