Localisation updates from https://translatewiki.net.

[rails.git] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index cca894a6bf291e54e5a3424c51e8ebcfa8374d9b..8c75b4ef45e7ad4fd608a4fd59c2ecb7a332b538 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -45,7 +45,6 @@
 
 class User < ApplicationRecord
   require "digest"
 
 class User < ApplicationRecord
   require "digest"

-  require "xml/libxml"

 
   has_many :traces, -> { where(:visible => true) }
   has_many :diary_entries, -> { order(:created_at => :desc) }
 
   has_many :traces, -> { where(:visible => true) }
   has_many :diary_entries, -> { order(:created_at => :desc) }


@@ -114,11 +113,11 @@ class User < ApplicationRecord
   validates_email_format_of :email, :if => proc { |u| u.email_changed? }
   validates_email_format_of :new_email, :allow_blank => true, :if => proc { |u| u.new_email_changed? }
 
   validates_email_format_of :email, :if => proc { |u| u.email_changed? }
   validates_email_format_of :new_email, :allow_blank => true, :if => proc { |u| u.new_email_changed? }
 

-  after_initialize :set_defaults
+  alias_attribute :created_at, :creation_time
+

   before_save :encrypt_password
   before_save :update_tile
   after_save :spam_check
   before_save :encrypt_password
   before_save :update_tile
   after_save :spam_check

-  after_save :reset_preferred_languages

 
   def to_param
     display_name
 
   def to_param
     display_name


@@ -179,10 +178,6 @@ class User < ApplicationRecord
     @preferred_languages ||= Locale.list(languages)
   end
 
     @preferred_languages ||= Locale.list(languages)
   end
 

-  def reset_preferred_languages
-    @preferred_languages = nil
-  end
-

   def nearby(radius = Settings.nearby_radius, num = Settings.nearby_users)
     if home_lon && home_lat
       gc = OSM::GreatCircle.new(home_lat, home_lon)
   def nearby(radius = Settings.nearby_radius, num = Settings.nearby_users)
     if home_lon && home_lat
       gc = OSM::GreatCircle.new(home_lat, home_lon)


@@ -246,8 +241,8 @@ class User < ApplicationRecord
   end
 
   ##
   end
 
   ##

-  # delete a user - leave the account but purge most personal data
-  def delete
+  # destroy a user - leave the account but purge most personal data
+  def destroy

     avatar.purge_later
 
     self.display_name = "user_#{id}"
     avatar.purge_later
 
     self.display_name = "user_#{id}"


@@ -313,7 +308,7 @@ class User < ApplicationRecord
   end
 
   def max_messages_per_hour
   end
 
   def max_messages_per_hour

-    account_age_in_seconds = Time.now.utc - creation_time
+    account_age_in_seconds = Time.now.utc - created_at

     account_age_in_hours = account_age_in_seconds / 3600
     recent_messages = messages.where("sent_on >= ?", Time.now.utc - 3600).count
     active_reports = issues.with_status(:open).sum(:reports_count)
     account_age_in_hours = account_age_in_seconds / 3600
     recent_messages = messages.where("sent_on >= ?", Time.now.utc - 3600).count
     active_reports = issues.with_status(:open).sum(:reports_count)


@@ -322,7 +317,7 @@ class User < ApplicationRecord
   end
 
   def max_friends_per_hour
   end
 
   def max_friends_per_hour

-    account_age_in_seconds = Time.now.utc - creation_time
+    account_age_in_seconds = Time.now.utc - created_at

     account_age_in_hours = account_age_in_seconds / 3600
     recent_friends = Friendship.where(:befriendee => self).where("created_at >= ?", Time.now.utc - 3600).count
     active_reports = issues.with_status(:open).sum(:reports_count)
     account_age_in_hours = account_age_in_seconds / 3600
     recent_friends = Friendship.where(:befriendee => self).where("created_at >= ?", Time.now.utc - 3600).count
     active_reports = issues.with_status(:open).sum(:reports_count)


@@ -332,10 +327,6 @@ class User < ApplicationRecord
 
   private
 
 
   private
 

-  def set_defaults
-    self.creation_time = Time.now.getutc unless attribute_present?(:creation_time)
-  end
-

   def encrypt_password
     if pass_crypt_confirmation
       self.pass_crypt, self.pass_salt = PasswordHash.create(pass_crypt)
   def encrypt_password
     if pass_crypt_confirmation
       self.pass_crypt, self.pass_salt = PasswordHash.create(pass_crypt)