Menu
▾
▴
[Plone-cvs] r34649 - Plone/trunk/Products/CMFPlone/skins/plone_content
|
From: Godefroid C. <svn...@pl...> - 2010-03-08 23:09:44
|
Author: gotcha
Date: Mon Mar 8 23:09:34 2010
New Revision: 34649
Modified:
Plone/trunk/Products/CMFPlone/skins/plone_content/event_view.pt
Log:
forward port branch 3.3-fix-10196 refs #10196
Modified: Plone/trunk/Products/CMFPlone/skins/plone_content/event_view.pt
==============================================================================
--- Plone/trunk/Products/CMFPlone/skins/plone_content/event_view.pt (original)
+++ Plone/trunk/Products/CMFPlone/skins/plone_content/event_view.pt Mon Mar 8 23:09:34 2010
@@ -31,62 +31,80 @@
<tr>
<th i18n:translate="event_when">When</th>
<td>
- <tal:differentday tal:condition="python:not context.start().Date() == context.end().Date()">
- <abbr metal:define-macro="startdate-field-view"
+ <tal:differentday tal:condition="python:not context.start().Date() == context.end().Date()"
+ i18n:translate="event_when_differentday">
+ <abbr i18n:name="startdate"
+ metal:define-macro="startdate-field-view"
tal:define="kss_class python:getKssClasses('startDate',
templateId=templateId, macro='startdate-field-view');"
id="parent-fieldname-startDate"
tal:attributes="class string:$kss_class dtstart;
title python:context.start().ISO8601()">
- <span metal:define-slot="inside"
+ <span metal:define-slot="inside"
class="explain"
- tal:content="python:toLocalizedTime(context.start(),
- long_format=1)">Start Date Time</span>
- </abbr>
- <span i18n:translate="event_to">to</span> <br />
- <abbr metal:define-macro="enddate-field-view"
+ i18n:translate="event_when_differentday_start">
+ <span tal:omit-tag=""
+ i18n:name="date"
+ tal:content="python:toLocalizedTime(context.start())">Start Date</span>
+ <span tal:omit-tag=""
+ i18n:name="time"
+ tal:content="python:toLocalizedTime(context.start(), time_only=1)">Start Time</span>
+ </span>
+ </abbr>
+ to
+ <br i18n:name="linebreak" />
+ <abbr i18n:name="enddate"
+ metal:define-macro="enddate-field-view"
tal:define="kss_class python:getKssClasses('endDate',
templateId=templateId, macro='enddate-field-view');"
id="parent-fieldname-endDate"
tal:attributes="class string:$kss_class dtend;
title python:context.end().ISO8601()">
- <span metal:define-slot="inside"
- class="explain"
- tal:content="python:toLocalizedTime(context.end(),
- long_format=1)">End Date Time</span>
+ <span metal:define-slot="inside"
+ class="explain"
+ i18n:translate="event_when_differentday_end">
+ <span tal:omit-tag=""
+ i18n:name="date"
+ tal:content="python:toLocalizedTime(context.end())">End Date</span>
+ <span tal:omit-tag=""
+ i18n:name="time"
+ tal:content="python:toLocalizedTime(context.end(), time_only=1)">End Time</span>
+ </span>
</abbr>
</tal:differentday>
- <tal:sameday tal:condition="python:context.start().Date() == context.end().Date()">
- <span tal:replace="python:toLocalizedTime(context.start())">
- Start Date Time</span> <br />
- <span i18n:translate="event_from">from</span>
+ <tal:sameday tal:condition="python:context.start().Date() == context.end().Date()"
+ tal:define="ampm
+ python:site_properties.getProperty('localLongTimeFormat').find('%p') >= 0"
+ i18n:translate="event_when_sameday">
+ <span tal:replace="python:toLocalizedTime(context.start())"
+ i18n:name="date">
+ Start Date Time</span>
+ <br i18n:name="linebreak" />
+ from
<abbr metal:define-macro="startdatesame-field-view"
tal:define="kss_class python:getKssClasses('startDate',
templateId=templateId, macro='startdatesame-field-view');"
id="parent-fieldname-startDate"
tal:attributes="class string:$kss_class dtstart;
- title python:context.start().ISO8601()">
- <span metal:define-slot="inside"
+ title python:context.start().ISO8601()"
+ i18n:name="starttime">
+ <span metal:define-slot="inside"
class="explain"
- tal:content="python:toLocalizedTime(here.start(), time_only=1)">Start Time</span>
- </abbr>
- <span i18n:translate="event_to">to</span>
+ tal:content="python:toLocalizedTime(context.start(), time_only=1)">Start Time</span>
+ </abbr> to
<abbr metal:define-macro="enddatesame-field-view"
tal:define="kss_class python:getKssClasses('endDate',
templateId=templateId, macro='enddatesame-field-view');"
id="parent-fieldname-endDate"
tal:attributes="class string:$kss_class dtend;
- title python:context.end().ISO8601()">
- <span metal:define-slot="inside"
+ title python:context.end().ISO8601()"
+ i18n:name="endtime">
+ <span metal:define-slot="inside"
class="explain"
- tal:content="python:toLocalizedTime(here.end(), time_only=1)">End Time</span>
+ tal:content="python:toLocalizedTime(context.end(), time_only=1)">End Time</span>
</abbr>
-
- <!-- <span tal:replace="python:test(ampm, context.end().AMPMMinutes(), context.end().TimeMinutes())">End Time</span> -->
-
</tal:sameday>
-
</td>
</tr>
<tr tal:condition="context/location">
|