tr8n 3.0.5 → 3.1.1

data/app/controllers/tr8n/phrases_controller.rb

@@ -28,23 +28,20 @@ class Tr8n::PhrasesController < Tr8n::BaseController
   before_filter :init_sitemap_section, :except => [:translate, :vote]
   
   def index
-    conditions = Tr8n::TranslationKey.search_conditions_for(params)
+    @translation_keys = Tr8n::TranslationKey.for_params(params)
    
     unless params[:section_key].blank?
       source_names = sitemap_sources_for(@section_key)
-      sources = Tr8n::TranslationSource.find(:all, :conditions => ["source in (?)", source_names])
-      source_ids = sources.collect{|source| source.id}
+      source_ids = Tr8n::TranslationSource.where("source in (?)", source_names).collect{|source| source.id}
       
       if source_ids.empty?
-        conditions = ["1=2"]
+        @translation_keys = @translation_keys.where("1=2")
       else  
-        conditions[0] << " and " unless conditions[0].blank?
-        conditions[0] << "(id in (select distinct(translation_key_id) from tr8n_translation_key_sources where translation_source_id in (?)))"
-        conditions << source_ids.uniq
+        @translation_keys = @translation_keys.where("(id in (select distinct(translation_key_id) from tr8n_translation_key_sources where translation_source_id in (?)))", source_ids.uniq)
       end
     end
     
-    @translation_keys = Tr8n::TranslationKey.paginate(:per_page => per_page, :page => page, :conditions => conditions, :order => "label asc")    
+    @translation_keys = @translation_keys.order("label asc").page(page).per(per_page)
   end
   
   def view
@@ -62,17 +59,10 @@ class Tr8n::PhrasesController < Tr8n::BaseController
     @translation = Tr8n::Translation.new(:translation_key => @translation_key, :language => tr8n_current_language, :translator => tr8n_current_translator)
     @rules = {}
     
-    conditions = Tr8n::Translation.search_conditions_for(params)
-    
-    conditions[0] << " and " unless conditions[0].blank?
-    conditions[0] << "tr8n_translations.language_id = ? and tr8n_translations.translation_key_id = ?"
-    conditions << tr8n_current_language.id
-    conditions << @translation_key.id
-    
-    @translations = Tr8n::Translation.find(:all, :conditions => conditions, :order => "rank desc, created_at desc")
-    @comments = Tr8n::TranslationKeyComment.paginate(:page => page, :per_page => per_page, 
-                      :conditions => ["language_id = ? and translation_key_id = ?", tr8n_current_language.id, @translation_key.id], 
-                      :order => "created_at desc")
+    @translations = Tr8n::Translation.for_params(params)
+    @translations = @translations.where("tr8n_translations.language_id = ? and tr8n_translations.translation_key_id = ?", tr8n_current_language.id,  @translation_key.id)
+    @translations = @translations.order("rank desc, created_at desc")
+    @comments = Tr8n::TranslationKeyComment.where("language_id = ? and translation_key_id = ?", tr8n_current_language.id, @translation_key.id).order("created_at desc").page(page).per(per_page)
     
     @grouping = {}
     if params[:grouped_by] != "nothing"

data/app/controllers/tr8n/translations_controller.rb

@@ -119,8 +119,7 @@ class Tr8n::TranslationsController < Tr8n::BaseController
 
   # list of translations    
   def index
-    conditions = Tr8n::Translation.search_conditions_for(params)
-    @translations = Tr8n::Translation.paginate(:per_page => per_page, :page => page, :conditions => conditions, :order => "created_at desc, rank desc")    
+    @translations = Tr8n::Translation.for_params(params).order("created_at desc, rank desc").page(page).per(per_page)
   end
 
   # ajax based method for updating individual translations

data/app/helpers/tr8n/admin/base_helper.rb

@@ -24,7 +24,7 @@
 module Tr8n::Admin::BaseHelper
 
   def tr8n_will_filter(results)
