From 8e38c129c5a3d1c3c3372858c838e3418cf48141 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Thu, 6 Nov 2014 02:27:23 -0800 Subject: [PATCH] minor login copy tweaks --- app/views/users/_auto_redirect_home.html.erb | 2 +- config/locales/client.en.yml | 2 +- config/locales/server.en.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/users/_auto_redirect_home.html.erb b/app/views/users/_auto_redirect_home.html.erb index 5b91befd432..b5c9a057e9a 100644 --- a/app/views/users/_auto_redirect_home.html.erb +++ b/app/views/users/_auto_redirect_home.html.erb @@ -2,6 +2,6 @@ (function() { setTimeout(function() { window.location.href = '/'; - }, 5000); + }, 2000); })(); \ No newline at end of file diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 7168ac4899c..5a7474378a1 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -381,7 +381,7 @@ en: email: title: "Email" instructions: "Never shown to the public." - ok: "Looks good. We will email you to confirm." + ok: "We will email you to confirm." invalid: "Please enter a valid email address." authenticated: "Your email has been authenticated by {{provider}}." frequency: "We'll only email you if we haven't seen you recently and you haven't already seen the thing we're emailing you about." diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 5137ad50de8..684bd7dfebc 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -414,7 +414,7 @@ en: activation: action: "Activate your account" already_done: "Sorry, this account confirmation link is no longer valid. Perhaps your account is already active?" - please_continue: "Your new account is confirmed, and you are now logged in." + please_continue: "Your new account is confirmed! You will now be redirected to the home page." continue_button: "Continue to %{site_name}" welcome_to: "Welcome to %{site_name}!" approval_required: "A moderator must manually approve your new account before you can access this forum. You'll get an email when your account is approved!"