[kupu-checkins] r53429 - in kupu/trunk/kupu: common/kupudrawers doc plone

[hannosch at codespeak.net]

Author: hannosch
Date: Sun Apr  6 11:46:11 2008
New Revision: 53429

Modified:
   kupu/trunk/kupu/common/kupudrawers/drawer.xsl
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/plone/kupu_config.pt
   kupu/trunk/kupu/plone/zmi_toolbar.pt
Log:
Merged c53424 from the 1.4 branch


Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl	(original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl	Sun Apr  6 11:46:11 2008
@@ -511,10 +511,12 @@
                 target="kupu_upload_form_target" enctype="multipart/form-data" style="margin: 0;
                 border: 0;">
               <xsl:attribute name="action"><xsl:value-of select="uri"/></xsl:attribute>
-                <label i18n:translate="imagedrawer_upload_to_label">Upload
+                <label>
+                  <tal:block i18n:translate="imagedrawer_upload_to_label">Upload
                     to: <span tal:omit-tag="" i18n:name="folder">
                         <xsl:value-of select="/libraries/*[@selected]/title"/>
                     </span>
+                  </tal:block>
                     <input id="kupu-upload-file" type="file" name="node_prop_image" size="20"/>
                 </label>
                 <label>

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Sun Apr  6 11:46:11 2008
@@ -8,6 +8,7 @@
 
     * 7958 Kupu: Insert image: KeyError: 'info' (Error 503 loading kupucollection.xml?resource_type=mediaobject)
     * 7990 Internal link drawer broken for editors
+    * 8003 Fixed Kupu translation msgids containing html.
 
 - 1.4.9
 

Modified: kupu/trunk/kupu/plone/kupu_config.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_config.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_config.pt	Sun Apr  6 11:46:11 2008
@@ -88,21 +88,30 @@
                                   tal:attributes="checked here/getLinkbyuid" />
                            <label for="kupu_linkbyuid" i18n:translate="label_link_uid">Link using UIDs</label>
 
-                           <div class="formHelp" i18n:translate="help_link_uid">Links to objects
-                              on this site created by Kupu can use unique object ids so that the
-                              links remain valid even if the target object is renamed or moved
-                              elsewhere on the site.
+                           <div class="formHelp">
+                              <tal:block i18n:translate="help_link_uid">
+                                Links to objects on this site created by Kupu can use unique object ids
+                                so that the links remain valid even if the target object is renamed or
+                                moved elsewhere on the site.
+                              </tal:block>
                               <span tal:condition="isTransformEnabled">
-                                 A portal transform to hide the UIDs from client browsers is
-                                 currently operating for the fields:
+                                 <tal:block i18n:translate="help_transform_is_enabled">
+                                   A portal transform to hide the UIDs from client browsers is
+                                   currently operating for the fields:
+                                 </tal:block>
                                  <blockquote tal:content="here/supportedCaptioning"></blockquote>
                               </span>
                               <span tal:condition="not:isTransformEnabled">
-                                 If you enable this option a transform to hide UIDs and support image
-                                 captioning from client browsers will also be enabled (see <a
-                                 href="zmi_docs#images">image captioning documentation</a>).  If the
-                                 transform does not enable itself automatically you may need to update
-                                 your PortalTransforms product.
+                                 <tal:block i18n:translate="help_enable_transform">
+                                   If you enable this option a transform to hide UIDs and support image
+                                   captioning from client browsers will also be enabled
+                                 </tal:block>
+                                 (<a i18n:translate="help_image_captioning_url"
+                                 href="zmi_docs#images">see image captioning documentation</a>).
+                                 <tal:block i18n:translate="help_update_portal_transforms">
+                                   If the transform does not enable itself automatically you may
+                                   need to update your PortalTransforms product.
+                                 </tal:block>
                               </span>
                            </div>
 

Modified: kupu/trunk/kupu/plone/zmi_toolbar.pt
==============================================================================
--- kupu/trunk/kupu/plone/zmi_toolbar.pt	(original)
+++ kupu/trunk/kupu/plone/zmi_toolbar.pt	Sun Apr  6 11:46:11 2008
@@ -59,7 +59,8 @@
               <th></th>
               <th i18n:translate="heading_id">ID</th>
               <th i18n:translate="heading_title">Title</th>
-              <th i18n:translate="heading_visible">Visible<br/>
+              <th>
+                <span i18n:translate="heading_visible">Visible</span><br/>
                 <input title="Select all items"
                        i18n:attributes="title check_select_all;"
                        onclick="toggleSelect(this, 'filters.visible:records:int', true);"