[kupu-checkins] r47952 - in kupu/trunk/kupu: . common/kupudrawers default plone plone/kupu_plone_layer
duncan at codespeak.net
duncan at codespeak.net
Thu Oct 25 17:40:31 CEST 2007
Author: duncan
Date: Thu Oct 25 17:40:31 2007
New Revision: 47952
Modified:
kupu/trunk/kupu/common/kupudrawers/drawer.xsl
kupu/trunk/kupu/default/drawers.kupu
kupu/trunk/kupu/default/toolbar.kupu
kupu/trunk/kupu/i18n.bat
kupu/trunk/kupu/plone/body.kupu
kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
kupu/trunk/kupu/plone/plonedrawers.py
Log:
Plone ticket #7258 Missing translation msgids for kupu
Fix i18n batch file so it picks up drawer.xsl, fix some other i18n warnings. Rebuilt kupu.pot
Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl (original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl Thu Oct 25 17:40:31 2007
@@ -390,9 +390,10 @@
</xsl:choose>
</xsl:if>
<xsl:if test="sizes">
- <label class="kupu-detail" i18n:translate="imagedrawer_size"
- for="image-size-selector">Size
- <span class="image-dimensions">
+ <label class="kupu-detail"
+ for="image-size-selector"><span
+ i18n:translate="imagedrawer_size_2">Size</span>
+ <span class="image-dimensions" i18n:translate="imagedrawer_size">
(<span i18n:name="width"><xsl:value-of select="width"/></span>
by
<span i18n:name="height"><xsl:value-of select="height"/></span>)
Modified: kupu/trunk/kupu/default/drawers.kupu
==============================================================================
--- kupu/trunk/kupu/default/drawers.kupu (original)
+++ kupu/trunk/kupu/default/drawers.kupu Thu Oct 25 17:40:31 2007
@@ -309,7 +309,7 @@
Table style
</label>
<select id="kupu-bm-outcls" size="1">
- <option value="" i18n:translate="Normal">Normal</option>
+ <option value="" i18n:translate="Normal">Normal paragraph</option>
</select>
</div>
<div style="float:right" class="hide-anchor">
Modified: kupu/trunk/kupu/default/toolbar.kupu
==============================================================================
--- kupu/trunk/kupu/default/toolbar.kupu (original)
+++ kupu/trunk/kupu/default/toolbar.kupu Thu Oct 25 17:40:31 2007
@@ -61,7 +61,7 @@
<kupu:part name="select-styles">
<select id="kupu-tb-styles">
<option value="P" i18n:translate="Normal">
- Normal
+ Normal paragraph
</option>
<option value="H1">
<span i18n:translate="Heading 1">Heading 1</span>
Modified: kupu/trunk/kupu/i18n.bat
==============================================================================
--- kupu/trunk/kupu/i18n.bat (original)
+++ kupu/trunk/kupu/i18n.bat Thu Oct 25 17:40:31 2007
@@ -80,12 +80,12 @@
for %%f in (default\*) do (find /C "i18n:domain=""kupuconfig""" %%f && set KUPUCONFIG=!KUPUCONFIG! %%f) >nul
for %%f in (plone\*) do (find /C "i18n:domain=""kupuconfig""" %%f && set KUPUCONFIG=!KUPUCONFIG! %%f) >nul
for %%f in (plone\kupu_plone_layer\*) do (find /C "i18n:domain=""kupuconfig""" %%f && set KUPUCONFIG=!KUPUCONFIG! %%f) >nul
-for %%f in (common\drawers\*) do (find /C "i18n:domain=""kupuconfig""" %%f && set KUPUCONFIG=!KUPUCONFIG! %%f) >nul
+for %%f in (common\kupudrawers\*) do (find /C "i18n:domain=""kupuconfig""" %%f && set KUPUCONFIG=!KUPUCONFIG! %%f) >nul
goto :eof
:setKUPU
set KUPU=
for %%f in (default\*) do (find /C "i18n:domain=""kupu""" %%f && set KUPU=!KUPU! %%f) >nul
for %%f in (plone\*) do (find /C "i18n:domain=""kupu""" %%f && set KUPU=!KUPU! %%f) >nul
for %%f in (plone\kupu_plone_layer\*) do (find /C "i18n:domain=""kupu""" %%f && set KUPU=!KUPU! %%f) >nul
-for %%f in (common\drawers\*) do (find /C "i18n:domain=""kupu""" %%f && set KUPU=!KUPU! %%f) >nul
+for %%f in (common\kupudrawers\*) do (find /C "i18n:domain=""kupu""" %%f && set KUPU=!KUPU! %%f) >nul
goto :eof
Modified: kupu/trunk/kupu/plone/body.kupu
==============================================================================
--- kupu/trunk/kupu/plone/body.kupu (original)
+++ kupu/trunk/kupu/plone/body.kupu Thu Oct 25 17:40:31 2007
@@ -18,7 +18,7 @@
base kupu_base_override|base;"
tal:attributes="src string:${base}/emptypage;
id string:kupu-editor-iframe-${fname};
- name string:kupu-editor-iframe-${fname};tabindex tabindex|nothing;"
+ name string:kupu-editor-iframe-${fname};tabindex tabindex/next|tabindex|nothing;"
>
</iframe>
<input type="hidden" name="text_format:default" value="text/html"
Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html (original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html Thu Oct 25 17:40:31 2007
@@ -21,7 +21,7 @@
<!--$Id: wire.kupu 45669 2007-08-15 10:47:27Z duncan $-->
<!--$Id: head.kupu 44831 2007-07-07 19:01:27Z duncan $-->
<!--$Id: xmlconfig.kupu 35367 2006-12-06 09:06:21Z duncan $-->
- <!--$Id: body.kupu 45298 2007-07-24 10:38:54Z duncan $-->
+ <!--$Id: body.kupu 47069 2007-10-01 10:49:09Z duncan $-->
<!--$Id: toolbar.kupu 45621 2007-08-13 12:26:50Z duncan $-->
<!--$Id save.kupu (not yet in svn) $-->
<!--$Id: drawers.kupu 44538 2007-06-26 10:46:28Z duncan $-->
@@ -416,7 +416,7 @@
Table style
</label>
<select id="kupu-bm-outcls" size="1">
- <option value="" i18n:translate="Normal">Normal</option>
+ <option value="" i18n:translate="Normal">Normal paragraph</option>
</select>
</div>
<div style="float:right" class="hide-anchor">
@@ -466,7 +466,7 @@
</table>
<script type="text/javascript">var focuscount = 0;</script>
<div>
- <iframe class="kupu-editor-iframe" frameborder="0" src="emptypage" tabindex="" onfocus="this.contentWindow.focus();" tal:define="base python:here.kupu_library_tool.getBaseUrl(here, True); base kupu_base_override|base;" tal:attributes="src string:${base}/emptypage; id string:kupu-editor-iframe-${fname}; name string:kupu-editor-iframe-${fname};tabindex tabindex|nothing;">
+ <iframe class="kupu-editor-iframe" frameborder="0" src="emptypage" tabindex="" onfocus="this.contentWindow.focus();" tal:define="base python:here.kupu_library_tool.getBaseUrl(here, True); base kupu_base_override|base;" tal:attributes="src string:${base}/emptypage; id string:kupu-editor-iframe-${fname}; name string:kupu-editor-iframe-${fname};tabindex tabindex/next|tabindex|nothing;">
</iframe>
<input type="hidden" name="text_format:default" value="text/html" tal:define="fieldName fieldName|inputname|nothing; val python:fieldName and 'text/html' or 'html'; fieldName python:test(fieldName, fieldName+'_', '') + 'text_format:default';" tal:attributes="name fieldName;value val;"/>
<tal:test condition="fieldName|nothing">
Modified: kupu/trunk/kupu/plone/plonedrawers.py
==============================================================================
--- kupu/trunk/kupu/plone/plonedrawers.py (original)
+++ kupu/trunk/kupu/plone/plonedrawers.py Thu Oct 25 17:40:31 2007
@@ -646,7 +646,7 @@
src = src[len(base):].lstrip('/')
try:
obj = portal.restrictedTraverse(src)
- except AttributeError:
+ except (KeyError, AttributeError):
return []
if portal_types:
while not shasattr(obj.aq_base, 'portal_type'):
More information about the kupu-checkins
mailing list