IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: proper error message when account created is hit with no session

Browse Source
This commit is contained in:
Sam 2015-05-07 11:00:22 +10:00
parent 4167757dee
commit 77cc087b13
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/users_controller.rb
View File

@ -436,7 +436,7 @@ class UsersController < ApplicationController
end end
def account_created def account_created
@message = session['user_created_message'] @message = session['user_created_message'] || I18n.t('activation.missing_session')
expires_now expires_now
render layout: 'no_ember' render layout: 'no_ember'
end end

2
config/locales/server.en.yml
View File

@ -475,7 +475,7 @@ en:
continue_button: "Continue to %{site_name}" continue_button: "Continue to %{site_name}"
welcome_to: "Welcome 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!" 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!"
missing_session: "We can not detect if your account was created, please ensure you have cookies enabled."
post_action_types: post_action_types:
off_topic: off_topic:
title: 'Off-Topic' title: 'Off-Topic'