merge from master (post-CSRF changes)

1 files changed, 7 insertions, 7 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index 7f85a2c4f..2fd6d9dbe 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -31,11 +31,11 @@ require 'digest/sha1'
 class User < ActiveRecord::Base
     strip_attributes!
 
-    validates_presence_of :email, :message => "^Please enter your email address"
+    validates_presence_of :email, :message => N_("Please enter your email address")
 
-    validates_presence_of :name, :message => "^Please enter your name"
+    validates_presence_of :name, :message => N_("Please enter your name")
 
-    validates_presence_of :hashed_password, :message => "^Please enter a password"
+    validates_presence_of :hashed_password, :message => N_("Please enter a password")
 
     has_many :info_requests, :order => 'created_at desc'
     has_many :user_info_request_sent_alerts
@@ -46,12 +46,12 @@ class User < ActiveRecord::Base
     has_many :censor_rules, :order => 'created_at desc'
 
     attr_accessor :password_confirmation, :no_xapian_reindex
-    validates_confirmation_of :password, :message =>"^Please enter the same password twice"
+    validates_confirmation_of :password, :message => N_("Please enter the same password twice")
 
     validates_inclusion_of :admin_level, :in => [ 
         'none',
         'super', 
-    ]
+    ], :message => N_('Admin level is not included in list')
 
     acts_as_xapian :texts => [ :name, :about_me ],
         :values => [ 
@@ -103,10 +103,10 @@ class User < ActiveRecord::Base
 
     def validate
         if self.email != "" && !MySociety::Validate.is_valid_email(self.email)
-            errors.add(:email, "^Please enter a valid email address") 
+            errors.add(:email, N_("Please enter a valid email address")) 
         end
         if MySociety::Validate.is_valid_email(self.name)
-            errors.add(:name, "^Please enter your name, not your email address, in the name field.") 
+            errors.add(:name, N_("Please enter your name, not your email address, in the name field.")) 
         end
     end