heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding {% trans %} to all fixed strings in the templates

Browse Source
This commit is contained in:
Osama Khalid 2011-08-07 23:36:55 +03:00
parent 3965f0f5fa
commit 8f4c9b813d
13 changed files with 81 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mediagoblin/templates/mediagoblin/auth/login.html
View File

@ -23,21 +23,23 @@
<form action="{{ request.urlgen('mediagoblin.auth.login') }}" <form action="{{ request.urlgen('mediagoblin.auth.login') }}"
method="POST" enctype="multipart/form-data"> method="POST" enctype="multipart/form-data">
<div class="grid_6 prefix_1 suffix_1 form_box"> <div class="grid_6 prefix_1 suffix_1 form_box">
<h1>Log in</h1> <h1>{% trans %}Log in{% endtrans %}</h1>
{% if login_failed %} {% if login_failed %}
<div class="form_field_error">Login failed!</div> <div class="form_field_error">{% trans %}Login failed!{%
{% endif %} endtrans %}</div> {% endif %} {{
{{ wtforms_util.render_divs(login_form) }} wtforms_util.render_divs(login_form) }}
<div class="form_submit_buttons"> <div class="form_submit_buttons">
<input type="submit" value="submit" class="button"/> <input type="submit" value="{% trans %}Submit{% endtrans %}" class="button"/>
</div> </div>
{% if next %} {% if next %}
<input type="hidden" name="next" value="{{ next }}" class="button" <input type="hidden" name="next" value="{{ next }}" class="button"
style="display: none;"/> style="display: none;"/>
{% endif %} {% endif %}
{% if allow_registration %} {% if allow_registration %}
<p>Don't have an account yet?<br /><a href="{{ request.urlgen('mediagoblin.auth.register') }}">Create one here!</a></p> <p>{% trans %}Don't have an account yet?{% endtrans
{% endif %} %}<br /><a href="{{ request.urlgen('mediagoblin.auth.register')
}}">{% trans %}Create one here!{% endtrans %}</a></p> {% endif
%}
</div> </div>
</form> </form>
{% endblock %} {% endblock %}

5
mediagoblin/templates/mediagoblin/auth/register.html
View File

@ -24,10 +24,11 @@
<form action="{{ request.urlgen('mediagoblin.auth.register') }}" <form action="{{ request.urlgen('mediagoblin.auth.register') }}"
method="POST" enctype="multipart/form-data"> method="POST" enctype="multipart/form-data">
<div class="grid_6 prefix_1 suffix_1 form_box"> <div class="grid_6 prefix_1 suffix_1 form_box">
<h1>Create an account!</h1> <h1>{% trans %}Create an account!{% endtrans %}</h1>
{{ wtforms_util.render_divs(register_form) }} {{ wtforms_util.render_divs(register_form) }}
<div class="form_submit_buttons"> <div class="form_submit_buttons">
<input type="submit" value="submit" class="button" /> <input type="submit" value="{% trans %}Submit{% endtrans %}"
class="button" />
</div> </div>
</div> </div>
</form> </form>

2
mediagoblin/templates/mediagoblin/auth/resent_verification_email.html
View File

@ -19,6 +19,6 @@
{% block mediagoblin_content %} {% block mediagoblin_content %}
<p> <p>
Resent your verification email. {% trans %}Resent your verification email.{% endtrans %}
</p> </p>
{% endblock %} {% endblock %}

8
mediagoblin/templates/mediagoblin/auth/verification_email.txt
View File

@ -15,8 +15,10 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
#} #}
Hi {{ username }},
to activate your GNU MediaGoblin account, open the following URL in your web browser {% trans username=username, verification_url=verification_url %}Hi {{ username }},
{{ verification_url|safe }} to activate your GNU MediaGoblin account, open the following URL in
your web browser:
{{ verification_url|safe }}{% endtrans %}

12
mediagoblin/templates/mediagoblin/base.html
View File

