Changeset 8234

Timestamp:

20 Apr 2012, 11:27:59 (13 years ago)

Author:

Henrik Bettermann

Message:

Show only time zone name.

Location:

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

Files:

• accesscodes/tests/test_accesscode.py (modified) (2 diffs)
• browser/pdf.py (modified) (1 diff)
• hostels/hostel.py (modified) (1 diff)
• hostels/tests.py (modified) (1 diff)
• objecthistory.py (modified) (1 diff)
• students/utils.py (modified) (1 diff)
• tests/test_objecthistory.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/tests/test_accesscode.py

@@ -233 +233 @@
         # Access codes have a history.
         match = re.match(
-            '^....-..-.. ..:..:.. ..... .+ - initialized by system',
+            '^....-..-.. ..:..:.. .+ - initialized by system',
             self.ac1.history)
         assert match is not None
@@ -300 +300 @@
 "prefix","serial","ac","state","history"
 "FOO","9.99","1","0"
-"FOO","0","FOO-1-11111111","used","<YYYY-MM-DD hh:mm:ss TZ> - ..."
-"FOO","1","FOO-1-22222222","initialized","<YYYY-MM-DD hh:mm:ss TZ> - ..."
-"FOO","2","FOO-1-33333333","disabled","<YYYY-MM-DD hh:mm:ss TZ> - ..."
+"FOO","0","FOO-1-11111111","used","<YYYY-MM-DD hh:mm:ss> UTC - ..."
+"FOO","1","FOO-1-22222222","initialized","<YYYY-MM-DD hh:mm:ss> UTC - ..."
+"FOO","2","FOO-1-33333333","disabled","<YYYY-MM-DD hh:mm:ss> UTC - ..."
 '''[1:]
         contents = open(result_path, 'rb').read()

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

@@ -332 +332 @@
         if not getattr(doc, 'kofa_nodate', False):
             tz = getUtility(IKofaUtils).tzinfo
-            today = now(tz).strftime('%d/%m/%Y %H:%M:%S %z %Z')
+            today = now(tz).strftime('%d/%m/%Y %H:%M:%S %Z')
             canvas.drawString(2.2*cm, 0.5 * inch,
                 translate(_(u'Date: ${a}', mapping = {'a': today})))

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

@@ -210 +210 @@
             bedticket.bed = None
             tz = getUtility(IKofaUtils).tzinfo
-            timestamp = now(tz).strftime("%Y-%m-%d %H:%M:%S %z %Z")
+            timestamp = now(tz).strftime("%Y-%m-%d %H:%M:%S %Z")
             bedticket.bed_coordinates = u'-- booking cancelled on %s --' % (
                 timestamp,)

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

@@ -284 +284 @@
           self.browser.contents)
         self.assertMatches(bedticket.bed_coordinates,
-          u' -- booking cancelled on <YYYY-MM-DD hh:mm:ss TZ> --')
+          u' -- booking cancelled on <YYYY-MM-DD hh:mm:ss> UTC --')
         # If we release a free be, nothing will happen
         ctrl = self.browser.getControl(name='val_id')

main/waeup.kofa/trunk/src/waeup/kofa/objecthistory.py

@@ -61 +61 @@
         msgs = self._getMessages()
         tz = getUtility(IKofaUtils).tzinfo
-        timestamp = now(tz).strftime("%Y-%m-%d %H:%M:%S %z %Z")
+        timestamp = now(tz).strftime("%Y-%m-%d %H:%M:%S %Z")
         user = get_current_principal()
         if user is None:

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

@@ -209 +209 @@
       frame_footer = Frame(1*cm,0,width-(2*cm),1*cm)
       tz = getUtility(IKofaUtils).tzinfo
-      timestamp = now(tz).strftime("%d/%m/%Y %H:%M:%S %z %Z")
+      timestamp = now(tz).strftime("%d/%m/%Y %H:%M:%S %Z")
       left_text = '<font size=10>%s</font>' % timestamp
       story.append(Paragraph(left_text, style["Normal"]))

main/waeup.kofa/trunk/src/waeup/kofa/tests/test_objecthistory.py

@@ -80 +80 @@
         hist.addMessage('blah')
         result = ''.join(hist.messages)
-        self.assertMatches('<YYYY-MM-DD hh:mm:ss TZ> - blah by system', result)
+        self.assertMatches('<YYYY-MM-DD hh:mm:ss> UTC - blah by system', result)
 
     def test_add_messages_existing_principal(self):
@@ -89 +89 @@
         hist.addMessage('blah')
         result = ''.join(hist.messages)
-        self.assertMatches('<YYYY-MM-DD hh:mm:ss TZ> - blah by Bob', result)
+        self.assertMatches('<YYYY-MM-DD hh:mm:ss> UTC - blah by Bob', result)
 
     def test_messages(self):