[CalendarServer-changes] [3260] CalendarServer/branches/users/sagen/localization-3218

[source_changes at macosforge.org]

Revision: 3260
          http://trac.macosforge.org/projects/calendarserver/changeset/3260
Author:   sagen at apple.com
Date:     2008-10-29 11:28:15 -0700 (Wed, 29 Oct 2008)
Log Message:
-----------
Collapse duration/recurrence into date/time lines

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/localization-3218/locales/fr/LC_MESSAGES/calendarserver.mo
    CalendarServer/branches/users/sagen/localization-3218/locales/fr/LC_MESSAGES/calendarserver.po
    CalendarServer/branches/users/sagen/localization-3218/locales/pig/LC_MESSAGES/calendarserver.mo
    CalendarServer/branches/users/sagen/localization-3218/locales/pig/LC_MESSAGES/calendarserver.po
    CalendarServer/branches/users/sagen/localization-3218/twistedcaldav/localization.py
    CalendarServer/branches/users/sagen/localization-3218/twistedcaldav/mail.py

Modified: CalendarServer/branches/users/sagen/localization-3218/locales/fr/LC_MESSAGES/calendarserver.mo
===================================================================
(Binary files differ)

Modified: CalendarServer/branches/users/sagen/localization-3218/locales/fr/LC_MESSAGES/calendarserver.po
===================================================================
--- CalendarServer/branches/users/sagen/localization-3218/locales/fr/LC_MESSAGES/calendarserver.po	2008-10-29 18:10:28 UTC (rev 3259)
+++ CalendarServer/branches/users/sagen/localization-3218/locales/fr/LC_MESSAGES/calendarserver.po	2008-10-29 18:28:15 UTC (rev 3260)
@@ -73,8 +73,8 @@
 msgid "Occurs"
 msgstr "Se produit"
 
-msgid "Repeating"
-msgstr "Répétition"
+msgid "(Repeating)"
+msgstr "(Répétition)"
 
 msgid "Once"
 msgstr "Une fois"

Modified: CalendarServer/branches/users/sagen/localization-3218/locales/pig/LC_MESSAGES/calendarserver.mo
===================================================================
(Binary files differ)

Modified: CalendarServer/branches/users/sagen/localization-3218/locales/pig/LC_MESSAGES/calendarserver.po
===================================================================
--- CalendarServer/branches/users/sagen/localization-3218/locales/pig/LC_MESSAGES/calendarserver.po	2008-10-29 18:10:28 UTC (rev 3259)
+++ CalendarServer/branches/users/sagen/localization-3218/locales/pig/LC_MESSAGES/calendarserver.po	2008-10-29 18:28:15 UTC (rev 3260)
@@ -229,8 +229,8 @@
 msgid "Occurs"
 msgstr "Occursway"
 
-msgid "Repeating"
-msgstr "Epeatingray"
+msgid "(Repeating)"
+msgstr "(Epeatingray)"
 
 msgid "Once"
 msgstr "Onceway"

Modified: CalendarServer/branches/users/sagen/localization-3218/twistedcaldav/localization.py
===================================================================
--- CalendarServer/branches/users/sagen/localization-3218/twistedcaldav/localization.py	2008-10-29 18:10:28 UTC (rev 3259)
+++ CalendarServer/branches/users/sagen/localization-3218/twistedcaldav/localization.py	2008-10-29 18:28:15 UTC (rev 3260)
@@ -81,7 +81,6 @@
 or with different punctuation.
 
 
-TODO: durations (including pluralization localization)
 TODO: recurrence
 """
 

Modified: CalendarServer/branches/users/sagen/localization-3218/twistedcaldav/mail.py
===================================================================
--- CalendarServer/branches/users/sagen/localization-3218/twistedcaldav/mail.py	2008-10-29 18:10:28 UTC (rev 3259)
+++ CalendarServer/branches/users/sagen/localization-3218/twistedcaldav/mail.py	2008-10-29 18:28:15 UTC (rev 3260)
@@ -787,10 +787,8 @@
 
 %(orgLabel)s: %(plainOrganizer)s
 %(locLabel)s: %(location)s
-%(dateLabel)s: %(dateInfo)s
-%(timeLabel)s: %(timeInfo)s
-%(durationLabel)s: %(durationInfo)s
-%(recurrenceLabel)s: %(recurrenceInfo)s
+%(dateLabel)s: %(dateInfo)s %(recurrenceInfo)s
+%(timeLabel)s: %(timeInfo)s %(durationInfo)s
 %(descLabel)s: %(description)s
 %(attLabel)s: %(plainAttendees)s
 """
@@ -840,18 +838,12 @@
     <h3>%(locLabel)s:</h3> %(location)s
     </p>
     <p>
-    <h3>%(dateLabel)s:</h3> %(dateInfo)s
+    <h3>%(dateLabel)s:</h3> %(dateInfo)s %(recurrenceInfo)s
     </p>
     <p>
-    <h3>%(timeLabel)s:</h3> %(timeInfo)s
+    <h3>%(timeLabel)s:</h3> %(timeInfo)s %(durationInfo)s
     </p>
     <p>
-    <h3>%(durationLabel)s:</h3> %(durationInfo)s
-    </p>
-    <p>
-    <h3>%(recurrenceLabel)s:</h3> %(recurrenceInfo)s
-    </p>
-    <p>
     <h3>%(descLabel)s:</h3> %(description)s
     </p>
     <p>
@@ -919,16 +911,16 @@
 
         with translationTo(language) as trans:
             results['dateInfo'] = trans.date(component)
-            results['timeInfo'], results['durationInfo'] = trans.time(component)
+            results['timeInfo'], duration = trans.time(component)
+            results['durationInfo'] = "(%s)" % (duration,) if duration else ""
 
-
             for propertyName in ("RRULE", "RDATE", "EXRULE", "EXDATE",
                 "RECURRENCE-ID"):
                 if component.hasProperty(propertyName):
-                    results['recurrenceInfo'] = _("Repeating")
+                    results['recurrenceInfo'] = _("(Repeating)")
                     break
             else:
-                results['recurrenceInfo'] = _("Once")
+                results['recurrenceInfo'] = ""
 
         return results
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081029/7443030c/attachment.html>