From 8f4c9b813d306228e1eecec7551d46902c264189 Mon Sep 17 00:00:00 2001 From: Osama Khalid Date: Sun, 7 Aug 2011 23:36:55 +0300 Subject: [PATCH] Adding {% trans %} to all fixed strings in the templates --- .../templates/mediagoblin/auth/login.html | 16 ++++--- .../templates/mediagoblin/auth/register.html | 5 ++- .../auth/resent_verification_email.html | 2 +- .../mediagoblin/auth/verification_email.txt | 8 ++-- mediagoblin/templates/mediagoblin/base.html | 12 +++--- .../templates/mediagoblin/edit/edit.html | 6 +-- .../mediagoblin/edit/edit_profile.html | 4 +- .../templates/mediagoblin/listings/tag.html | 4 +- mediagoblin/templates/mediagoblin/root.html | 11 ++--- .../templates/mediagoblin/submit/start.html | 4 +- .../mediagoblin/user_pages/gallery.html | 8 ++-- .../mediagoblin/user_pages/media.html | 26 +++++------ .../mediagoblin/user_pages/user.html | 43 +++++++++++-------- 13 files changed, 81 insertions(+), 68 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 @@
-

Log in

+

{% trans %}Log in{% endtrans %}

{% if login_failed %} -
Login failed!
- {% endif %} - {{ wtforms_util.render_divs(login_form) }} +
{% trans %}Login failed!{% + endtrans %}
{% endif %} {{ + wtforms_util.render_divs(login_form) }}
- +
{% if next %} {% endif %} {% if allow_registration %} -

Don't have an account yet?
Create one here!

- {% endif %} +

{% trans %}Don't have an account yet?{% endtrans + %}
{% trans %}Create one here!{% endtrans %}

{% endif + %}
{% 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 @@
-

Create an account!

+

{% trans %}Create an account!{% endtrans %}

{{ wtforms_util.render_divs(register_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 %}

- Resent your verification email. + {% trans %}Resent your verification email.{% endtrans %}

{% 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 . #} -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 @@ - {% block title %}GNU MediaGoblin{% endblock title %} + {% block title %}{% trans %}GNU MediaGoblin{% endtrans %}{% endblock title %} Mediagoblin logo + alt="{% trans %}Mediagoblin logo{% endtrans %}" /> {% endblock %} {% if request.user and request.user['status'] == 'active' %} - Submit media + {% trans %}Submit media{% endtrans %} {% endif %} {% block mediagoblin_header_title %}{% endblock %} @@ -59,7 +59,7 @@ - verify your email! + {% trans %}verify your email!{% endtrans %} {% endif %} logout) {% else %} - Login + {% trans %}Login{% endtrans %} {% endif %} @@ -85,7 +85,7 @@ {% block mediagoblin_footer %}
- Powered by MediaGoblin, a GNU project + {% trans %}Powered by MediaGoblin, a GNU project{% endtrans %}
{% 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">
-

Editing {{ media.title }}

+

{% trans media_title=media.title %}Editing {{ media_title }}{% endtrans %}

{{ wtforms_util.render_divs(form) }}
- Cancel - + {% trans %}Cancel{% endtrans %} +
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">
-

Editing {{ user['username'] }}'s profile

+

{% trans username=user['username'] %}Editing {{ username }}'s profile{% endtrans %}

{{ wtforms_util.render_divs(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 -%}

- Media tagged with: {{ tag_name }} + {% trans %}Media tagged with:{% endtrans %} {{ tag_name }}

@@ -36,6 +36,6 @@
atom feed + tag=tag_slug) }}">{% trans %}atom feed{% endtrans %}
{% 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 %}

- Submit an item + {% trans %}Submit an item{% endtrans %}

{% else %}

- If you have an account, you can - Login. + {% trans login_url=request.urlgen('mediagoblin.auth.login') %}If you have an account, you can + Login.{% endtrans %}

{% if allow_registration %}

- If you don't have an account, please - Register. + {% trans + register_url=request.urlgen('mediagoblin.auth.register') %}If you don't have an account, please + Register.{% endtrans %}

{% 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 @@
-

Submit yer media

+

{% trans %}Submit yer media{% endtrans %}

{{ 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) }}
- +
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 @@

{{ user.username }}'s media

+ user=user.username) }}">{% trans + username=user.username %}{{ username }}'s + media{% endtrans %}
@@ -38,10 +40,10 @@
atom feed + user=user.username) }}>{% trans %}atom feed{% endtrans %}
{% else %} {# This *should* not occur as the view makes sure we pass in a user. #} -

Sorry, no such user found.

+

{% trans %}Sorry, no such user found.{% endtrans %}

{% endif %} {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index a1382518..92894d0d 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -38,24 +38,24 @@ {% endautoescape %}

- — uploaded on - {{ "%4d-%02d-%02d"|format(media.created.year, - media.created.month, media.created.day) }} - by - - {{- media.uploader().username }} + {% 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 {{ username }}{% endtrans %}


-

Comments

+

{% trans %}Comments{% endtrans %}

{% if request.user %}
{{ wtforms_util.render_field_div(comment_form.comment_content) }}
- +
{% endif %} @@ -77,7 +77,7 @@
— - {{ comment_author['username'] }} at + {{ comment_author['username'] }} {% trans %}at{% endtrans %} {% include "mediagoblin/utils/prev_next.html" %} -

Sidebar content here!

+

{% trans %}Sidebar content here!{% endtrans %}

{% if media['uploader'] == request.user['_id'] or @@ -117,7 +117,7 @@

delete + class="media_icon" />{% trans %}delete{% endtrans %}

{% endif %}

@@ -127,6 +127,6 @@ {% endif %}
{% else %} -

Sorry, no such media found.

+

{% trans %}Sorry, no such media found.{% endtrans %}

{% 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 %} -

Sorry, no such user found.

+

{% trans %}Sorry, no such user found.{% endtrans %}

{# 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 #}

-

Verification needed

+

{% trans %}Verification needed{% endtrans %}

-

Almost done! Your account still needs to be verified.

+

{% trans %}Almost done! Your account still needs to be + verified.{% endtrans %}

- 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 %}

-

In case it doesn't:

+

{% trans %}In case it doesn't:{% endtrans %}

Resend verification email + class="button">{% trans %}Resend verification email{% endtrans %}
{% else %} {# if the user is not you, but still needs to verify their email #}
-

Verification needed

+

{% trans %}Verification needed{% endtrans %}

- 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 %}

- 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 - log in - and resend it. + log in and resend it.{% + endtrans %}

{% endif %} {# Active(?) (or at least verified at some point) user, horray! #} {% else %} -

{{ user.username }}'s profile

+

{% trans username=user.username %}{{ username }}'s profile{% + endtrans %}

{% include "mediagoblin/utils/profile.html" %} {% if request.user['_id'] == user['_id'] or request.user['is_admin'] %} Edit profile + user.username }}">{% trans %}Edit profile{% endtrans %} {% endif %}
@@ -81,10 +84,12 @@ {% set pagination_base_url = user_gallery_url %} {% include "mediagoblin/utils/object_gallery.html" %}
-

View all of {{ user.username }}'s media

- atom feed +

{% trans + username=user.username %}View all of {{ username }}'s media{% + endtrans %}

+ {% trans %}atom feed1{% + endtrans %}
-- 2.25.1