@ -19,7 +19,7 @@
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>{% block title %}GNU MediaGoblin{% endblock title %}</title> <title>{% block title %}{% trans %}GNU MediaGoblin{% endtrans %}{% endblock title %}</title>
<link rel="stylesheet" type="text/css" <link rel="stylesheet" type="text/css"
href="{{ request.staticdirect('/css/extlib/reset.css') }}"/> href="{{ request.staticdirect('/css/extlib/reset.css') }}"/>
<link rel="stylesheet" type="text/css" <link rel="stylesheet" type="text/css"
@ -42,13 +42,13 @@
<a class="mediagoblin_logo" <a class="mediagoblin_logo"
href="{{ request.urlgen('index') }}"> href="{{ request.urlgen('index') }}">
<img src="{{ request.staticdirect('/images/logo.png') }}" <img src="{{ request.staticdirect('/images/logo.png') }}"
alt="Mediagoblin logo" /> alt="{% trans %}Mediagoblin logo{% endtrans %}" />
</a> </a>
{% endblock %} {% endblock %}
{% if request.user and request.user['status'] == 'active' %} {% if request.user and request.user['status'] == 'active' %}
<a class="header_submit" <a class="header_submit"
href="{{ request.urlgen('mediagoblin.submit.start') }}"> href="{{ request.urlgen('mediagoblin.submit.start') }}">
Submit media {% trans %}Submit media{% endtrans %}
</a> </a>
{% endif %} {% endif %}
{% block mediagoblin_header_title %}{% endblock %} {% block mediagoblin_header_title %}{% endblock %}
@ -59,7 +59,7 @@
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home', <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
user=request.user['username']) }}" user=request.user['username']) }}"
class="header_submit"> class="header_submit">
verify your email!</a> {% trans %}verify your email!{% endtrans %}</a>
{% endif %} {% endif %}
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home', <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
@ -69,7 +69,7 @@
(<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>) (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>)
{% else %} {% else %}
<a href="{{ request.urlgen('mediagoblin.auth.login') }}"> <a href="{{ request.urlgen('mediagoblin.auth.login') }}">
Login</a> {% trans %}Login{% endtrans %}</a>
{% endif %} {% endif %}
</div> </div>
</div> </div>
@ -85,7 +85,7 @@
{% block mediagoblin_footer %} {% block mediagoblin_footer %}
<div class="container_16"> <div class="container_16">
<div class="grid_16 mediagoblin_footer"> <div class="grid_16 mediagoblin_footer">
Powered by <a href="http://mediagoblin.org">MediaGoblin</a>, a <a href="http://gnu.org/">GNU project</a> {% trans %}Powered by <a href="http://mediagoblin.org">MediaGoblin</a>, a <a href="http://gnu.org/">GNU project</a>{% endtrans %}
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

6
mediagoblin/templates/mediagoblin/edit/edit.html
View File

@ -26,15 +26,15 @@
media= media._id) }}" media= media._id) }}"
method="POST" enctype="multipart/form-data"> method="POST" enctype="multipart/form-data">
<div class="grid_8 prefix_1 suffix_1 edit_box form_box"> <div class="grid_8 prefix_1 suffix_1 edit_box form_box">
<h1>Editing {{ media.title }}</h1> <h1>{% trans media_title=media.title %}Editing {{ media_title }}{% endtrans %}</h1>
<div style="text-align: center;" > <div style="text-align: center;" >
<img src="{{ request.app.public_store.file_url( <img src="{{ request.app.public_store.file_url(
media['media_files']['thumb']) }}" /> media['media_files']['thumb']) }}" />
</div> </div>
{{ wtforms_util.render_divs(form) }} {{ wtforms_util.render_divs(form) }}
<div class="form_submit_buttons"> <div class="form_submit_buttons">
<a href="{{ media.url_for_self(request.urlgen) }}">Cancel</a> <a href="{{ media.url_for_self(request.urlgen) }}">{% trans %}Cancel{% endtrans %}</a>
<input type="submit" value="Save changes" class="button" /> <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button" />
</div> </div>
</div> </div>
</form> </form>

4
mediagoblin/templates/mediagoblin/edit/edit_profile.html
View File

@ -25,10 +25,10 @@
user['username'] }}" user['username'] }}"
method="POST" enctype="multipart/form-data"> method="POST" enctype="multipart/form-data">
<div class="grid_8 prefix_1 suffix_1 edit_box form_box"> <div class="grid_8 prefix_1 suffix_1 edit_box form_box">
<h1>Editing {{ user['username'] }}'s profile</h1> <h1>{% trans username=user['username'] %}Editing {{ username }}'s profile{% endtrans %}</h1>
{{ wtforms_util.render_divs(form) }} {{ wtforms_util.render_divs(form) }}
<div class="form_submit_buttons"> <div class="form_submit_buttons">
<input type="submit" value="submit" class="button" /> <input type="submit" value="{% trans %}Submit{% endtrans %}" class="button" />
</div> </div>
</div> </div>
</form> </form>

