Merge remote branch 'aaronw/bug608_checkbox_labels'

* aaronw/bug608_checkbox_labels:
  No need to translate label name.
  Add label tag to fix translation issue.
  Update english translation file.
  Checkbox label is being translated in the form definition -- translating it in the template is redundant and breaks <label> functionality.

Conflicts:
	mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po
This commit is contained in:
Elrond 2011-10-15 14:15:36 +02:00
commit 404d8fa9ae

View File

@ -41,7 +41,7 @@
<p class="delete_checkbox_box">
{{ form.confirm }}
{{ _(form.confirm.label.text) }}
<label for="{{ (form.confirm.name) }}">{{ _(form.confirm.label.text) }}</label>
</p>
<div class="form_submit_buttons">