Merge pull request #4058 from scossar/validate-user-locale

FIX: validate user locale for email notifications

app/mailers/user_notifications.rb

@@ -188,7 +188,7 @@ class UserNotifications < ActionMailer::Base
   protected
 
   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
 
   def email_post_markdown(post)

spec/mailers/user_notifications_spec.rb

@@ -429,5 +429,19 @@ describe UserNotifications do
         end
       end
     end
+
+    context "user locale is an empty string" 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) { "" }
+          let(:mail_type) { mail_type }
+          it "sets the locale" do
+            expects_build_with(has_entry(:locale, nil))
+          end
+        end
+      end
+    end
+
   end
 end