tr8n 3.1.1 → 3.1.2

data/app/models/tr8n/translation_source.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
@@ -38,7 +38,7 @@ class Tr8n::TranslationSource < ActiveRecord::Base
   def self.find_or_create(source, url)
     translation_domain = Tr8n::TranslationDomain.find_or_create(url)
     Tr8n::Cache.fetch("translation_source_#{translation_domain.id}_#{source}") do 
-      translation_source = find(:first, :conditions => ["source = ? and translation_domain_id = ?", source, translation_domain.id])
+      translation_source = where("source = ? and translation_domain_id = ?", source, translation_domain.id).first
       translation_source ||= create(:source => source, :translation_domain => translation_domain)
       translation_source.update_attributes(:translation_domain => translation_domain) unless translation_source.translation_domain
       translation_source

data/app/models/tr8n/translation_source_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/translation_vote.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
@@ -28,9 +28,8 @@ class Tr8n::TranslationVote < ActiveRecord::Base
   belongs_to :translator,   :class_name => "Tr8n::Translator"
     
   def self.find_or_create(translation, translator)
-    vote = find(:first, :conditions => ["translation_id = ? and translator_id = ?", translation.id, translator.id])
-    vote = create(:translation => translation, :translator => translator, :vote => 0) unless vote
-    vote
+    vote = where("translation_id = ? and translator_id = ?", translation.id, translator.id).first
+    vote ||= create(:translation => translation, :translator => translator, :vote => 0)
   end
   
 end

data/app/models/tr8n/translation_vote_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/translator.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
@@ -53,7 +53,7 @@ class Tr8n::Translator < ActiveRecord::Base
   end
   
   def self.find_or_create(user)
-    trn = find(:first, :conditions => ["user_id = ?", user.id])
+    trn = where(:user_id => user.id).first
     trn = create(:user => user) unless trn
     trn
   end
@@ -62,7 +62,7 @@ class Tr8n::Translator < ActiveRecord::Base
     return unless user
     
     translator = Tr8n::Translator.find_or_create(user)
-    Tr8n::LanguageUser.find(:all, :conditions => ["user_id = ?", user.id]).each do |lu|
+    Tr8n::LanguageUser.where(:user_id => user.id).each do |lu|
       lu.update_attributes(:translator => translator)
     end
     translator
@@ -195,11 +195,21 @@ class Tr8n::Translator < ActiveRecord::Base
     false
   end
 
+  def system?
+    level == Tr8n::Config.system_level
+  end
+
+  def application?
+    level == Tr8n::Config.application_level
+  end
+  
   def last_logs
-    Tr8n::TranslatorLog.find(:all, :conditions => ["translator_id = ?", self.id], :order => "created_at desc", :limit => 20)
+    Tr8n::TranslatorLog.where("translator_id = ?", self.id).order("created_at desc").limit(20)
   end
   
   def name
+    return "Tr8n Network" if system?
+    
     unless Tr8n::Config.site_user_info_enabled?
       translator_name = super
       return translator_name unless translator_name.blank?
@@ -214,6 +224,8 @@ class Tr8n::Translator < ActiveRecord::Base
   end
 
   def gender
+    return "unknown" if system?
+    
     unless Tr8n::Config.site_user_info_enabled?
       translator_gender = super
       return translator_gender unless translator_gender.blank?
@@ -224,6 +236,8 @@ class Tr8n::Translator < ActiveRecord::Base
   end
 
   def mugshot
+    return Tr8n::Config.system_image if system?
+    
     return super unless Tr8n::Config.site_user_info_enabled?
     return Tr8n::Config.silhouette_image unless user
     img_url = Tr8n::Config.user_mugshot(user)
@@ -268,7 +282,7 @@ class Tr8n::Translator < ActiveRecord::Base
   end
 
   def unfollow(object)
-    tf = Tr8n::TranslatorFollowing.find(:first, :conditions => ["object_type = ? and object_id = ?", object.class.name, object.id])
+    tf = Tr8n::TranslatorFollowing.where("object_type = ? and object_id = ?", object.class.name, object.id).first
     tf.destroy if tf
   end
 

data/app/models/tr8n/translator_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/translator_following.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,7 +32,7 @@ class Tr8n::TranslatorFollowing < ActiveRecord::Base
   end
 
   def self.following_for(translator, object)
-    find(:first, :conditions => ["translator_id = ? and object_type = ? and object_id = ?", translator.id, object.class.name, object.id])
+    where("translator_id = ? and object_type = ? and object_id = ?", translator.id, object.class.name, object.id).first
   end
   
 end

