Changeset 7718 for main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser_templates

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.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser_templates

Files:

• containermanagepage.pt (modified) (2 diffs)
• containerpage.pt (modified) (2 diffs)
• hostelmanagepage.pt (modified) (5 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser_templates/containermanagepage.pt

@@ -1 @@
-<form action="." tal:attributes="action request/URL" method="POST" enctype="multipart/form-data">
+<form action="." tal:attributes="action request/URL"
+    i18n:domain="waeup.sirp"
+    method="POST" enctype="multipart/form-data">
   <table>
     <thead>
@@ -5 +7 @@
         <th>&nbsp;
         </th>
-        <th>Id
+        <th i18n:translate="">Id
         </th>
-        <th>Name
+        <th i18n:translate="">Name
         </th>
       </tr>

main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser_templates/containerpage.pt

@@ -1 @@
-<div tal:condition="python: not len(context.keys())">
+<div i18n:domain="waeup.sirp"
+   i18n:translate="" tal:condition="python: not len(context.keys())">
 There no subobjects registered yet.
 </div>
 
-<table>
+<table i18n:domain="waeup.sirp">
   <thead>
     <tr>
-      <th>Id</th>
-      <th>Name</th>
+      <th i18n:translate="">Id</th>
+      <th i18n:translate="">Name</th>
     </tr>
   </thead>
@@ -13 +14 @@
     <tr tal:repeat="value context/values">
       <td> <a tal:attributes="href value/__name__">
-          <span tal:content="value/hostel_id">Id</span></a></td>
-      <td tal:content="value/hostel_name">Name</td>
+          <span tal:content="value/hostel_id">ID</span></a></td>
+      <td tal:content="value/hostel_name">NAME</td>
     </tr>
   </tbody>

main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser_templates/hostelmanagepage.pt

@@ -1 +1 @@
 <form action="." tal:attributes="action request/URL" method="POST"
-      enctype="multipart/form-data">
+      i18n:domain="waeup.sirp" enctype="multipart/form-data">
 
   <ul class="tabs" data-tabs="tabs">
-    <li tal:attributes="class view/tab1"><a href="#tab-1"><span>Hostel Data</span></a></li>
-    <li tal:attributes="class view/tab2"><a href="#tab-2"><span>Beds</span></a></li>
+    <li tal:attributes="class view/tab1"><a href="#tab-1">
+      <span i18n:translate="">Hostel Data</span></a>
+    </li>
+    <li tal:attributes="class view/tab2"><a href="#tab-2">
+      <span i18n:translate="">Beds</span></a>
+    </li>
   </ul>
 
@@ -15 +19 @@
           <td class="fieldname">
             <span class="required" tal:condition="widget/required">*</span>
-            <span tal:content="widget/label">label</span>:
+            <span tal:content="widget/label">LABEL</span>:
           </td>
           <td>
@@ -22 +26 @@
             </span>
             <tal:error tal:condition="widget/error">
-              <span tal:replace="structure widget/error">error</span>
+              <span tal:replace="structure widget/error">ERROR</span>
             </tal:error>
             <tal:hint tal:condition="widget/hint">
-              <span tal:content="structure widget/hint">hint</span>
+              <span tal:content="structure widget/hint">HINT</span>
             </tal:hint>
           </td>
@@ -47 +51 @@
         <tr>
           <th>&nbsp;</th>
-          <th>Id</th>
-          <th>Type</th>
-          <th>Number</th>
-          <th>Owner</th>
+          <th i18n:translate="">Id</th>
+          <th i18n:translate="">Type</th>
+          <th i18n:translate="">Number</th>
+          <th i18n:translate="">Owner</th>
         </tr>
       </thead>
@@ -59 +63 @@
                   tal:attributes="value value/__name__" />
           </td>
-          <td tal:content="value/bed_id">Id</td>
-          <td tal:content="value/bed_type">Type</td>
-          <td tal:content="value/bed_number">Number</td>
+          <td tal:content="value/bed_id">ID</td>
+          <td tal:content="value/bed_type">TYPE</td>
+          <td tal:content="value/bed_number">NUMBER</td>
           <td>
             <a tal:condition="python: value.owner != view.not_occupied"
                tal:attributes="href python: '%s/%s/accommodation' %
                     (view.students_url,value.owner)">
-              <span tal:content="value/owner">Owner</span>
+              <span tal:content="value/owner">OWNER</span>
             </a>
             <a tal:condition="python: value.owner == view.not_occupied"
-               tal:attributes="href python: view.url(value)">
+               tal:attributes="href python: view.url(value)"
+               i18n:translate="">
             [allocate student]
             </a>