tr8n 3.1.8 → 3.2.0

data/app/models/tr8n/translation_key_comment.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
+# Copyright (c) 2010-2012 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_key_comment_filter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
+# Copyright (c) 2010-2012 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_key_filter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
+# Copyright (c) 2010-2012 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_key_lock.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
+# Copyright (c) 2010-2012 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_key_lock_filter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
+# Copyright (c) 2010-2012 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_key_source.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
+# Copyright (c) 2010-2012 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
@@ -22,7 +22,7 @@
 #++
 
 class Tr8n::TranslationKeySource < ActiveRecord::Base
-  set_table_name :tr8n_translation_key_sources
+  set_table_name  :tr8n_translation_key_sources
   after_destroy   :clear_cache
 
   belongs_to :translation_source, :class_name => "Tr8n::TranslationSource"
@@ -33,10 +33,21 @@ class Tr8n::TranslationKeySource < ActiveRecord::Base
 
   serialize :details
 
+  def self.cache_key(translation_key_id, translation_source_id)
+    "translation_key_source_#{translation_key_id}_#{translation_source_id}"
+  end
+
+  def cache_key
+    self.class.cache_key(translation_key_id, translation_source_id)
+  end
+
   def self.find_or_create(translation_key, translation_source)
-    Tr8n::Cache.fetch("translation_key_source_#{translation_key.id}_#{translation_source.id}") do 
+    Tr8n::Cache.fetch(cache_key(translation_key.id, translation_source.id)) do 
       tks = where("translation_key_id = ? and translation_source_id = ?", translation_key.id, translation_source.id).first
-      tks || create(:translation_key => translation_key, :translation_source => translation_source)
+      tks ||= begin
+        translation_source.touch
+        create(:translation_key => translation_key, :translation_source => translation_source)
+      end
     end  
   end
   
@@ -51,7 +62,7 @@ class Tr8n::TranslationKeySource < ActiveRecord::Base
   end
   
   def clear_cache
-    Tr8n::Cache.delete("translation_key_source_#{translation_key_id}_#{translation_source_id}")
+    Tr8n::Cache.delete(cache_key)
   end
   
 end

data/app/models/tr8n/translation_key_source_filter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
+# Copyright (c) 2010-2012 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_source.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
+# Copyright (c) 2010-2012 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
@@ -35,9 +35,17 @@ class Tr8n::TranslationSource < ActiveRecord::Base
   alias :sources  :translation_key_sources
   alias :keys     :translation_keys
   
+  def self.cache_key(source)
+    "translation_source_#{source}"
+  end
+
+  def cache_key
+    self.class.cache_key(source)
+  end
+
   def self.find_or_create(source, url = nil)
-    translation_domain = Tr8n::TranslationDomain.find_or_create(url)
-    Tr8n::Cache.fetch("translation_source_#{translation_domain.id}_#{source}") do 
+    Tr8n::Cache.fetch(cache_key(source)) do 
+      translation_domain = Tr8n::TranslationDomain.find_or_create(url)
       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
@@ -46,7 +54,7 @@ class Tr8n::TranslationSource < ActiveRecord::Base
   end
 
   def clear_cache
-    Tr8n::Cache.delete("translation_source_#{translation_domain_id}_#{source}")
+    Tr8n::Cache.delete(cache_key)
   end
   
 end

data/app/models/tr8n/translation_source_filter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
+# Copyright (c) 2010-2012 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_source_language.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
+# Copyright (c) 2010-2012 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, tr8n.net
+# Copyright (c) 2010-2012 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_filter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
+# Copyright (c) 2010-2012 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, tr8n.net
+# Copyright (c) 2010-2012 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
@@ -40,29 +40,45 @@ class Tr8n::Translator < ActiveRecord::Base
 
   belongs_to :fallback_language,            :class_name => 'Tr8n::Language',                  :foreign_key => :fallback_language_id
     
+  def self.cache_key(user_id)
+    "translator_#{user_id}"
+  end
+
+  def cache_key
+    self.class.cache_key(key)
+  end
+
   def self.for(user)
     return nil unless user and user.id 
     return nil if Tr8n::Config.guest_user?(user)
-    return user if user.is_a?(Tr8n::Translator)
-    find_by_user_id(user.id)
+    translator = Tr8n::Cache.fetch(cache_key(user.id)) do 
+      find_by_user_id(user.id)
+    end
   end
   
   def self.find_or_create(user)
+    return nil unless user and user.id 
+
     trn = where(:user_id => user.id).first
     trn = create(:user => user) unless trn
     trn
   end
 
   def self.register(user = Tr8n::Config.current_user)
-    return unless user
-    
     translator = Tr8n::Translator.find_or_create(user)
+    return unless translator
+
+    # update all language user entries to add a translator id
     Tr8n::LanguageUser.where(:user_id => user.id).each do |lu|
       lu.update_attributes(:translator => translator)
     end
     translator
   end
   