4
mediagoblin/templates/mediagoblin/listings/tag.html
View File

@ -26,7 +26,7 @@
{% block mediagoblin_content -%} {% block mediagoblin_content -%}
<h1> <h1>
Media tagged with: {{ tag_name }} {% trans %}Media tagged with:{% endtrans %} {{ tag_name }}
</h1> </h1>
<div class="container_16 media_gallery"> <div class="container_16 media_gallery">
@ -36,6 +36,6 @@
<div class="grid_16"> <div class="grid_16">
<a href="{{ request.urlgen( <a href="{{ request.urlgen(
'mediagoblin.listings.tag_atom_feed', 'mediagoblin.listings.tag_atom_feed',
tag=tag_slug) }}">atom feed</a> tag=tag_slug) }}">{% trans %}atom feed{% endtrans %}</a>
</div> </div>
{% endblock %} {% endblock %}

11
mediagoblin/templates/mediagoblin/root.html
View File

@ -22,17 +22,18 @@
{% if request.user %} {% if request.user %}
<p> <p>
<a href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit an item</a> <a href="{{ request.urlgen('mediagoblin.submit.start') }}">{% trans %}Submit an item{% endtrans %}</a>
</p> </p>
{% else %} {% else %}
<p> <p>
If you have an account, you can {% trans login_url=request.urlgen('mediagoblin.auth.login') %}If you have an account, you can
<a href="{{ request.urlgen('mediagoblin.auth.login') }}">Login</a>. <a href="{{ login_url }}">Login</a>.{% endtrans %}
</p> </p>
{% if allow_registration %} {% if allow_registration %}
<p> <p>
If you don't have an account, please {% trans
<a href="{{ request.urlgen('mediagoblin.auth.register') }}">Register</a>. register_url=request.urlgen('mediagoblin.auth.register') %}If you don't have an account, please
<a href="{{ register_url }}">Register</a>.{% endtrans %}
</p> </p>
{% endif %} {% endif %}
{% endif %} {% endif %}

4
mediagoblin/templates/mediagoblin/submit/start.html
View File

@ -23,13 +23,13 @@
<form action="{{ request.urlgen('mediagoblin.submit.start') }}" <form action="{{ request.urlgen('mediagoblin.submit.start') }}"
method="POST" enctype="multipart/form-data"> method="POST" enctype="multipart/form-data">
<div class="grid_8 prefix_1 suffix_1 form_box"> <div class="grid_8 prefix_1 suffix_1 form_box">
<h1>Submit yer media</h1> <h1>{% trans %}Submit yer media{% endtrans %}</h1>
{{ wtforms_util.render_field_div(submit_form.file) }} {{ wtforms_util.render_field_div(submit_form.file) }}
{{ wtforms_util.render_field_div(submit_form.title) }} {{ wtforms_util.render_field_div(submit_form.title) }}
{{ wtforms_util.render_textarea_div(submit_form.description) }} {{ wtforms_util.render_textarea_div(submit_form.description) }}
{{ wtforms_util.render_field_div(submit_form.tags) }} {{ wtforms_util.render_field_div(submit_form.tags) }}
<div class="form_submit_buttons"> <div class="form_submit_buttons">
<input type="submit" value="Submit" class="button" /> <input type="submit" value="{% trans %}Submit{% endtrans %}" class="button" />
</div> </div>
</div> </div>
</form> </form>

8
mediagoblin/templates/mediagoblin/user_pages/gallery.html
View File

