validate user locale

This commit is contained in:
scossar 2016-03-04 13:21:30 -08:00
parent b2b7342d53
commit 2d8b10d139
2 changed files with 15 additions and 1 deletions

View file

@ -188,7 +188,7 @@ class UserNotifications < ActionMailer::Base
protected protected
def user_locale(user) def user_locale(user)
user.respond_to?(:locale) ? user.locale : nil (user.locale.present? && I18n.available_locales.include?(user.locale.to_sym)) ? user.locale : nil
end end
def email_post_markdown(post) def email_post_markdown(post)

View file

@ -429,5 +429,19 @@ describe UserNotifications do
end end
end end
end end
context "user locale is not a valid locale" do
%w(signup signup_after_approval authorize_email forgot_password admin_login account_created).each do |mail_type|
include_examples "notification derived from template" do
SiteSetting.default_locale = "en"
let(:locale) { "invalid" }
let(:mail_type) { mail_type }
it "sets the locale" do
expects_build_with(has_entry(:locale, nil))
end
end
end
end
end end
end end