[Testbot] Plone 4.3 - Python 2.6 - Build # 2066 - Still failing! - 2 failure(s)

jenkins at plone.org jenkins at plone.org
Tue May 13 16:57:39 UTC 2014


-------------------------------------------------------------------------------
Plone 4.3 - Python 2.6 - Build # 2066 - Still Failing!
-------------------------------------------------------------------------------

http://jenkins.plone.org/job/plone-4.3-python-2.6/2066/


-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------

Repository: Products.CMFPlone
Branch: refs/heads/4.3.x
Date: 2014-05-13T18:24:16+02:00
Author: Vincent Fretin (vincentfretin) <vincent.fretin at gmail.com>
Commit: https://github.com/plone/Products.CMFPlone/commit/25e9f1ba897b0316e2fcf34b3de23a08e4ec4489

don't change event_when_sameday default message (introduced in e7af01d00d038a55bf7d2b6b6fb34543f0c141ef) to not have a translation regression

Files changed:
M Products/CMFPlone/skins/plone_content/event_view.pt

diff --git a/Products/CMFPlone/skins/plone_content/event_view.pt b/Products/CMFPlone/skins/plone_content/event_view.pt
index 22b1e14..cd70686 100644
--- a/Products/CMFPlone/skins/plone_content/event_view.pt
+++ b/Products/CMFPlone/skins/plone_content/event_view.pt
@@ -12,7 +12,9 @@
                         tal:define="kssClassesView context/@@kss_field_decorator_view;
                                     getKssClasses nocall:kssClassesView/getKssClassesInlineEditable;
                                     templateId template/getId;
-                                    toLocalizedTime nocall:context/@@plone/toLocalizedTime;">
+                                    toLocalizedTime nocall:context/@@plone/toLocalizedTime;
+                                    same_time python:context.start().Time() == context.end().Time();
+                                    same_day python:context.start().Date() == context.end().Date();">
 
         <div class="eventDetails vcard">
             <table class="vertical listing"
@@ -55,15 +57,18 @@
                                 </abbr>
                             </tal:differentday>
 
-                            <tal:sameday tal:condition="python:context.start().Date() == context.end().Date()">
-                                <tal:date i18n:translate="event_when_sameday">
+                            <tal:sametime tal:condition="python:same_day and same_time"
+                                          i18n:translate="event_when_sameday_sametime">
+                                <span tal:replace="python:toLocalizedTime(context.start())"
+                                      i18n:name="date">
+                                    Start Date Time</span>
+                            </tal:sametime>
+                            <tal:sameday tal:condition="python:same_day and not same_time"
+                                         i18n:translate="event_when_sameday">
                                 <span tal:replace="python:toLocalizedTime(context.start())"
                                       i18n:name="date">
                                     Start Date Time</span>
-                                </tal:date>
 
-                              <tal:notsametime tal:condition="python:context.start().Time() != context.end().Time()"
-                                               i18n:translate="event_when_notsametime">
                                 <br i18n:name="linebreak" />
                                 from
                                 <abbr metal:define-macro="startdatesame-field-view"
@@ -88,7 +93,6 @@
                                             class="explain"
                                             tal:content="python:toLocalizedTime(context.end(), time_only=1)">End Time</span>
                                 </abbr>
-                              </tal:notsametime>
 
                             </tal:sameday>
                         </td>




-------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CHANGES.log
Type: application/octet-stream
Size: 3418 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140513/e40ff02a/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build.log
Type: application/octet-stream
Size: 163542 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140513/e40ff02a/attachment-0003.obj>


More information about the Testbot mailing list