diff options
6 files changed, 19 insertions, 10 deletions
diff --git a/mediagoblin/templates/mediagoblin/auth/change_fp.html b/mediagoblin/templates/mediagoblin/auth/change_fp.html index 0a3c76f6..4be7e065 100644 --- a/mediagoblin/templates/mediagoblin/auth/change_fp.html +++ b/mediagoblin/templates/mediagoblin/auth/change_fp.html @@ -23,8 +23,8 @@ <form action="{{ request.urlgen('mediagoblin.auth.verify_forgot_password') }}" method="POST" enctype="multipart/form-data"> - <div class="login_box form_box"> - <h1>Enter your new password</h1> + <div class="grid_6 prefix_1 suffix_1 form_box"> + <h1>{% trans %}Enter your new password{% endtrans %}</h1> {{ wtforms_util.render_divs(cp_form) }} <div class="form_submit_buttons"> diff --git a/mediagoblin/templates/mediagoblin/auth/forgot_password.html b/mediagoblin/templates/mediagoblin/auth/forgot_password.html index 1708874f..23fa9eb5 100644 --- a/mediagoblin/templates/mediagoblin/auth/forgot_password.html +++ b/mediagoblin/templates/mediagoblin/auth/forgot_password.html @@ -23,8 +23,8 @@ <form action="{{ request.urlgen('mediagoblin.auth.forgot_password') }}" method="POST" enctype="multipart/form-data"> - <div class="login_box form_box"> - <h1>Enter your username or email</h1> + <div class="grid_6 prefix_1 suffix_1 form_box"> + <h1>{% trans %}Enter your username or email{% endtrans %}</h1> {{ wtforms_util.render_divs(fp_form) }} <div class="form_submit_buttons"> diff --git a/mediagoblin/templates/mediagoblin/auth/fp_changed_success.html b/mediagoblin/templates/mediagoblin/auth/fp_changed_success.html index dfce1423..d6633ec6 100644 --- a/mediagoblin/templates/mediagoblin/auth/fp_changed_success.html +++ b/mediagoblin/templates/mediagoblin/auth/fp_changed_success.html @@ -19,7 +19,9 @@ {% block mediagoblin_content %} <p> - Your password have been changed. Now you can <a href="{{ request.urlgen('mediagoblin.auth.login') }}">Login</a> + {% trans %} + Your password has been changed. Try to log in now. + {% endtrans %} </p> {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/auth/fp_email_sent.html b/mediagoblin/templates/mediagoblin/auth/fp_email_sent.html index d7fad722..bc79b970 100644 --- a/mediagoblin/templates/mediagoblin/auth/fp_email_sent.html +++ b/mediagoblin/templates/mediagoblin/auth/fp_email_sent.html @@ -19,7 +19,9 @@ {% block mediagoblin_content %} <p> - Please check your email. We send an email whit an url to change your password. + {% trans %} + Check your inbox. We sent an email with a URL for changing your password. + {% endtrans %} </p> {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt b/mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt index 1b2dbe2f..fb5e1674 100644 --- a/mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt +++ b/mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt @@ -15,11 +15,16 @@ # 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/>. #} + +{% trans username=username, verification_url=verification_url|safe -%} Hi {{ username }}, -to change your GNU MediaGoblin password, open the following URL in your web browser +to change your GNU MediaGoblin password, open the following URL in +your web browser: -{{ verification_url|safe }} +{{ verification_url }} -If you think this is an error, just ignore this email and continue being a happy goblin! +If you think this is an error, just ignore this email and continue being +a happy goblin! +{%- endtrans %} diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html index 75e6eed1..538e5c08 100644 --- a/mediagoblin/templates/mediagoblin/auth/login.html +++ b/mediagoblin/templates/mediagoblin/auth/login.html @@ -48,7 +48,7 @@ {% trans %}Forgot your password?{% endtrans %} <br /> <a href="{{ request.urlgen('mediagoblin.auth.forgot_password') }}"> - {%- trans %}Send a reminder!{% endtrans %}</a> + {%- trans %}Send yourself a reminder!{% endtrans %}</a> </p> {% endif %} </div> |