diff options
13 files changed, 80 insertions, 67 deletions
diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html index e25783ea..8b1e2296 100644 --- a/mediagoblin/templates/mediagoblin/auth/login.html +++ b/mediagoblin/templates/mediagoblin/auth/login.html @@ -23,21 +23,23 @@ <form action="{{ request.urlgen('mediagoblin.auth.login') }}" method="POST" enctype="multipart/form-data"> <div class="grid_6 prefix_1 suffix_1 form_box"> - <h1>Log in</h1> + <h1>{% trans %}Log in{% endtrans %}</h1> {% if login_failed %} - <div class="form_field_error">Login failed!</div> - {% endif %} - {{ wtforms_util.render_divs(login_form) }} + <div class="form_field_error">{% trans %}Login failed!{% + endtrans %}</div> {% endif %} {{ + wtforms_util.render_divs(login_form) }} <div class="form_submit_buttons"> - <input type="submit" value="submit" class="button"/> + <input type="submit" value="{% trans %}Submit{% endtrans %}" class="button"/> </div> {% if next %} <input type="hidden" name="next" value="{{ next }}" class="button" style="display: none;"/> {% endif %} {% if allow_registration %} - <p>Don't have an account yet?<br /><a href="{{ request.urlgen('mediagoblin.auth.register') }}">Create one here!</a></p> - {% endif %} + <p>{% trans %}Don't have an account yet?{% endtrans + %}<br /><a href="{{ request.urlgen('mediagoblin.auth.register') + }}">{% trans %}Create one here!{% endtrans %}</a></p> {% endif + %} </div> </form> {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/auth/register.html b/mediagoblin/templates/mediagoblin/auth/register.html index f77b3782..5d512829 100644 --- a/mediagoblin/templates/mediagoblin/auth/register.html +++ b/mediagoblin/templates/mediagoblin/auth/register.html @@ -24,10 +24,11 @@ <form action="{{ request.urlgen('mediagoblin.auth.register') }}" method="POST" enctype="multipart/form-data"> <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) }} <div class="form_submit_buttons"> - <input type="submit" value="submit" class="button" /> + <input type="submit" value="{% trans %}Submit{% endtrans %}" + class="button" /> </div> </div> </form> diff --git a/mediagoblin/templates/mediagoblin/auth/resent_verification_email.html b/mediagoblin/templates/mediagoblin/auth/resent_verification_email.html index da3a9e99..8fd80ee9 100644 --- a/mediagoblin/templates/mediagoblin/auth/resent_verification_email.html +++ b/mediagoblin/templates/mediagoblin/auth/resent_verification_email.html @@ -19,6 +19,6 @@ {% block mediagoblin_content %} <p> - Resent your verification email. + {% trans %}Resent your verification email.{% endtrans %} </p> {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/auth/verification_email.txt b/mediagoblin/templates/mediagoblin/auth/verification_email.txt index 7863374d..cb01600d 100644 --- a/mediagoblin/templates/mediagoblin/auth/verification_email.txt +++ b/mediagoblin/templates/mediagoblin/auth/verification_email.txt @@ -15,8 +15,10 @@ # 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/>. #} -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 %} diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 4da685f9..b9c98ef6 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -19,7 +19,7 @@ <html> <head> <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" href="{{ request.staticdirect('/css/extlib/reset.css') }}"/> <link rel="stylesheet" type="text/css" @@ -42,13 +42,13 @@ <a class="mediagoblin_logo" href="{{ request.urlgen('index') }}"> <img src="{{ request.staticdirect('/images/logo.png') }}" - alt="Mediagoblin logo" /> + alt="{% trans %}Mediagoblin logo{% endtrans %}" /> </a> {% endblock %} {% if request.user and request.user['status'] == 'active' %} <a class="header_submit" href="{{ request.urlgen('mediagoblin.submit.start') }}"> - Submit media + {% trans %}Submit media{% endtrans %} </a> {% endif %} {% block mediagoblin_header_title %}{% endblock %} @@ -59,7 +59,7 @@ <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', user=request.user['username']) }}" class="header_submit"> - verify your email!</a> + {% trans %}verify your email!{% endtrans %}</a> {% endif %} <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', @@ -69,7 +69,7 @@ (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>) {% else %} <a href="{{ request.urlgen('mediagoblin.auth.login') }}"> - Login</a> + {% trans %}Login{% endtrans %}</a> {% endif %} </div> </div> @@ -85,7 +85,7 @@ {% block mediagoblin_footer %} <div class="container_16"> <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> {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/edit/edit.html b/mediagoblin/templates/mediagoblin/edit/edit.html index d19034cb..3dc170c8 100644 --- a/mediagoblin/templates/mediagoblin/edit/edit.html +++ b/mediagoblin/templates/mediagoblin/edit/edit.html @@ -26,15 +26,15 @@ media= media._id) }}" method="POST" enctype="multipart/form-data"> <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;" > <img src="{{ request.app.public_store.file_url( media['media_files']['thumb']) }}" /> </div> {{ 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" /> + <a href="{{ media.url_for_self(request.urlgen) }}">{% trans %}Cancel{% endtrans %}</a> + <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button" /> </div> </div> </form> diff --git a/mediagoblin/templates/mediagoblin/edit/edit_profile.html b/mediagoblin/templates/mediagoblin/edit/edit_profile.html index a11b86d7..4171cb4d 100644 --- a/mediagoblin/templates/mediagoblin/edit/edit_profile.html +++ b/mediagoblin/templates/mediagoblin/edit/edit_profile.html @@ -25,10 +25,10 @@ user['username'] }}" method="POST" enctype="multipart/form-data"> <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) }} <div class="form_submit_buttons"> - <input type="submit" value="submit" class="button" /> + <input type="submit" value="{% trans %}Submit{% endtrans %}" class="button" /> </div> </div> </form> diff --git a/mediagoblin/templates/mediagoblin/listings/tag.html b/mediagoblin/templates/mediagoblin/listings/tag.html index 6f10ec8d..18123dbd 100644 --- a/mediagoblin/templates/mediagoblin/listings/tag.html +++ b/mediagoblin/templates/mediagoblin/listings/tag.html @@ -26,7 +26,7 @@ {% block mediagoblin_content -%} <h1> - Media tagged with: {{ tag_name }} + {% trans %}Media tagged with:{% endtrans %} {{ tag_name }} </h1> <div class="container_16 media_gallery"> @@ -36,6 +36,6 @@ <div class="grid_16"> <a href="{{ request.urlgen( 'mediagoblin.listings.tag_atom_feed', - tag=tag_slug) }}">atom feed</a> + tag=tag_slug) }}">{% trans %}atom feed{% endtrans %}</a> </div> {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/root.html b/mediagoblin/templates/mediagoblin/root.html index ed7b931f..3570374e 100644 --- a/mediagoblin/templates/mediagoblin/root.html +++ b/mediagoblin/templates/mediagoblin/root.html @@ -22,17 +22,18 @@ {% if request.user %} <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> {% else %} <p> - If you have an account, you can - <a href="{{ request.urlgen('mediagoblin.auth.login') }}">Login</a>. + {% trans login_url=request.urlgen('mediagoblin.auth.login') %}If you have an account, you can + <a href="{{ login_url }}">Login</a>.{% endtrans %} </p> {% if allow_registration %} <p> - If you don't have an account, please - <a href="{{ request.urlgen('mediagoblin.auth.register') }}">Register</a>. + {% trans + register_url=request.urlgen('mediagoblin.auth.register') %}If you don't have an account, please + <a href="{{ register_url }}">Register</a>.{% endtrans %} </p> {% endif %} {% endif %} diff --git a/mediagoblin/templates/mediagoblin/submit/start.html b/mediagoblin/templates/mediagoblin/submit/start.html index 6d00510c..eb34c2e2 100644 --- a/mediagoblin/templates/mediagoblin/submit/start.html +++ b/mediagoblin/templates/mediagoblin/submit/start.html @@ -23,13 +23,13 @@ <form action="{{ request.urlgen('mediagoblin.submit.start') }}" method="POST" enctype="multipart/form-data"> <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.title) }} {{ wtforms_util.render_textarea_div(submit_form.description) }} {{ wtforms_util.render_field_div(submit_form.tags) }} <div class="form_submit_buttons"> - <input type="submit" value="Submit" class="button" /> + <input type="submit" value="{% trans %}Submit{% endtrans %}" class="button" /> </div> </div> </form> diff --git a/mediagoblin/templates/mediagoblin/user_pages/gallery.html b/mediagoblin/templates/mediagoblin/user_pages/gallery.html index 637c892d..71f14da4 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/gallery.html +++ b/mediagoblin/templates/mediagoblin/user_pages/gallery.html @@ -29,7 +29,9 @@ <h1> <a href="{{ request.urlgen( '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 class="container_16 media_gallery"> @@ -38,10 +40,10 @@ <div class="grid_16"> <a href={{ request.urlgen( 'mediagoblin.user_pages.atom_feed', - user=user.username) }}>atom feed</a> + user=user.username) }}>{% trans %}atom feed{% endtrans %}</a> </div> {% else %} {# 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 %} {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index ddcf3ce9..2acf7a3d 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -38,24 +38,24 @@ {% endautoescape %} <p> - — uploaded on - {{ "%4d-%02d-%02d"|format(media.created.year, - media.created.month, media.created.day) }} - by - <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', - user= media.uploader().username) }}"> - {{- media.uploader().username }}</a> + {% trans date="%4d-%02d-%02d"|format(media.created.year, + media.created.month, media.created.day), user_url= + request.urlgen('mediagoblin.user_pages.user_home',user= + media.uploader().username), + username=media.uploader().username %} + — uploaded on {{ date }} by <a href="{{ + user_url }}">{{ username }}{% endtrans %}</a> </p> <br /> - <h3>Comments</h3> + <h3>{% trans %}Comments{% endtrans %}</h3> {% if request.user %} <form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment', user= media.uploader().username, media=media._id) }}" method="POST"> {{ wtforms_util.render_field_div(comment_form.comment_content) }} <div class="form_submit_buttons"> - <input type="submit" value="Post comment!" class="button" /> + <input type="submit" value="{% trans %}Post comment!{% endtrans %}" class="button" /> </div> </form> {% endif %} @@ -77,7 +77,7 @@ <div class="comment_author">— <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', user = comment_author['username']) }}"> - {{ comment_author['username'] }}</a> at + {{ comment_author['username'] }}</a> {% trans %}at{% endtrans %} <!--</div> <div class="comment_datetime">--> <a href="{{ request.urlgen('mediagoblin.user_pages.media_home.view_comment', @@ -115,7 +115,7 @@ </p> <p> <img src="{{ request.staticdirect('/images/icon_delete.png') }}" - class="media_icon" />delete + class="media_icon" />{% trans %}delete{% endtrans %} </p> {% endif %} @@ -124,6 +124,6 @@ {% endif %} </div> {% else %} - <p>Sorry, no such media found.<p/> + <p>{% trans %}Sorry, no such media found.{% endtrans %}<p/> {% endif %} {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index 76cf36be..c3ad07db 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -27,53 +27,56 @@ {% block mediagoblin_content -%} {# If no 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 #} {% elif user.status == "needs_email_verification" %} {% if user == request.user %} {# this should only be visible when you are this user #} <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> - An email should arrive in a few moments with instructions - on how to do so. + {% trans %}An email should arrive in a few moments with + instructions on how to do so.{% endtrans %} </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') }}" - class="button">Resend verification email</a> + class="button">{% trans %}Resend verification email{% endtrans %}</a> </div> {% else %} {# if the user is not you, but still needs to verify their email #} <div class="grid_6 prefix_1 suffix_1 form_box"> - <h1>Verification needed</h1> + <h1>{% trans %}Verification needed{% endtrans %}</h1> <p> - Someone has registered an account with this username, but it - still has to be verified. + {% trans %}Someone has registered an account with this + username, but it still has to be verified.{% endtrans %} </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 - <a href="{{ request.urlgen('mediagoblin.auth.login') }}">log in</a> - and resend it. + <a href="{{ login_url }}">log in</a> and resend it.{% + endtrans %} </p> </div> {% endif %} {# Active(?) (or at least verified at some point) user, horray! #} {% else %} - <h1>{{ user.username }}'s profile</h1> + <h1>{% trans username=user.username %}{{ username }}'s profile{% + endtrans %}</h1> <div class="grid_6 alpha"> {% include "mediagoblin/utils/profile.html" %} {% if request.user['_id'] == user['_id'] or request.user['is_admin'] %} <a href="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{ - user.username }}">Edit profile</a> + user.username }}">{% trans %}Edit profile{% endtrans %}</a> {% endif %} </div> @@ -81,10 +84,12 @@ {% set pagination_base_url = user_gallery_url %} {% include "mediagoblin/utils/object_gallery.html" %} <div class="clear"></div> - <p><a href="{{ user_gallery_url }}">View all of {{ user.username }}'s media</a></p> - <a href={{ request.urlgen( - 'mediagoblin.user_pages.atom_feed', - user=user.username) }}>atom feed</a> + <p><a href="{{ user_gallery_url }}">{% trans + username=user.username %}View all of {{ username }}'s media{% + endtrans %}</a></p> + <a href={{ request.urlgen( 'mediagoblin.user_pages.atom_feed', + user=user.username) }}>{% trans %}atom feed1{% + endtrans %}</a> </div> <div class="clear"></div> |