Skip to content

Commit

Permalink
Merge branch 'master' into dictmulti3.0
Browse files Browse the repository at this point in the history
Conflicts:
	CHANGES.txt
  • Loading branch information
djay committed Apr 7, 2013
2 parents 3243d1c + c53a34f commit c3e5ca2
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 72 deletions.
1 change: 1 addition & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ CHANGES
--------------------

- Added support for IDict Widget in MultiWidget.
- Updated pt_BR translation


3.0.0a2 (2013-02-26)
Expand Down
2 changes: 1 addition & 1 deletion src/z3c/form/browser/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ Bytes
<input type="file" id="foo" name="bar" class="file-widget required bytes-field" />

>>> widget.mode = interfaces.DISPLAY_MODE
>>> widget.render().strip('\n')
>>> widget.render().strip('\r\n')
u'<span id="foo" class="file-widget required bytes-field">Default bytes</span>'

Calling the widget will return the widget including the layout
Expand Down
26 changes: 13 additions & 13 deletions src/z3c/form/browser/text_hidden.pt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<div xmlns="http://www.w3.org/1999/xhtml"
xmlns:tal="http://xml.zope.org/namespaces/tal"
tal:omit-tag="">
<input id="" name="" value="" class="hidden-widget" title=""
tabindex="" accesskey=""
type="hidden"
tal:attributes="id view/id;
name view/name;
title view/title;
tabindex view/tabindex;
accesskey view/accesskey;
value view/value" />
</div>
<div xmlns="http://www.w3.org/1999/xhtml"
xmlns:tal="http://xml.zope.org/namespaces/tal"
tal:omit-tag="">
<input id="" name="" value="" class="hidden-widget" title=""
tabindex="" accesskey=""
type="hidden"
tal:attributes="id view/id;
name view/name;
title view/title;
tabindex view/tabindex;
accesskey view/accesskey;
value view/value" />
</div>
17 changes: 8 additions & 9 deletions src/z3c/form/locales/pt_BR/LC_MESSAGES/z3c.form.po
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Development/Unknown\n"
"POT-Creation-Date: Mon Sep 17 15:11:41 2012\n"
"PO-Revision-Date: 2011-12-14 13:07-0600\n"
"PO-Revision-Date: 2013-04-06 14:59+0300\n"
"Last-Translator: Héctor Velarde <hector.velarde@gmail.com>\n"
"Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"
"Language: \n"
Expand Down Expand Up @@ -165,15 +165,14 @@ msgstr "O contrutor dos widgets."

#: src/z3c/form/interfaces.py:215 src/z3c/form/interfaces.py:467
msgid "Show default value"
msgstr ""
msgstr "Exibir valor padrão"

#: src/z3c/form/interfaces.py:216 src/z3c/form/interfaces.py:468
#, fuzzy
msgid ""
"A flag, when set, makes the widget to displayfield|adapter provided default "
"values."
msgstr ""
"Uma marcação que quando habilitada força o widget a não considerar o "
"Uma marcação que, quando habilitada, força o widget a não considerar o "
"contexto para a exibição do valor."

#: src/z3c/form/interfaces.py:349
Expand Down Expand Up @@ -277,15 +276,15 @@ msgstr ""
"erro ao chamar o método extract()."

#: src/z3c/form/interfaces.py:460
#, fuzzy
msgid "Ignore Required validation"
msgstr "Ignora a Requisição"
msgstr "Ignorar a validacão requerida"

#: src/z3c/form/interfaces.py:461
msgid ""
"If set then required fields will pass validation regardless whether they're "
"filled in or not"
msgstr ""
"Caso selecionado os campos requeridos passarão a validação mesmo que não estejam preenchidos"

#: src/z3c/form/interfaces.py:516
msgid "NO_VALUE Token"
Expand Down Expand Up @@ -371,13 +370,13 @@ msgstr "Caso marcado, os campos apenas-leitura também serão exibidos."

#: src/z3c/form/interfaces.py:652 src/z3c/form/interfaces.py:922
msgid "Ignore Required validation on extract"
msgstr ""
msgstr "Ignorar a validação de campos requeridos na extração"