data/app/models/tr8n/translator_following_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/translator_log.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/translator_log_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/translator_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
@@ -27,30 +27,25 @@ class Tr8n::TranslatorMetric < ActiveRecord::Base
   belongs_to :translator, :class_name => "Tr8n::Translator"
   belongs_to :language, :class_name => "Tr8n::Language"
   
-  def self.find_or_create(translator, language)
-    if language
-      tm = find(:first, :conditions => ["translator_id = ? and language_id = ?", translator.id, language.id])
-    else
-      tm = find(:first, :conditions => ["translator_id = ? and language_id is null", translator.id])
-    end
+  def self.find_or_create(translator, language = nil)
+    tm = where("translator_id = ?", translator.id)
+    tm = where("language_id = ?", language.id) if language
+    return tm.first if tm.first
     
-    return tm if tm
     create(:translator => translator, :language => language, :total_translations => 0, :total_votes => 0, :positive_votes => 0, :negative_votes => 0)
   end
   
   # updated when an action is done by the translator
   def update_metrics!
     if language
-      self.total_translations = Tr8n::Translation.count(:conditions=>["translator_id = ? and language_id = ?", translator.id, language.id])
-      self.total_votes = Tr8n::TranslationVote.count(:conditions=>["tr8n_translation_votes.translator_id = ? and tr8n_translations.language_id = ?", translator.id, language.id], 
-                                               :joins => "INNER JOIN tr8n_translations ON tr8n_translations.id = tr8n_translation_votes.translation_id")
-      self.positive_votes = Tr8n::TranslationVote.count(:conditions=>["tr8n_translation_votes.translator_id = ? and tr8n_translation_votes.vote > 0 and tr8n_translations.language_id = ?", translator.id, language.id],
-                                               :joins => "INNER JOIN tr8n_translations ON tr8n_translations.id = tr8n_translation_votes.translation_id")
+      self.total_translations = Tr8n::Translation.where("translator_id = ? and language_id = ?", translator.id, language.id).count
+      self.total_votes = Tr8n::TranslationVote.where("tr8n_translation_votes.translator_id = ? and tr8n_translations.language_id = ?", translator.id, language.id).joins(:translation).count
+      self.positive_votes = Tr8n::TranslationVote.where("tr8n_translation_votes.translator_id = ? and tr8n_translation_votes.vote > 0 and tr8n_translations.language_id = ?", translator.id, language.id).joins(:translation).count
       self.negative_votes = self.total_votes - self.positive_votes
     else
-      self.total_translations = Tr8n::Translation.count(:conditions=>["translator_id = ?", translator.id])
-      self.total_votes = Tr8n::TranslationVote.count(:conditions=>["translator_id = ?", translator.id])
-      self.positive_votes = Tr8n::TranslationVote.count(:conditions=>["translator_id = ? and vote > 0", translator.id])
+      self.total_translations = Tr8n::Translation.where("translator_id = ?", translator.id).count
+      self.total_votes = Tr8n::TranslationVote.where("translator_id = ?", translator.id).count
+      self.positive_votes = Tr8n::TranslationVote.where("translator_id = ? and vote > 0", translator.id).count
       self.negative_votes = self.total_votes - self.positive_votes
     end
     
@@ -60,11 +55,11 @@ class Tr8n::TranslatorMetric < ActiveRecord::Base
   # updated when an action is done to the translator's translations
   def update_rank!
     if language
-      self.accepted_translations = Tr8n::Translation.count(:conditions => ["translator_id = ? and language_id = ? and rank >= ?", translator.id, language.id, Tr8n::Config.translation_threshold])
-      self.rejected_translations = Tr8n::Translation.count(:conditions => ["translator_id = ? and language_id = ? and rank < ?", translator.id, language.id, 0])
+      self.accepted_translations = Tr8n::Translation.where("translator_id = ? and language_id = ? and rank >= ?", translator.id, language.id, Tr8n::Config.translation_threshold).count
+      self.rejected_translations = Tr8n::Translation.where("translator_id = ? and language_id = ? and rank < ?", translator.id, language.id, 0).count
     else
-      self.accepted_translations = Tr8n::Translation.count(:conditions => ["translator_id = ? and rank >= ?", translator.id, Tr8n::Config.translation_threshold])
-      self.rejected_translations = Tr8n::Translation.count(:conditions => ["translator_id = ? and rank < ?", translator.id, 0])
+      self.accepted_translations = Tr8n::Translation.where("translator_id = ? and rank >= ?", translator.id, Tr8n::Config.translation_threshold).count
+      self.rejected_translations = Tr8n::Translation.where("translator_id = ? and rank < ?", translator.id, 0).count
     end
     
     save