+  def self.top_translators_for_language(lang = Tr8n::Config.current_language, limit = 5)
+    Tr8n::TranslatorMetric.where(:language_id => lang.id).order("total_translations desc, total_votes desc").limit(limit)
+  end  
+
   def total_metric
     @total_metric ||= Tr8n::TranslatorMetric.find_or_create(self, nil)
   end

data/app/models/tr8n/translator_filter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
+# Copyright (c) 2010-2012 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, tr8n.net
+# Copyright (c) 2010-2012 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_filter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
+# Copyright (c) 2010-2012 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, tr8n.net
+# Copyright (c) 2010-2012 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
@@ -83,11 +83,11 @@ class Tr8n::TranslatorLog < ActiveRecord::Base
     html = action.to_s.gsub("_", " ")
     act = action.to_sym
     if [:got_blocked, :got_unblocked, :got_promoted, :got_demoted].include?(act)
-      html << " by " << user.name if user
+      html << " by " << Tr8n::Config.user_name(user) if user
       html << " (" << reason << ")" unless reason.blank?
     elsif [:got_new_level].include?(act)
       html << " " << reference unless reference.blank?
-      html << " from " << user.name if user
+      html << " from " << Tr8n::Config.user_name(user) if user
       html << " (" << reason << ")" unless reason.blank?
     elsif [:enabled_inline_translations, :disabled_inline_translations].include?(act)
       lang = Tr8n::Language.find_by_id(reference) unless reference.blank?

data/app/models/tr8n/translator_log_filter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
+# Copyright (c) 2010-2012 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, tr8n.net
+# Copyright (c) 2010-2012 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_filter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
+# Copyright (c) 2010-2012 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, tr8n.net
+# Copyright (c) 2010-2012 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_filter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
+# Copyright (c) 2010-2012 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, tr8n.net
+# Copyright (c) 2010-2012 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/clientsdk/index.html.erb

@@ -2,7 +2,9 @@
 
 <div class="section_title">
   <span style="font-size:12px; color:grey; float:right; padding-top:5px;">
-    <strong>Make sure that key source tracking is enabled!</strong> And try not to register useless phrases in production.
+    <% unless Tr8n::Config.enable_client_sdk? %>
+      <span style="color:red">Make sure that JS Client SDK is enabled!</span>
+    <% end %>
   </span> 
 	
   Tr8n JavaScript Client SDK Test Tool  
@@ -28,56 +30,48 @@
       </td>
       <td rowspan="3" style="width:15%; padding:2px; vertical-align:top;">
 			   <center>
-			   <div style="width:150px; text-align:center; padding-top:15px;">
-			     <%=link_to_function("<span>Translate Label</span>".html_safe, "translate();", :class => "tr8n_grey_button tr8n_pcb") %>
-
-	         <div style="margin-top:15px; padding:2px; text-align:center; border: 1px dotted #ccc;">
-              <%=link_to_function("<span>View Examples</span>".html_safe, "tr8nLightbox.show('/tr8n/admin/clientsdk/lb_samples', {height:550});", :class => "tr8n_grey_button tr8n_pcb", :style=>"width:200px;") %><br>
-              <%=link_to("<span>View Phrases</span>".html_safe, "/tr8n/phrases/index?section_key=clientsdk", :target => "_phrases", :class => "tr8n_grey_button tr8n_pcb", :style=>"width:200px;") %><br>
-              <%=link_to_function("<span>Load Translations</span>".html_safe, "reloadTranslations();", :class => "tr8n_grey_button tr8n_pcb", :style=>"width:200px;") %><br>
-              <%=link_to_function("<span>Clear Results</span>".html_safe, "clearResults();", :class => "tr8n_grey_button tr8n_pcb", :style=>"width:200px;") %><br>
-              <%=link_to_function("<span>Run Speed Test</span>".html_safe, "speedTest();", :class => "tr8n_grey_button tr8n_pcb", :style=>"width:200px;") %><br>
-	            <%=link_to("<span>Download SDK</span>".html_safe, "/tr8n/javascripts/tr8n_client_sdk.js", :class => "tr8n_grey_button tr8n_pcb", :style=>"width:200px;") %><br>
-	         </div> 
-
-				 </div>
+  			   <div style="width:150px; text-align:center; padding-top:15px;">
+             <button style="width:100%;" onClick="translate();return false;">Translate</button>
+             <button style="width:100%;" onClick="translate({skip_decorations:true});return false;">Translate Label</button>
+             <button style="width:100%;" onClick="searchPhrase();return false;">View Translation Key</button>
+             <br><br>
+             <button style="width:100%;" onClick="clearResults();return false;">Clear Results</button>
+             <button style="width:100%;" onClick="tr8nLightbox.show('/tr8n/admin/clientsdk/lb_samples', {height:500});return false;">View Examples</button>
+             <button style="width:100%;" onClick="reloadTranslations();return false;">Reload Translations</button>
+             <button style="width:100%;" onClick="tr8nProxy.logSettings();return false;">Print Settings</button>
+             <button style="width:100%;" onClick="tr8nProxy.logTranslations();return false;">Print Translation Cache</button>
+          </div> 
 				 </center>
       </td>
     </tr>
     <tr>
       <td colspan="2" style="padding:2px; background:#F1F4FA;">
         <div style="font-weight:bold;">Tokens JSON <span style='color:grey'>- provides values for tokens used in translation. (required, if data tokens are defined)</span></div>
