From c0dfdb3bd83d2d74a41934aea9238e8990f4230b Mon Sep 17 00:00:00 2001 From: James Allen Date: Fri, 11 Dec 2015 14:25:17 +0000 Subject: [PATCH] Use translations for activation page --- services/web/app/coffee/Features/Email/EmailBuilder.coffee | 2 -- services/web/app/views/user/activate.jade | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/services/web/app/coffee/Features/Email/EmailBuilder.coffee b/services/web/app/coffee/Features/Email/EmailBuilder.coffee index 8d37f38c85..b6967cc4a8 100644 --- a/services/web/app/coffee/Features/Email/EmailBuilder.coffee +++ b/services/web/app/coffee/Features/Email/EmailBuilder.coffee @@ -15,8 +15,6 @@ templates.registered =

Click here to set your password and log in.

-

Once you have reset your password you can log in here.

-

If you have any questions or problems, please contact #{settings.adminEmail}.

""" diff --git a/services/web/app/views/user/activate.jade b/services/web/app/views/user/activate.jade index 82543b17f8..7961876389 100644 --- a/services/web/app/views/user/activate.jade +++ b/services/web/app/views/user/activate.jade @@ -5,12 +5,12 @@ block content .container .row .col-md-6.col-md-offset-3.col-lg-4.col-lg-offset-4 - .alert.alert-success You're one step away from activating your DataJoy account! + .alert.alert-success #{translate("nearly_activated")} .row .col-md-6.col-md-offset-3.col-lg-4.col-lg-offset-4 .card .page-header - h1 Please set a password + h1 #{translate("please_set_a_password")} form( async-form="activate", name="activationForm",