-    will_filter(results)
+    will_filter_tag(results)
   end
 
   def tr8n_will_paginate(collection = nil, options = {})

data/app/helpers/{application_helper.rb → tr8n/application_helper.rb}

@@ -21,6 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-module ApplicationHelper
- 
+module Tr8n
+  module ApplicationHelper
+  end
 end

data/app/helpers/tr8n/base_helper.rb

@@ -40,5 +40,9 @@ module Tr8n::BaseHelper
   def trla(label, desc = "", tokens = {}, options = {})
     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/language.rb

@@ -23,6 +23,7 @@
 
 class Tr8n::Language < ActiveRecord::Base
   set_table_name :tr8n_languages
+  
   after_save      :clear_cache
   after_destroy   :clear_cache
 

data/app/models/tr8n/language_case_filter.rb

@@ -24,7 +24,7 @@
 class Tr8n::LanguageCaseFilter < Tr8n::BaseFilter
 
   def inner_joins
-    [["Tr8n::Language", :language_id], ["Tr8n::Translator", :translator_id]]
+    [:language, :translator]
   end
 
 end

data/app/models/tr8n/language_case_rule_filter.rb

@@ -24,7 +24,7 @@
 class Tr8n::LanguageCaseRuleFilter < Tr8n::BaseFilter
 
   def inner_joins
-    [["Tr8n::Language", :language_id], ["Tr8n::Translator", :translator_id]]
+    [:language, :translator]
   end
 
 end

data/app/models/tr8n/language_case_value_map_filter.rb

@@ -38,4 +38,8 @@ class Tr8n::LanguageCaseValueMapFilter < Tr8n::BaseFilter
     return []
   end
 
+  def inner_joins
+    [:language, :translator]
+  end
+
 end

data/app/models/tr8n/language_forum_abuse_report_filter.rb

@@ -27,4 +27,8 @@ class Tr8n::LanguageForumAbuseReportFilter < Tr8n::BaseFilter
     [["Tr8n::Language", :language_id], ["Tr8n::LanguageForumMessage", :language_forum_message_id], ["Tr8n::Translator", :translator_id]]
   end
   
+  def inner_joins
+    [:language, :language_forum_message, :translator]
+  end
+  
 end

data/app/models/tr8n/language_forum_message_filter.rb

@@ -31,4 +31,8 @@ class Tr8n::LanguageForumMessageFilter < Tr8n::BaseFilter
     "created_today"
   end
   
+  def inner_joins
+    [:language, :language_forum_topic, :translator]
+  end
+  
 end

data/app/models/tr8n/language_forum_topic_filter.rb

@@ -31,4 +31,8 @@ class Tr8n::LanguageForumTopicFilter < Tr8n::BaseFilter
     "created_today"
   end
 
+  def inner_joins
+    [:language, :translator]
+  end
+
 end

data/app/models/tr8n/language_metric.rb

@@ -47,7 +47,7 @@ class Tr8n::LanguageMetric < ActiveRecord::Base
   
   def self.calculate_language_metrics
     last_daily_metric = Tr8n::DailyLanguageMetric.find(:first, :conditions => "metric_date is not null", :order => "metric_date desc")
-    metric_date = last_daily_metric.nil? ? Date.new(2010, 5, 1) : last_daily_metric.metric_date
+    metric_date = last_daily_metric.nil? ? Date.new(2011, 10, 1) : last_daily_metric.metric_date
 
     Tr8n::Language.enabled_languages.each do |lang|
       Tr8n::Logger.debug("Processing #{lang.english_name} language...")

data/app/models/tr8n/language_metric_filter.rb

@@ -60,4 +60,8 @@ class Tr8n::LanguageMetricFilter < Tr8n::BaseFilter
     end   
   end
 
+  def inner_joins
+    [:language]
+  end
+
 end

data/app/models/tr8n/language_rule_filter.rb