@ -29,7 +29,9 @@
<h1> <h1>
<a href="{{ request.urlgen( <a href="{{ request.urlgen(
'mediagoblin.user_pages.user_home', 'mediagoblin.user_pages.user_home',
user=user.username) }}">{{ user.username }}</a>'s media</h1> user=user.username) }}">{% trans
username=user.username %}{{ username }}</a>'s
media{% endtrans %}</h1>
</div> </div>
<div class="container_16 media_gallery"> <div class="container_16 media_gallery">
@ -38,10 +40,10 @@
<div class="grid_16"> <div class="grid_16">
<a href={{ request.urlgen( <a href={{ request.urlgen(
'mediagoblin.user_pages.atom_feed', 'mediagoblin.user_pages.atom_feed',
user=user.username) }}>atom feed</a> user=user.username) }}>{% trans %}atom feed{% endtrans %}</a>
</div> </div>
{% else %} {% else %}
{# This *should* not occur as the view makes sure we pass in a user. #} {# This *should* not occur as the view makes sure we pass in a user. #}
<p>Sorry, no such user found.<p/> <p>{% trans %}Sorry, no such user found.{% endtrans %}<p/>
{% endif %} {% endif %}
{% endblock %} {% endblock %}

26
mediagoblin/templates/mediagoblin/user_pages/media.html
View File

@ -38,24 +38,24 @@
{% endautoescape %} {% endautoescape %}
<p> <p>
&mdash;&nbsp;uploaded on {% trans date="%4d-%02d-%02d"|format(media.created.year,
{{ "%4d-%02d-%02d"|format(media.created.year, media.created.month, media.created.day), user_url=
media.created.month, media.created.day) }} request.urlgen('mediagoblin.user_pages.user_home',user=
by media.uploader().username),
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home', username=media.uploader().username %}
user= media.uploader().username) }}"> &mdash;&nbsp;uploaded on {{ date }} by <a href="{{
{{- media.uploader().username }}</a> user_url }}">{{ username }}{% endtrans %}</a>
</p> </p>
<br /> <br />
<h3>Comments</h3> <h3>{% trans %}Comments{% endtrans %}</h3>
{% if request.user %} {% if request.user %}
<form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment', <form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment',
user= media.uploader().username, user= media.uploader().username,
media=media._id) }}" method="POST"> media=media._id) }}" method="POST">
{{ wtforms_util.render_field_div(comment_form.comment_content) }} {{ wtforms_util.render_field_div(comment_form.comment_content) }}
<div class="form_submit_buttons"> <div class="form_submit_buttons">
<input type="submit" value="Post comment!" class="button" /> <input type="submit" value="{% trans %}Post comment!{% endtrans %}" class="button" />
</div> </div>
</form> </form>
{% endif %} {% endif %}
@ -77,7 +77,7 @@
<div class="comment_author">&mdash; <div class="comment_author">&mdash;
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home', <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
user = comment_author['username']) }}"> user = comment_author['username']) }}">
{{ comment_author['username'] }}</a> at {{ comment_author['username'] }}</a> {% trans %}at{% endtrans %}
<!--</div> <!--</div>
<div class="comment_datetime">--> <div class="comment_datetime">-->
<a href="{{ request.urlgen('mediagoblin.user_pages.media_home.view_comment', <a href="{{ request.urlgen('mediagoblin.user_pages.media_home.view_comment',
@ -103,7 +103,7 @@
<div class="grid_5 omega"> <div class="grid_5 omega">
{% include "mediagoblin/utils/prev_next.html" %} {% include "mediagoblin/utils/prev_next.html" %}
<h3>Sidebar content here!</h3> <h3>{% trans %}Sidebar content here!{% endtrans %}</h3>
<p> <p>
{% if media['uploader'] == request.user['_id'] or {% if media['uploader'] == request.user['_id'] or
@ -117,7 +117,7 @@
</p> </p>
<p> <p>
<img src="{{ request.staticdirect('/images/icon_delete.png') }}" <img src="{{ request.staticdirect('/images/icon_delete.png') }}"
class="media_icon" />delete class="media_icon" />{% trans %}delete{% endtrans %}
</p> </p>
{% endif %} {% endif %}
</p> </p>
@ -127,6 +127,6 @@
{% endif %} {% endif %}
</div> </div>
{% else %} {% else %}
<p>Sorry, no such media found.<p/> <p>{% trans %}Sorry, no such media found.{% endtrans %}<p/>
{% endif %} {% endif %}
{% endblock %} {% endblock %}

43
mediagoblin/templates/mediagoblin/user_pages/user.html
View File

@ -27,53 +27,56 @@
{% block mediagoblin_content -%} {% block mediagoblin_content -%}
{# If no user... #} {# If no user... #}
{% if not user %} {% if not user %}
<p>Sorry, no such user found.<p/> <p>{% trans %}Sorry, no such user found.{% endtrans %}<p/>
{# User exists, but needs verification #} {# User exists, but needs verification #}
{% elif user.status == "needs_email_verification" %} {% elif user.status == "needs_email_verification" %}
{% if user == request.user %} {% if user == request.user %}
{# this should only be visible when you are this user #} {# this should only be visible when you are this user #}
<div class="grid_6 prefix_1 suffix_1 form_box"> <div class="grid_6 prefix_1 suffix_1 form_box">
<h1>Verification needed</h1> <h1>{% trans %}Verification needed{% endtrans %}</h1>
<p>Almost done! Your account still needs to be verified.</p> <p>{% trans %}Almost done! Your account still needs to be
verified.{% endtrans %}</p>
<p> <p>
An email should arrive in a few moments with instructions {% trans %}An email should arrive in a few moments with
on how to do so. instructions on how to do so.{% endtrans %}
</p> </p>
<p>In case it doesn't:</p> <p>{% trans %}In case it doesn't:{% endtrans %}</p>
<a href="{{ request.urlgen('mediagoblin.auth.resend_verification') }}" <a href="{{ request.urlgen('mediagoblin.auth.resend_verification') }}"
class="button">Resend verification email</a> class="button">{% trans %}Resend verification email{% endtrans %}</a>
</div> </div>
{% else %} {% else %}
{# if the user is not you, but still needs to verify their email #} {# if the user is not you, but still needs to verify their email #}
<div class="grid_6 prefix_1 suffix_1 form_box"> <div class="grid_6 prefix_1 suffix_1 form_box">
<h1>Verification needed</h1> <h1>{% trans %}Verification needed{% endtrans %}</h1>
<p> <p>
Someone has registered an account with this username, but it {% trans %}Someone has registered an account with this
still has to be verified. username, but it still has to be verified.{% endtrans %}
</p> </p>
<p> <p>
If you are that person but you've lost your verification {% trans login_url=request.urlgen('mediagoblin.auth.login')
%}If you are that person but you've lost your verification
email, you can email, you can
<a href="{{ request.urlgen('mediagoblin.auth.login') }}">log in</a> <a href="{{ login_url }}">log in</a> and resend it.{%
and resend it. endtrans %}
</p> </p>
</div> </div>
{% endif %} {% endif %}
{# Active(?) (or at least verified at some point) user, horray! #} {# Active(?) (or at least verified at some point) user, horray! #}
{% else %} {% else %}
<h1>{{ user.username }}'s profile</h1> <h1>{% trans username=user.username %}{{ username }}'s profile{%
endtrans %}</h1>
<div class="grid_6 alpha"> <div class="grid_6 alpha">
{% include "mediagoblin/utils/profile.html" %} {% include "mediagoblin/utils/profile.html" %}
{% if request.user['_id'] == user['_id'] or request.user['is_admin'] %} {% if request.user['_id'] == user['_id'] or request.user['is_admin'] %}
<a href="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{ <a href="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{
user.username }}">Edit profile</a> user.username }}">{% trans %}Edit profile{% endtrans %}</a>
{% endif %} {% endif %}
</div> </div>
@ -81,10 +84,12 @@
{% set pagination_base_url = user_gallery_url %} {% set pagination_base_url = user_gallery_url %}
{% include "mediagoblin/utils/object_gallery.html" %} {% include "mediagoblin/utils/object_gallery.html" %}
<div class="clear"></div> <div class="clear"></div>
<p><a href="{{ user_gallery_url }}">View all of {{ user.username }}'s media</a></p> <p><a href="{{ user_gallery_url }}">{% trans
<a href={{ request.urlgen( username=user.username %}View all of {{ username }}'s media{%
'mediagoblin.user_pages.atom_feed', endtrans %}</a></p>
user=user.username) }}>atom feed</a> <a href={{ request.urlgen( 'mediagoblin.user_pages.atom_feed',
user=user.username) }}>{% trans %}atom feed1{%
endtrans %}</a>
</div> </div>
<div class="clear"></div> <div class="clear"></div>