@@ -72,7 +67,6 @@ class Tr8n::TranslatorMetric < ActiveRecord::Base
   
   def rank 
     return 0 unless total_translations and accepted_translations
-    
     total_translations == 0 ? 0 : (accepted_translations * 100.0/total_translations)
   end
   

data/app/models/tr8n/translator_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/translator_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
@@ -32,7 +32,7 @@ class Tr8n::TranslatorReport < ActiveRecord::Base
   end
 
   def self.report_for(translator, object)
-    find(:first, :conditions => ["translator_id = ? and object_type = ? and object_id = ?", translator.id, object.class.name, object.id])
+    self.where("translator_id = ? and object_type = ? and object_id = ?", translator.id, object.class.name, object.id).first
   end
   
   def self.title_for(object)

data/app/models/tr8n/translator_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/value_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/views/tr8n/admin/common/_paginator.html.erb

@@ -1,20 +1,32 @@
-<div>
-  <table style="font-size:12px;width:100%; margin-top:10px; margin-bottom:10px;">
+<div style="padding-bottom:10px;padding-top:5px;">
+  <table style="width:100%;">
     <tr>
-      <td style="text-align:left; vertical-align:top;font-size:11px; font-family:arial;"><%= tr8n_will_paginate(objects) %></td>
-			<% 
-        entry_name = ""
-        if objects.any?
-          obj_name = objects.first.class.name.underscore
-          if obj_name.index("/")
-            entry_name = obj_name.split("/").last 
-          else
-            entry_name = obj_name
-          end
-          entry_name.gsub!("_", " ")  
-        end 
-      %>
-      <td style="text-align:right; vertical-align:top;font-size:11px; font-family:arial;"><%= tr8n_page_entries_info(objects, :entry_name => entry_name.downcase) %></td>
+      <td style="text-align:left; vertical-align:top;font-size:11px; font-family:arial;">
+				<% 
+					entry_name = options[:subject] || (collection.empty? ? 'entry' : collection.first.class.name.underscore.gsub('_', ' '))
+					output = ""
+				  if collection.num_pages < 2
+				    case collection.size
+				      when 0
+				        output = tr("None found", "Paginator message", {}, options)
+				      when 1
+				        output = tr("Displaying [bold: 1] #{entry_name}", "Paginator message", {}, options)
+				      else
+				        output = tr("Displaying [bold: all {count}] #{entry_name.pluralize}", "Paginator message", {:count => collection.size}, options)
+				    end
+				  else
+				    output = tr("Displaying #{entry_name.pluralize} [bold: {start_num} - {end_num}] of [bold: {total_count}] in total", 
+				       "Paginator message", {
+				          :start_num    => collection.offset_num + 1,
+				          :end_num      => collection.offset_num + collection.length,
+				          :total_count  => collection.total_num
+				       }, options
+				    )
+				  end
+				%>
+				<%= output %>
+			</td>
+      <td style="text-align:right; vertical-align:top; font-size:11px; font-family:arial;"><%= paginate(collection) %></td>
     </tr>
   </table>
-</div>
+</div>

data/app/views/tr8n/admin/translation_key/_tabs.html.erb

@@ -3,7 +3,9 @@
   current_tab ||= ""
   [["Translation Keys", {:action => :index}],
    ["Comments", {:action => :comments}],
-   ["Locks", {:action => :locks}]].each do |link|
+   ["Locks", {:action => :locks}],
+   ["Sync Logs", {:action => :sync_logs}]
+	].each do |link|
       if controller.action_name == link.last[:action].to_s
         current_tab = link.first if current_tab.blank?
         links << link.first

data/app/views/tr8n/admin/translation_key/sync_logs.html.erb

@@ -0,0 +1,5 @@
+<%= render :partial => "/tr8n/admin/common/header" %>
+<%= render :partial => "tabs" %>
+<%= tr8n_will_filter(@logs) %>
+
+<%= will_filter_table_tag(@logs) %>

data/app/views/tr8n/awards/index.html.erb

@@ -4,13 +4,11 @@
 	
 	<div class="section_title">
 	  <div style="float:right; font-size:12px; padding-top:5px;">
-	  <% unless tr8n_current_language.default? %>
 	    <% if params[:mode] == "all" %>
 	        <%=link_to(tra("Awards for {language} Language", 'Awards section header', :language => tr8n_current_language.native_name), :mode => :current) %> 
 	    <% else %>
 	        <%=link_to(tra("Awards for All Languages", 'Awards section header'), :mode => :all) %> 
 	    <% end %>