@@ -23,9 +23,9 @@
 
 class Tr8n::LanguageRuleFilter < Tr8n::BaseFilter
   
-  def inner_joins
-    [["Tr8n::Language", :language_id], ["Tr8n::Translator", :translator_id]]
-  end
+  # def inner_joins
+  #   [["Tr8n::Language", :language_id], ["Tr8n::Translator", :translator_id]]
+  # end
 
   def definition
     defs = super  
@@ -42,4 +42,8 @@ class Tr8n::LanguageRuleFilter < Tr8n::BaseFilter
     return super
   end
 
+  def inner_joins
+    [:language, :translator]
+  end
+
 end

data/app/models/tr8n/language_user_filter.rb

@@ -23,12 +23,12 @@
 
 class Tr8n::LanguageUserFilter < Tr8n::BaseFilter
 
-  def inner_joins
-    [["Tr8n::Language", :language_id], ["Tr8n::Translator", :translator_id]]
-  end
-
   def default_filter_if_empty
     "created_today"
   end
 
+  def inner_joins
+    [:language, :translator]
+  end
+
 end

data/app/models/tr8n/translation.rb

@@ -246,54 +246,33 @@ class Tr8n::Translation < ActiveRecord::Base
      ["date", "date"]].collect{|option| [option.first.trl("Translation filter group by option"), option.last]}
   end
   
-  def self.search_conditions_for(params, language = Tr8n::Config.current_language)
-    conditions = ["language_id = ?", language.id]
-    
-    unless params[:search].blank?
-      conditions[0] << " and " unless conditions[0].blank?
-      conditions[0] << "label like ?" 
-      conditions << "%#{params[:search]}%"
-    end
-
+  def self.for_params(params, language = Tr8n::Config.current_language)
+    results = self.where("language_id = ?", language.id)
+    results = results.where("label like ?", "%#{params[:search]}%") unless params[:search].blank?
+  
     if params[:with_status] == "accepted"
-      conditions[0] << " and " unless conditions[0].blank?
-      conditions[0] << " rank >= ? "
-      conditions << Tr8n::Config.translation_threshold
+      results = results.where("rank >= ?", Tr8n::Config.translation_threshold)
     elsif params[:with_status] == "pending"
-      conditions[0] << " and " unless conditions[0].blank?
-      conditions[0] << " rank >= 0 and rank < ? "
-      conditions << Tr8n::Config.translation_threshold
+      results = results.where("rank >= 0 and rank < ?", Tr8n::Config.translation_threshold)
     elsif params[:with_status] == "rejected"
-      conditions[0] << " and " unless conditions[0].blank?
-      conditions[0] << " rank < 0 "
+      results = results.where("rank < 0")
     end
     
     if params[:submitted_by] == "me"
-      conditions[0] << " and " unless conditions[0].blank?
-      conditions[0] << " translator_id = ? "
-      conditions << Tr8n::Config.current_translator.id
+      results = results.where("translator_id = ?", Tr8n::Config.current_translator.id)
     end
     
     if params[:submitted_on] == "today"
       date = Date.today
-      conditions[0] << " and " unless conditions[0].blank?
-      conditions[0] << "created_at >= ? and created_at < ?" 
-      conditions << date
-      conditions << (date + 1.day)
+      results = results.where("created_at >= ? and created_at < ?", date, date + 1.day)
     elsif params[:submitted_on] == "yesterday"
       date = Date.today - 1.days
-      conditions[0] << " and " unless conditions[0].blank?
-      conditions[0] << "created_at >= ? and created_at < ?" 
-      conditions << date
-      conditions << (date + 1.day)
+      results = results.where("created_at >= ? and created_at < ?", date, date + 1.day)
     elsif params[:submitted_on] == "last_week"
       date = Date.today - 7.days
-      conditions[0] << " and " unless conditions[0].blank?
-      conditions[0] << "created_at >= ? and created_at < ?" 
-      conditions << date
-      conditions << Date.today
+      results = results.where("created_at >= ? and created_at < ?", date, Date.today)
     end    
