diff options
| -rw-r--r-- | mediagoblin/edit/views.py | 2 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 7 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/edit/attachments.html | 9 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/utils/collection_gallery.html | 12 |
4 files changed, 19 insertions, 11 deletions
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py index 2d42ff0b..111f9ae8 100644 --- a/mediagoblin/edit/views.py +++ b/mediagoblin/edit/views.py @@ -153,7 +153,7 @@ def edit_attachments(request, media): messages.add_message( request, messages.SUCCESS, - "You added the attachment %s!" \ + _("You added the attachment %s!") \ % (request.form['attachment_name'] or request.files['attachment_file'].filename)) diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index bd3467cb..745bb6f9 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -53,7 +53,12 @@ {% block mediagoblin_header_title %}{% endblock %} <div class="header_right"> {% if request.user %} - <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', user= request.user.username) }}">{{ request.user.username }}</a>{% trans %}'s account{% endtrans %} + {% trans + user_url=request.urlgen('mediagoblin.user_pages.user_home', + user= request.user.username), + user_name=request.user.username -%} + <a href="{{ user_url }}">{{ user_name }}</a>'s account + {%- endtrans %} (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}log out{% endtrans %}</a>) {% if request.user and request.user.status == 'active' %} <a class="button_action" href="{{ request.urlgen('mediagoblin.submit.start') }}">{% trans %}Add media{% endtrans %}</a> diff --git a/mediagoblin/templates/mediagoblin/edit/attachments.html b/mediagoblin/templates/mediagoblin/edit/attachments.html index 641306e8..31084c30 100644 --- a/mediagoblin/templates/mediagoblin/edit/attachments.html +++ b/mediagoblin/templates/mediagoblin/edit/attachments.html @@ -53,11 +53,14 @@ </ul> {% endif %} - <h2>{% trans %]Add attachment{% endtrans %}</h2> + <h2>{% trans %}Add attachment{% endtrans %}</h2> {{ wtforms_util.render_divs(form) }} <div class="form_submit_buttons"> - <a href="{{ media.url_for_self(request.urlgen) }}">Cancel</a> - <input type="submit" value="Save changes" class="button_form" /> + <a href="{{ media.url_for_self(request.urlgen) }}"> + {%- trans %}Cancel{% endtrans -%} + </a> + <input type="submit" value="{% trans %}Save changes{% endtrans %}" + class="button_form" /> {{ csrf_token }} </div> </div> diff --git a/mediagoblin/templates/mediagoblin/utils/collection_gallery.html b/mediagoblin/templates/mediagoblin/utils/collection_gallery.html index 5f8ffea1..25def418 100644 --- a/mediagoblin/templates/mediagoblin/utils/collection_gallery.html +++ b/mediagoblin/templates/mediagoblin/utils/collection_gallery.html @@ -35,21 +35,21 @@ </a> {% if item.note %} - {%- trans note=item.note -%} <br /> - <a href="{{ entry_url }}">{{ note }}</a> - {%- endtrans -%} + <a href="{{ entry_url }}">{{ item.note }}</a> {% endif %} {% if request.user and (item.in_collection.creator == request.user._id or request.user.is_admin) %} - {%- trans remove_url=request.urlgen( + {%- set remove_url=request.urlgen( 'mediagoblin.user_pages.collection_item_confirm_remove', user=item.in_collection.get_creator.username, collection=item.in_collection.slug, collection_item=item.id) -%} - <br /><a href="{{ remove_url }}" class="remove">(remove)</a> - {%- endtrans -%} + <br /> + <a href="{{ remove_url }}" class="remove"> + {%- trans %}(remove){% endtrans -%} + </a> {% endif %} </td> {% endfor %} |