-	  <% end %>  
 	  </div>
 	  
 	  <% if params[:mode] == "all" %> 

data/app/views/tr8n/common/_paginator.html.erb

@@ -2,13 +2,31 @@
   <table style="width:100%;">
     <tr>
       <td style="text-align:left; vertical-align:top;font-size:11px; font-family:arial;">
-				<% if objects.total_count > 0 %>
-					Showing <%= objects.offset_value + 1 %> - <%= objects.offset_value + objects.length %> of <%= objects.total_count %>
-				<% else %>	
-					No results found
-				<% end %>
+				<% 
+					entry_name = options[:subject] || (collection.empty? ? 'entry' : collection.first.class.name.underscore.gsub('_', ' '))
+					output = ""
+				  if collection.num_pages < 2
+				    case collection.size
+				      when 0
+				        output = tr("None found", "Paginator message", {}, options)
+				      when 1
+				        output = tr("Displaying [bold: 1] #{entry_name}", "Paginator message", {}, options)
+				      else
+				        output = tr("Displaying [bold: all {count}] #{entry_name.pluralize}", "Paginator message", {:count => collection.size}, options)
+				    end
+				  else
+				    output = tr("Displaying #{entry_name.pluralize} [bold: {start_num} - {end_num}] of [bold: {total_count}] in total", 
+				       "Paginator message", {
+				          :start_num    => collection.offset_value + 1,
+				          :end_num      => collection.offset_value + collection.length,
+				          :total_count  => collection.total_count
+				       }, options
+				    )
+				  end
+				%>
+				<%= output %>
 			</td>
-      <td style="text-align:right; vertical-align:top; font-size:11px; font-family:arial;"><%= paginate(objects) %></td>
+      <td style="text-align:right; vertical-align:top; font-size:11px; font-family:arial;"><%= paginate(collection) %></td>
     </tr>
   </table>
 </div>

data/app/views/tr8n/common/_tabs.html.erb

@@ -1,11 +1,15 @@
 <div class="translations_navigation">
   <div style="font-size:22px; font-weight: bold;padding-bottom:15px;">
 	 <%=tra("Translation Tools", "Tabs header") %>
-	 <% unless tr8n_current_language.default? %> 
-		 - <%=tra("{language} Language", nil, :language => tr8n_current_language.native_name)%>
-			 <% if tr8n_current_user_is_manager? %>
-			   <%=link_to(tra("manage", "Link to management section"), "/tr8n/language", :style => "font-size:12px;")%>
-			 <% end %>
+	 - <%=tra("{language} Language", nil, :language => tr8n_current_language.native_name)%>
+	 <% if tr8n_current_language.default? %> 
+		 <% if tr8n_current_user_is_admin? %>
+		   <%=link_to(tra("manage", "Link to management section"), "/tr8n/language", :style => "font-size:12px;")%>
+		 <% end %>
+ 	 <% else %>
+		 <% if tr8n_current_user_is_manager? %>
+		   <%=link_to(tra("manage", "Link to management section"), "/tr8n/language", :style => "font-size:12px;")%>
+		 <% end %>
 	 <% end %>  
 	</div>
   

data/app/views/tr8n/forum/_messages.html.erb

@@ -1,5 +1,5 @@
 <div class="section">
-	<%= tr8n_paginator_tag(@messages, 'message') %>	
+	<%= tr8n_paginator_tag(@messages, :subject => 'message') %>	
 
   <table style="width:100%; ">
     <% @messages.each do |message| %>

data/app/views/tr8n/forum/index.html.erb

@@ -68,7 +68,7 @@
 	      <% end %>
 	    </table>
 	  
-			<%= tr8n_paginator_tag(@topics, 'forum topic') %>	
+			<%= tr8n_paginator_tag(@topics, :subject => 'forum topic') %>	
 	</div>
 	<% end %>
 	

data/app/views/tr8n/glossary/index.html.erb

@@ -15,7 +15,7 @@
 	</div>
 	
 	<div class="section">
-	  <%= render :partial => "/tr8n/common/paginator", :locals => {:objects => @terms, :subject => 'term'} %>
+		<%= tr8n_paginator_tag(@terms, :subject => 'term') %>	
 	
 	  <table style="width:100%">
 	    <tr style="border-bottom:1px solid #ccc;">
@@ -34,7 +34,7 @@
 	    <% end %>
 	  </table>
 		
-	  <%= render :partial => "/tr8n/common/paginator", :locals => {:objects => @terms, :subject => 'term'} %>
+		<%= tr8n_paginator_tag(@terms, :subject => 'term') %>	
 	</div>
 	
 	<%= render :partial => "/tr8n/common/footer" %>