-    conditions
+    results
   end 
     
 end

data/app/models/tr8n/translation_filter.rb

@@ -23,12 +23,12 @@
 
 class Tr8n::TranslationFilter < Tr8n::BaseFilter
 
-  def inner_joins
-    [["Tr8n::Language", :language_id], ["Tr8n::TranslationKey", :translation_key_id]]
-  end
-
   def default_filter_if_empty
     "created_today"
   end
 
+  def inner_joins
+    [:language, :translation_key]
+  end
+
 end

data/app/models/tr8n/translation_key.rb

@@ -42,11 +42,10 @@ class Tr8n::TranslationKey < ActiveRecord::Base
   alias :comments     :translation_key_comments
   
   def self.find_or_create(label, desc = "", options = {})
-    key = generate_key(label, desc)
+    key = generate_key(label, desc).to_s
     
-    # translation keys don't ever change, so no real reason to invalidate them  
     tkey = Tr8n::Cache.fetch("translation_key_#{key}") do 
-      existing_key = find_by_key(key) 
+      existing_key = where(:key => key).first
       
       unless existing_key
         if options[:api] and (not Tr8n::Config.api[:allow_key_registration])
@@ -63,7 +62,7 @@ class Tr8n::TranslationKey < ActiveRecord::Base
       locale = options[:locale] || Tr8n::Config.block_options[:default_locale] || Tr8n::Config.default_locale
       
       existing_key ||= begin
