ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated EN translation strings and updated EN po files.

Browse Source 
Template fixes and improvements.
This commit is contained in:
Emanuel Schuetze 2013-06-03 22:50:58 +02:00
parent bdfdb4c064
commit cf791e599a
6 changed files with 316 additions and 278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/agenda/templates/agenda/item_row.html
View File

@ -44,7 +44,7 @@
{% if perms.agenda.can_see_orga_items %} {% if perms.agenda.can_see_orga_items %}
<div class="duration"> <div class="duration">
{% if node.duration %} {% if node.duration %}
{{ node.duration }}h {{ node.duration }} h
{% if start and end %} {% if start and end %}
<a rel="tooltip" data-original-title="{% trans 'End' %}: <a rel="tooltip" data-original-title="{% trans 'End' %}:
{{ end|date:"DATETIME_FORMAT" }}"><i class="icon-clock"></i> {{ end|date:"DATETIME_FORMAT" }}"><i class="icon-clock"></i>

2
openslides/agenda/templates/agenda/overview.html
View File

@ -91,7 +91,7 @@
<td class="optional"></td> <td class="optional"></td>
{% endif %} {% endif %}
{% if perms.agenda.can_see_orga_items %} {% if perms.agenda.can_see_orga_items %}
<td class="duration">{{ duration }}h</td> <td class="duration">{{ duration }} h</td>
{% endif %} {% endif %}
{% if perms.agenda.can_manage_agenda or perms.projector.can_manage_projector %} {% if perms.agenda.can_manage_agenda or perms.projector.can_manage_projector %}
<td class="manage"> <td class="manage">

575
openslides/locale/en/LC_MESSAGES/django.po
View File

File diff suppressed because it is too large Load Diff

2
openslides/locale/en/LC_MESSAGES/djangojs.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-06-01 21:13+0200\n" "POT-Creation-Date: 2013-06-03 22:50+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

2
openslides/motion/templates/motion/motion_detail.html
View File

@ -38,11 +38,11 @@
{% trans 'More actions' %} <span class="caret"></span> {% trans 'More actions' %} <span class="caret"></span>
</a> </a>
<ul class="dropdown-menu pull-right"> <ul class="dropdown-menu pull-right">
{% if perms.motion.can_manage_motion %}
<!-- edit --> <!-- edit -->
{% if allowed_actions.edit %} {% if allowed_actions.edit %}
<li><a href="{% model_url motion 'edit' %}"><i class="icon-pencil"></i> {% trans 'Edit motion' %}</a></li> <li><a href="{% model_url motion 'edit' %}"><i class="icon-pencil"></i> {% trans 'Edit motion' %}</a></li>
{% endif %} {% endif %}
{% if perms.motion.can_manage_motion %}
<!-- delete --> <!-- delete -->
{% if allowed_actions.delete %} {% if allowed_actions.delete %}
<li><a href="{% model_url motion 'delete' %}"><i class="icon-remove"></i> {% trans 'Delete motion' %}</a></li> <li><a href="{% model_url motion 'delete' %}"><i class="icon-remove"></i> {% trans 'Delete motion' %}</a></li>

5
openslides/motion/views.py
View File

@ -731,7 +731,10 @@ class MotionCSVImportView(FormView):
if count_success: if count_success:
messages.success( messages.success(
self.request, self.request,
"<strong>%s</strong><br>%s" % (_('Summary'), _('%d of %d motions successfully imported.') % (count_success, count_lines))) "<strong>%s</strong><br>%s" % (
_('Summary'),
_('%(counts)d of %(total)d motions successfully imported.')
% {'counts': count_success, 'total': count_lines}))
return super(MotionCSVImportView, self).form_valid(form) return super(MotionCSVImportView, self).form_valid(form)
motion_csv_import = MotionCSVImportView.as_view() motion_csv_import = MotionCSVImportView.as_view()