#: src/z3c/form/interfaces.py:653 src/z3c/form/interfaces.py:923
msgid ""
"If set then required fields will pass validation on extract regardless "
"whether they're filled in or not"
msgstr ""
msgstr "Caso selecionado os campos marcados como requeridos passarão na validação mesmo que não tenham sido preenchidos"

#: src/z3c/form/interfaces.py:659
msgid "Has required fields"
Expand Down Expand Up @@ -610,7 +609,7 @@ msgstr "O widget para o evento foi criado."

#: src/z3c/form/term.py:153
msgid "Missing: ${value}"
msgstr ""
msgstr "Faltando: ${value}"

#: src/z3c/form/term.py:205
msgid "yes"
Expand Down
98 changes: 49 additions & 49 deletions src/z3c/form/tests/simple_nested_groupedit.pt
Original file line number Diff line number Diff line change
@@ -1,49 +1,49 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:metal="http://xml.zope.org/namespaces/metal"
xmlns:tal="http://xml.zope.org/namespaces/tal">
<body>
<i tal:condition="view/status" tal:content="view/status"/>
<ul tal:condition="view/widgets/errors"
metal:define-macro="errors">
<li tal:repeat="error view/widgets/errors">
<tal:block condition="error/widget">
<tal:block replace="error/widget/label" />:
</tal:block>
<tal:block replace="structure error/render" />
</li>
</ul>
<form action=".">
<metal:block metal:define-macro="rows">
<div class="row"
tal:repeat="widget view/widgets/values">
<b tal:condition="widget/error"
tal:content="structure widget/error/render" />
<label for=""
tal:attributes="for widget/id"
tal:content="widget/label" />
<input type="text" tal:replace="structure widget/render" />
</div>
</metal:block>
<fieldset tal:condition="view/groups|nothing"
tal:repeat="view view/groups">
<legend tal:condition="view/label"
tal:content="view/label">Label</legend>
<div metal:use-macro="template/macros/errors" />
<div metal:use-macro="template/macros/rows" />
<fieldset tal:condition="view/groups|nothing"
tal:repeat="view view/groups">
<legend tal:condition="view/label"
tal:content="view/label">Label</legend>
<div metal:use-macro="template/macros/errors" />
<div metal:use-macro="template/macros/rows" />
</fieldset>
</fieldset>
<div class="action"
tal:condition="view/actions|nothing"
tal:repeat="action view/actions/values">
<input type="submit" tal:replace="structure action/render"
/></div>
</form>
</body>
</html>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:metal="http://xml.zope.org/namespaces/metal"
xmlns:tal="http://xml.zope.org/namespaces/tal">
<body>
<i tal:condition="view/status" tal:content="view/status"/>
<ul tal:condition="view/widgets/errors"
metal:define-macro="errors">
<li tal:repeat="error view/widgets/errors">
<tal:block condition="error/widget">
<tal:block replace="error/widget/label" />:
</tal:block>
<tal:block replace="structure error/render" />
</li>
</ul>
<form action=".">
<metal:block metal:define-macro="rows">
<div class="row"
tal:repeat="widget view/widgets/values">
<b tal:condition="widget/error"
tal:content="structure widget/error/render" />
<label for=""
tal:attributes="for widget/id"
tal:content="widget/label" />
<input type="text" tal:replace="structure widget/render" />
</div>
</metal:block>
<fieldset tal:condition="view/groups|nothing"
tal:repeat="view view/groups">
<legend tal:condition="view/label"
tal:content="view/label">Label</legend>
<div metal:use-macro="template/macros/errors" />
<div metal:use-macro="template/macros/rows" />
<fieldset tal:condition="view/groups|nothing"
tal:repeat="view view/groups">
<legend tal:condition="view/label"
tal:content="view/label">Label</legend>
<div metal:use-macro="template/macros/errors" />
<div metal:use-macro="template/macros/rows" />
</fieldset>
</fieldset>
<div class="action"
tal:condition="view/actions|nothing"
tal:repeat="action view/actions/values">
<input type="submit" tal:replace="structure action/render"
/></div>
</form>
</body>
</html>

0 comments on commit c3e5ca2

Please sign in to comment.