Skip to content

Commit

Permalink
translation fix, see sehmaschine#79
Browse files Browse the repository at this point in the history
  • Loading branch information
sehmaschine committed Feb 11, 2012
1 parent a52f6d0 commit 9bae1f8
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 10 deletions.
4 changes: 2 additions & 2 deletions grappelli/templates/admin/delete_selected_confirmation.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
{% if perms_lacking or protected %}
<div class="module">
{% if perms_lacking %}
<h2>{% blocktrans %}Deleting the {{ objects_name }} would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}</h2>
<h2>{% blocktrans %}Deleting the selected {{ objects_name }} would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}</h2>
<div class="row">
<ul class="rte">
{% for obj in perms_lacking %}
Expand All @@ -41,7 +41,7 @@ <h2>{% blocktrans %}Deleting the selected {{ objects_name }} would require delet
</div>
{% else %}
<div class="module">
<h2>{% blocktrans %}Are you sure you want to delete the selected {{ objects_name }} objects? All of the following objects and their related items will be deleted:{% endblocktrans %}</h2>
<h2>{% blocktrans %}Are you sure you want to delete the selected {{ objects_name }}? All of the following objects and their related items will be deleted:{% endblocktrans %}</h2>
{% for deleteable_object in deletable_objects %}
<div class="row">
<ul class="rte">{{ deleteable_object|unordered_list }}</ul>
Expand Down
2 changes: 1 addition & 1 deletion grappelli/templates/admin/edit_inline/stacked.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h2 class="collapse-handler">{% if inline_admin_formset.opts.title %}{{ inline_a
id="{{ inline_admin_formset.formset.prefix }}{% if forloop.last %}-empty{% else %}{{ forloop.counter0 }}{% endif %}">
<h3 class="collapse-handler">{{ inline_admin_formset.opts.verbose_name|title }}&nbsp;&nbsp;{% if inline_admin_form.original %}{{ inline_admin_form.original }}{% endif %}</h3>
<ul class="tools">
{% if inline_admin_form.show_url %}<li class="viewsite-link-container"><a href="../../../r/{{ inline_admin_form.original_content_type_id }}/{{ inline_admin_form.original.id }}/" class="icon viewsite-link" title="{% trans 'View on Site' %}" target="_blank"></a></li>{% endif %}
{% if inline_admin_form.show_url %}<li class="viewsite-link-container"><a href="../../../r/{{ inline_admin_form.original_content_type_id }}/{{ inline_admin_form.original.id }}/" class="icon viewsite-link" title="{% trans 'View on site' %}" target="_blank"></a></li>{% endif %}
{% if inline_admin_formset.opts.sortable_field_name %}
<li class="drag-handler-container"><a href="javascript://" class="icon drag-handler" title="{% trans 'Move Item' %}"></a></li>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion grappelli/templates/admin/edit_inline/tabular.html
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ <h3 style="display: none;"><b>{{ inline_admin_formset.opts.verbose_name|title }}
<div class="td tools">
{% spaceless %}
<ul class="tools">
{% if inline_admin_form.show_url %}<li class="viewsite-link-container"><a href="../../../r/{{ inline_admin_form.original_content_type_id }}/{{ inline_admin_form.original.id }}/" class="icon viewsite-link" title="{% trans 'View on Site' %}" target="_blank"> </a></li>{% endif %}
{% if inline_admin_form.show_url %}<li class="viewsite-link-container"><a href="../../../r/{{ inline_admin_form.original_content_type_id }}/{{ inline_admin_form.original.id }}/" class="icon viewsite-link" title="{% trans 'View on site' %}" target="_blank"> </a></li>{% endif %}
{% if inline_admin_formset.opts.sortable_field_name %}
<li class="drag-handler-container"><a href="javascript://" class="icon drag-handler" title="{% trans 'Move Item' %}"></a></li>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion grappelli/templates/admin/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ <h2><a href="{{ app.app_url }}" class="section">{% trans app.name %}</a></h2>
</div>
{% endfor %}
{% else %}
<p>{% trans "You don´t have permission to edit anything." %}</p>
<p>{% trans "You don't have permission to edit anything." %}</p>
{% endif %}
</div>
<div class="column span-6 last">
Expand Down
2 changes: 1 addition & 1 deletion grappelli/templates/registration/password_change_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h1>{% trans 'Password change' %}</h1>

<div class="container-grid">
<div class="column span-12">
<p>{% trans "Please enter your old password, for securitys sake, and then enter your new password twice so we can verify you typed it in correctly." %}</p>
<p>{% trans "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." %}</p>
<form action="" method="post">{% csrf_token %}
<fieldset class="module">
<div class="row">
Expand Down
2 changes: 1 addition & 1 deletion grappelli/templates/registration/password_reset_done.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@

{% block content %}
<h1>{% trans 'Password reset successful' %}</h1>
<p>{% trans "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly." %}</p>
<p>{% trans "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly." %}</p>
{% endblock %}
3 changes: 1 addition & 2 deletions grappelli/templates/registration/password_reset_email.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{% load url from future %}
{% load i18n %}{% autoescape off %}
{% trans "You're receiving this e-mail because you requested a password reset" %}
{% blocktrans %}for your user account at {{ site_name }}{% endblocktrans %}.
{% blocktrans %}You're receiving this e-mail because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %}

{% trans "Please go to the following page and choose a new password:" %}
{% block reset_link %}
Expand Down
2 changes: 1 addition & 1 deletion grappelli/templates/registration/password_reset_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

{% block content %}
<h1>{% trans "Password reset" %}</h1>
<p>{% trans "Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you." %}</p>
<p>{% trans "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one." %}</p>
<form action="" method="post">{% csrf_token %}
{% if form.email.errors %}{{ form.email.errors }}{% endif %}
<p><label for="id_email">{% trans 'E-mail address:' %}</label> {{ form.email }} <input type="submit" value="{% trans 'Reset my password' %}" /></p>
Expand Down

0 comments on commit 9bae1f8

Please sign in to comment.