-        <%=text_area_tag(:tokens, "{'count':5}", :style => "width:99%; height:40px;")%>     
+        <%=text_area_tag(:tokens, "{'count':5}", :style => "width:99%; height:50px;")%>     
       </td>
     </tr>
     <tr>
       <td colspan="2" style="padding:2px;">
         <div style="font-weight:bold; padding-top:10px;">Translation <span style='color:grey'>- translated label with substituted tokens</span></div>
         <div id="result_html" style="background:#F9F8F7; height:40px; overflow:auto; border:1px dotted #ccc; padding:10px;"></div>
-        <div style="font-weight:bold; padding-top:10px; color:grey;">Raw HTML:</div>
-        <%=text_area_tag(:result, "", :style => "width:99%; background:#F9F8F7;", :readonly => true)%>     
+        <div style="font-weight:bold; padding-top:10px;">Translation Raw HTML <span style='color:grey'>- translated label with substituted tokens</span></div>
+        <%=text_area_tag(:result, "", :style => "width:99%; background:#F9F8F7;height:50px; border:1px solid #ccc;", :readonly => true)%>     
       </td>
     </tr>
   </table>
 <% end %>
 </div>
 
-<div id="debugger" class="section_box colored" style="font-size:10px; border:1px solid black; height:230px; overflow:auto; padding: 2px;">
+<div id="tr8n_debugger" class="section_box colored" style="font-size:10px; height:350px; overflow:auto; margin: 10px;">
 </div>
 
-<%=tr8n_translations_js_tag(:sources => ["clientsdk_examples"], :id => :tr8n_clientsdk_translations) %>
-<%=tr8n_client_sdk_scripts_tag(
-    :default_source             => "clientsdk_examples",
-    :debugger_element_id        => "debugger",
-    :translations_element_id    => "tr8n_clientsdk_translations",
-    :scheduler_interval         =>  5000
-) %>
-            
 <script>
+  tr8nProxy.enableLogger();
+
   function clearResults() {
-		Tr8n.element('debugger').innerHTML = '';
 		Tr8n.element('result').value = '';
     Tr8n.element('result_html').innerHTML = '';
+    tr8nProxy.logger.clear();
 	}
 	
   function reloadTranslations() {
@@ -91,17 +85,23 @@
 		tr8nLightbox.hide();
 	}
 	
-  function translate() {
+  function translate(opts) {
+    opts = opts || {};
     var tokens = null;
     
     if (Tr8n.element('tokens').value != "") {
       tokens = eval("[" + Tr8n.value('tokens') + "]")[0];
     }
     
-    Tr8n.element('result').value = tr8nProxy.tr(Tr8n.value('label'), '', tokens);
+    Tr8n.element('result').value = tr(Tr8n.value('label'), '', tokens, opts);
     Tr8n.element('result_html').innerHTML = Tr8n.element('result').value;
   }
   
+  function searchPhrase() {
+    url = "/tr8n/phrases/index?search=" + encodeURI(Tr8n.value('label'));
+    window.open(url,'translation_key');
+  }
+
   function speedTest() {
 		var tokens = null;
 

data/app/views/tr8n/admin/clientsdk/lb_samples.html.erb

@@ -30,7 +30,7 @@
 		</div>
 
 		<%= form_tag("", :class => "tr8n") do %>
-			<div style="height:350px; overflow:auto;">
+			<div style="height:370px; overflow:auto;">
 			<table class="admin_table">
 				<tr>
 				<th>Label</th>

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

@@ -0,0 +1,22 @@
+<%
+  links = []
+  current_tab ||= ""
+  [ 
+		["Top Translators By Language", {:action => :index}],
+	].each do |link|
+      if controller.action_name == link.last[:action].to_s
+        current_tab = link.first if current_tab.blank?
+        links << link.first
+      else
+        links << link_to(link.first, link.last)
+      end 
+   end   
+%>
+
+<div class="section_title">
+  <span style="font-size:12px; float:right; padding-top:5px;">
+    <%=links.join(" | ")%>
+  </span>
+  <%=current_tab %>
+</div>
+