tr8n 3.1.1 → 3.1.2

data/app/controllers/tr8n/language_controller.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/controllers/tr8n/phrases_controller.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/controllers/tr8n/translations_controller.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/controllers/tr8n/translator_controller.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/helpers/tr8n/base_helper.rb

@@ -41,8 +41,4 @@ module Tr8n::BaseHelper
     tra(label, desc, tokens, options.merge(:skip_decorations => true))
   end
   
-  def tr8n_paginator_tag(results, subject)  
-    render :partial => "/tr8n/common/paginator", :locals => {:objects => results, :subject => subject}
-  end
-  
 end

data/app/models/tr8n/base_filter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/daily_language_metric.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/date_rule.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/gender_list_rule.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/gender_rule.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/glossary.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/glossary_filter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/integration/ru/russian_gender_list_rule.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/integration/ru/russian_numeric_rule.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/ip_location.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/ip_location_filter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/language.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -75,9 +75,14 @@ class Tr8n::Language < ActiveRecord::Base
   
   def reset_language_cases!
     cases.delete_all
-    Tr8n::Config.default_cases_for(locale).each do |lcase|
-# need to fix default lcase rules      
-#      Tr8n::LanguageCase.create(lcase.merge(:language => self))
+    Tr8n::Config.default_language_cases_for(locale).each do |lcase|
+      rules = lcase.delete(:rules)
+      language_case = Tr8n::LanguageCase.create(lcase.merge(:language => self, :translator => Tr8n::Config.system_translator))
+      next if rules.blank?
+      rules.keys.sort.each_with_index do |lrkey, index|
+        lcrule = rules[lrkey]
+        Tr8n::LanguageCaseRule.create(:language_case => language_case, :language => self, :translator => Tr8n::Config.system_translator, :position => index, :definition => lcrule)
+      end
     end
   end
   
@@ -305,19 +310,23 @@ class Tr8n::Language < ActiveRecord::Base
   end
 
   def recently_added_forum_messages
-    @recently_added_forum_messages ||= Tr8n::LanguageForumMessage.find(:all, :conditions => ["language_id = ?", self.id], :order => "created_at desc", :limit => 5)    
+    @recently_added_forum_messages ||= Tr8n::LanguageForumMessage.where("language_id = ?", self.id).order("created_at desc").limit(5)    
   end
 
   def recently_added_translations
-    @recently_added_translations ||= Tr8n::Translation.find(:all, :conditions => ["language_id = ?", self.id], :order => "created_at desc", :limit => 5)    
+    @recently_added_translations ||= Tr8n::Translation.where("language_id = ?", self.id).order("created_at desc").limit(5)    
   end
 
   def recently_updated_translations
-    @recently_updated_translations ||= Tr8n::Translation.find(:all, :conditions => ["language_id = ?", self.id], :order => "updated_at desc", :limit => 5)    
+    @recently_updated_translations ||= begin
+      trans =  Tr8n::Translation.where("language_id = ?", self.id)
+      trans = trans.where("translation_key_id in (select id from tr8n_translation_keys where level <= ?)", Tr8n::Config.current_translator.level)
+      trans.order("updated_at desc").limit(5)
+    end
   end
   
   def recently_updated_votes(translator = Tr8n::Config.current_translator)
-    @recently_updated_votes ||= Tr8n::TranslationVote.find(:all, :conditions => ["translation_id in (select tr8n_translations.id from tr8n_translations where tr8n_translations.language_id = ? and tr8n_translations.translator_id = ?)", self.id, translator.id], :order => "updated_at desc", :limit => 5)    
+    @recently_updated_votes ||= Tr8n::TranslationVote.where("translation_id in (select tr8n_translations.id from tr8n_translations where tr8n_translations.language_id = ? and tr8n_translations.translator_id = ?)", self.id, translator.id).order("updated_at desc").limit(5)
   end
   
 end

data/app/models/tr8n/language_case.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/language_case_filter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/language_case_rule.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/language_case_rule_filter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/language_case_value_map.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/language_case_value_map_filter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/language_filter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/language_forum_abuse_report.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/language_forum_abuse_report_filter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/language_forum_message.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -33,7 +33,7 @@ class Tr8n::LanguageForumMessage < ActiveRecord::Base
   alias :topic :language_forum_topic
 
   def submit_abuse_report(reporter)
-    report = Tr8n::LanguageForumAbuseReport.find(:first, :conditions => ["language_forum_message_id = ? and translator_id = ?", self.id, reporter.id])
+    report = Tr8n::LanguageForumAbuseReport.where("language_forum_message_id = ? and translator_id = ?", self.id, reporter.id).first
     report ||= Tr8n::LanguageForumAbuseReport.create(:language_forum_message => self, :translator => reporter, :language => language)
     translator.update_attributes(:reported => true)
     report

data/app/models/tr8n/language_forum_message_filter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/language_forum_topic.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -32,10 +32,10 @@ class Tr8n::LanguageForumTopic < ActiveRecord::Base
   alias :messages :language_forum_messages
   
   def post_count