-        new_tkey = create(:key => key, 
+        new_tkey = create(:key => key.to_s, 
                           :label => label, 
                           :description => desc, 
                           :locale => locale,
@@ -81,9 +80,7 @@ class Tr8n::TranslationKey < ActiveRecord::Base
       update_default_locale(existing_key, options)
       
       # mark each key as verified - but only if caching is enabled
-      if Tr8n::Config.enable_caching?
-        existing_key.update_attributes(:verified_at => Time.now)
-      end  
+      existing_key.update_attributes(:verified_at => Time.now) if Tr8n::Config.enable_caching?
       existing_key
     end
     
@@ -125,15 +122,15 @@ class Tr8n::TranslationKey < ActiveRecord::Base
   end
   
   def self.generate_key(label, desc = "")
-    Digest::MD5.hexdigest("#{label};;;#{desc}")
+    # TODO: there is something iffy going on with the strings from the hash
+    # without the extra ~ = the strings are not seen in the sqlite database - wtf?
+    "#{Digest::MD5.hexdigest("#{label};;;#{desc}")}~"[0..-2]
   end
 
   def reset_key!
     # remove old key from cache
     Tr8n::Cache.delete("translation_key_#{key}")
-    
-    self.key = self.class.generate_key(label, description)
-    save
+    self.update_attributes(:key => self.class.generate_key(label, description))
   end
   
   def language
@@ -143,18 +140,18 @@ class Tr8n::TranslationKey < ActiveRecord::Base
   def tokenized_label
     @tokenized_label ||= Tr8n::TokenizedLabel.new(label)
   end
-  
-  # comments are left for a specific language
-  def comments(language = Tr8n::Config.current_language)
-    Tr8n::TranslationKeyComment.find(:all, :conditions => ["language_id = ? and translation_key_id = ?", language.id, self.id])
-  end
-  
+
   delegate :tokens, :tokens?, :to => :tokenized_label
   delegate :data_tokens, :data_tokens?, :to => :tokenized_label
   delegate :decoration_tokens, :decoration_tokens?, :to => :tokenized_label
   delegate :translation_tokens, :translation_tokens?, :to => :tokenized_label
   delegate :sanitized_label, :tokenless_label, :suggestion_tokens, :words, :to => :tokenized_label
 
+  # comments are left for a specific language
+  def comments(language = Tr8n::Config.current_language)
+    Tr8n::TranslationKeyComment.where("language_id = ? and translation_key_id = ?", language.id, self.id)
+  end
+
   # returns only the tokens that depend on one or more rules of the language, if any defined for the language
   def language_rules_dependant_tokens(language = Tr8n::Config.current_language)
     toks = []
@@ -182,7 +179,7 @@ class Tr8n::TranslationKey < ActiveRecord::Base
   end
 
   def glossary
-    @glossary ||= Tr8n::Glossary.find(:all, :conditions => ["keyword in (?)", words], :order => "keyword asc")
+    @glossary ||= Tr8n::Glossary.where("keyword in (?)", words).order("keyword asc")
   end
   
   def glossary?
@@ -230,14 +227,9 @@ class Tr8n::TranslationKey < ActiveRecord::Base
 
   # returns all translations for the key, language and minimal rank
   def translations_for(language, rank = nil)
-    conditions = ["translation_key_id = ? and language_id = ?", self.id, language.id]
-    
-    if rank
-      conditions[0] << " and rank >= ?"
-      conditions << rank
-    end
-
-    Tr8n::Translation.find(:all, :conditions => conditions, :order => "rank desc")
+    translations = Tr8n::Translation.where("translation_key_id = ? and language_id = ?", self.id, language.id)
+    translations = translations.where("rank >= ?", rank) if rank
+    translations.order("rank desc")
   end
 
   # used by the inline popup dialog, we don't want to show blocked translations
@@ -247,7 +239,7 @@ class Tr8n::TranslationKey < ActiveRecord::Base
   
   # returns only the translations that meet the minimum rank
   def valid_translations_for(language)
-    Tr8n::Cache.fetch("translations_#{language.locale}_#{self.key}") do
+    Tr8n::Cache.fetch("translations_#{language.locale}_#{key}") do
       translations_for(language, Tr8n::Config.translation_threshold)
     end
   end
@@ -304,7 +296,7 @@ class Tr8n::TranslationKey < ActiveRecord::Base
   end
 
   def self.random
-    find(:first, :offset => rand(count - 1))
+    self.limit(1).offset(count-1)
   end
 
   # returns back grouped by context - used by API
@@ -567,59 +559,44 @@ class Tr8n::TranslationKey < ActiveRecord::Base
       ["unlocked only", "unlocked"]]
   end
   
-  def self.search_conditions_for(params)
-    conditions = ["tr8n_translation_keys.locale <> ? and (level is null or level <= ?)", Tr8n::Config.current_language.locale, Tr8n::Config.current_translator.level]
+  def self.for_params(params)
+    results = self.where("tr8n_translation_keys.locale <> ? and (level is null or level <= ?)", Tr8n::Config.current_language.locale, Tr8n::Config.current_translator.level)
     
     if Tr8n::Config.enable_caching?
-      conditions[0] << " and verified_at is not null"
+      results = results.where("verified_at is not null")
     end  
     
     unless params[:search].blank?
-      conditions[0] << " and (tr8n_translation_keys.label like ? or tr8n_translation_keys.description like ?)" 
-      conditions << "%#{params[:search]}%"
-      conditions << "%#{params[:search]}%"  
+      results = results.where("(tr8n_translation_keys.label like ? or tr8n_translation_keys.description like ?)", "%#{params[:search]}%", "%#{params[:search]}%")
     end
 
     # for with and approved, allow user to specify the kinds
     if params[:phrase_type] == "with"
-      conditions[0] << " and tr8n_translation_keys.id in (select tr8n_translations.translation_key_id from tr8n_translations where tr8n_translations.language_id = ?) "
-      conditions << Tr8n::Config.current_language.id
+      results = results.where("tr8n_translation_keys.id in (select tr8n_translations.translation_key_id from tr8n_translations where tr8n_translations.language_id = ?)", Tr8n::Config.current_language.id)
       
       # if approved, ensure that translation key is locked
       if params[:phrase_status] == "approved" 
-        conditions[0] << " and tr8n_translation_keys.id in (select tr8n_translation_key_locks.translation_key_id from tr8n_translation_key_locks where tr8n_translation_key_locks.language_id = ? and tr8n_translation_key_locks.locked = ?) "
-        conditions << Tr8n::Config.current_language.id
-        conditions << true
+        results = results.where("tr8n_translation_keys.id in (select tr8n_translation_key_locks.translation_key_id from tr8n_translation_key_locks where tr8n_translation_key_locks.language_id = ? and tr8n_translation_key_locks.locked = ?)", Tr8n::Config.current_language.id, true)
       
         # if approved, ensure that translation key does not have a lock or unlocked
       elsif params[:phrase_status] == "pending" 
-        conditions[0] << " and tr8n_translation_keys.id not in (select tr8n_translation_key_locks.translation_key_id from tr8n_translation_key_locks where tr8n_translation_key_locks.language_id = ? and tr8n_translation_key_locks.locked = ?) "
-        conditions << Tr8n::Config.current_language.id
-        conditions << true
+        results = results.where("tr8n_translation_keys.id not in (select tr8n_translation_key_locks.translation_key_id from tr8n_translation_key_locks where tr8n_translation_key_locks.language_id = ? and tr8n_translation_key_locks.locked = ?)", Tr8n::Config.current_language.id, true)
       end
             
     elsif params[:phrase_type] == "without"
-      conditions[0] << " and tr8n_translation_keys.id not in (select tr8n_translations.translation_key_id from tr8n_translations where tr8n_translations.language_id = ?)"
-      conditions << Tr8n::Config.current_language.id
+      results = results.where("tr8n_translation_keys.id not in (select tr8n_translations.translation_key_id from tr8n_translations where tr8n_translations.language_id = ?)", Tr8n::Config.current_language.id)
       
     elsif params[:phrase_type] == "followed"
-      conditions[0] << " and tr8n_translation_keys.id in (select tr8n_translator_following.object_id from tr8n_translator_following where tr8n_translator_following.translator_id = ? and tr8n_translator_following.object_type = ?)"
-      
-      conditions << Tr8n::Config.current_translator.id
-      conditions << 'Tr8n::TranslationKey'
+      results = results.where("tr8n_translation_keys.id in (select tr8n_translator_following.object_id from tr8n_translator_following where tr8n_translator_following.translator_id = ? and tr8n_translator_following.object_type = ?)", Tr8n::Config.current_translator.id, 'Tr8n::TranslationKey')
     end
     
     if params[:phrase_lock] == "locked"
-      conditions[0] << " and tr8n_translation_keys.id in (select tr8n_translation_key_locks.translation_key_id from tr8n_translation_key_locks where tr8n_translation_key_locks.language_id = ? and tr8n_translation_key_locks.locked = ?) "
-      conditions << Tr8n::Config.current_language.id
-      conditions << true
+      results = results.where("tr8n_translation_keys.id in (select tr8n_translation_key_locks.translation_key_id from tr8n_translation_key_locks where tr8n_translation_key_locks.language_id = ? and tr8n_translation_key_locks.locked = ?)", Tr8n::Config.current_language.id, true)
       
     elsif params[:phrase_lock] == "unlocked"  
-      conditions[0] << " and tr8n_translation_keys.id not in (select tr8n_translation_key_locks.translation_key_id from tr8n_translation_key_locks where tr8n_translation_key_locks.language_id = ? and tr8n_translation_key_locks.locked = ?) "
-      conditions << Tr8n::Config.current_language.id
-      conditions << true
+      results = results.where("tr8n_translation_keys.id not in (select tr8n_translation_key_locks.translation_key_id from tr8n_translation_key_locks where tr8n_translation_key_locks.language_id = ? and tr8n_translation_key_locks.locked = ?)", Tr8n::Config.current_language.id, true)
     end
     
-    conditions
+    results
   end    
 end