-    @post_count ||= Tr8n::LanguageForumMessage.count(:conditions => ["language_forum_topic_id = ?", self.id])
+    @post_count ||= Tr8n::LanguageForumMessage.where("language_forum_topic_id = ?", self.id).count
   end
 
   def last_post
-    @last_post ||= Tr8n::LanguageForumMessage.find(:first, :conditions => ["language_forum_topic_id = ?", self.id], :order => "created_at desc")
+    @last_post ||= Tr8n::LanguageForumMessage.where("language_forum_topic_id = ?", self.id).order("created_at desc").first
   end
 end

data/app/models/tr8n/language_forum_topic_filter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/language_metric.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -46,7 +46,7 @@ class Tr8n::LanguageMetric < ActiveRecord::Base
   end
   
   def self.calculate_language_metrics
-    last_daily_metric = Tr8n::DailyLanguageMetric.find(:first, :conditions => "metric_date is not null", :order => "metric_date desc")
+    last_daily_metric = Tr8n::DailyLanguageMetric.where("metric_date is not null").order("metric_date desc").first
     metric_date = last_daily_metric.nil? ? Date.new(2011, 10, 1) : last_daily_metric.metric_date
 
     Tr8n::Language.enabled_languages.each do |lang|

data/app/models/tr8n/language_metric_filter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/language_rule.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -42,7 +42,7 @@ class Tr8n::LanguageRule < ActiveRecord::Base
   end
   
   def self.for(language)
-    find(:all, :conditions => ["language_id = ?", language.id])
+    self.where("language_id = ?", language.id)
   end
   
   def self.options
@@ -57,10 +57,38 @@ class Tr8n::LanguageRule < ActiveRecord::Base
     token.dependency == dependency or suffixes.include?(token.suffix)
   end
 
+  def self.keyword
+    dependency
+  end
+
+  # {"locale"=>"ru", "label"=>"{count} сообщения", "rank"=>1, "rules"=>[
+  #        {"token"=>"count", "type"=>"number", "definition"=>
+  #             {"multipart"=>true, "part1"=>"ends_in", "value1"=>"2,3,4", "operator"=>"and", "part2"=>"does_not_end_in", "value2"=>"12,13,14"}
+  #        }
+  #     ]
+  # }
+
+  def self.for_definition(lang, translator, type, definition, opts = {})
+    opts[:force_create] ||= false
+    
+    rule_class = Tr8n::Config.language_rule_dependencies[type]
+    return if rule_class == nil # unsupported rule type, skip this completely
+    
+    rule_class.for(lang).each do |rule|
+      return rule if rule.definition == definition
+    end
+    
+    if opts[:force_create]
+      rule_class.create(:language => lang, :translator => translator, :definition => definition)
+    end
+  end
+
+  # TDOD: switch to using keyword
   def self.dependency
     raise Tr8n::Exception.new("This method must be implemented in the extending rule") 
   end
   
+  # TDOD: switch to using keyword
   def self.dependency_label
     dependency
   end
@@ -74,6 +102,13 @@ class Tr8n::LanguageRule < ActiveRecord::Base
     sanitize_values(values).join(", ")
   end
 
+  def to_api_hash
+    {
+      :type => self.class.keyword,
+      :definition => definition
+    }
+  end
+
   def evaluate(token_value)
     raise Tr8n::Exception.new("This method must be implemented in the extending rule") 
   end

data/app/models/tr8n/language_rule_filter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/language_user.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -34,7 +34,7 @@ class Tr8n::LanguageUser < ActiveRecord::Base
   # when users get promoted, they are automatically get associated with a language and marked as translators
   
   def self.find_or_create(user, language)
-    lu = find(:first, :conditions => ["user_id = ? and language_id = ?", user.id, language.id])
+    lu = where("user_id = ? and language_id = ?", user.id, language.id).first
     lu || create(:user_id => user.id, :language_id => language.id)
   end
 
@@ -45,7 +45,7 @@ class Tr8n::LanguageUser < ActiveRecord::Base
   def self.languages_for(user)
     return [] unless user.id
     check_default_language_for(user)
-    find(:all, :conditions => ["user_id = ?", user.id], :order => "updated_at desc")
+    where("user_id = ?", user.id).order("updated_at desc")
   end
 
   def self.create_or_touch(user, language)

data/app/models/tr8n/language_user_filter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/list_rule.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/monthly_language_metric.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -26,7 +26,7 @@ class Tr8n::MonthlyLanguageMetric < Tr8n::LanguageMetric
   def update_metrics!
     attribs = default_attributes
     attribs.each do |key, value|
-      attribs[key] = Tr8n::DailyLanguageMetric.sum(key, :conditions => ["language_id = ? and metric_date >= ? and metric_date < ?", language_id, metric_date, metric_date + 1.month])
+      attribs[key] = Tr8n::DailyLanguageMetric.where("language_id = ? and metric_date >= ? and metric_date < ?", language_id, metric_date, metric_date + 1.month).sum(key)
     end
     update_attributes(attribs)
   end