tr8n 3.1.6 → 3.1.7

data/app/models/tr8n/translation.rb

@@ -90,7 +90,7 @@ class Tr8n::Translation < ActiveRecord::Base
     return nil if super_rules == nil
     return nil unless super_rules.class.name == 'Array'
     return nil if super_rules.size == 0
-        
+
     @loaded_rules ||= begin
       rulz = []
       super_rules.each do |rule|
@@ -118,43 +118,6 @@ class Tr8n::Translation < ActiveRecord::Base
     end
   end
 
-  # generates the hash without rule ids, but with full definitions
-  def rules_api_hash
-    @rules_api_hash ||= (rules || []).collect{|rule_hash| rule_hash[:rule].to_api_hash.merge(:token => rule_hash[:token])}
-  end
-
-  # serilaize translation to API hash to be used for synchronization
-  def to_api_hash
-    {:locale => language.locale, :label => label, :rank => rank, :rules => rules_api_hash}
-  end
-
-  # create translation from API hash for a specific key
-  def self.create_from_api_hash(tkey, translator, hash, opts = {})
-    return if hash[:label].blank? # don't add empty translations
-    lang = Tr8n::Language.for(hash[:locale])
-    return unless lang # don't add translations for an unsupported language
-
-    tkey.translations.each do |trn|
-      # if an identical translation exists, don't add it
-      return if trn.to_api_hash == hash
-    end
-    
-    # generate rules for the translation
-    rules = nil
-    
-    if hash[:rules].any?
-      hash[:rules].each do |rule_hash|
-        return unless rule_hash[:token] and rule_hash[:type] and rule_hash[:definition]
-        
-        rule = Tr8n::LanguageRule.for_definition(lang, translator, rule_hash[:type], rule_hash[:definition], opts)
-        return unless rule # if the rule has not been created, we should not even add the translation
-        rules << {:token => rule_hash[:token], :rule_id => rule.id}
-      end
-    end
-    
-    tkey.add_translation(hash[:label], rules, lang, translator)
-  end
-
   # deprecated - api_hash should be used instead
   def rules_definitions
     return nil if rules.nil? or rules.empty? 
@@ -257,9 +220,49 @@ class Tr8n::Translation < ActiveRecord::Base
   end
   
   ###############################################################
-  ## Search Related Stuff
+  ## Synchronization Methods
+  ###############################################################
+  # generates the hash without rule ids, but with full definitions
+  def rules_sync_hash
+    @rules_sync_hash ||= (rules || []).collect{|rule| rule[:rule].to_sync_hash(rule[:token])}
+  end
+
+  # serilaize translation to API hash to be used for synchronization
+  def to_sync_hash(include_translator = true)
+    hash = {"locale" => language.locale, "label" => label, "rank" => rank, "rules" => rules_sync_hash}
+    hash["translator_id"] = translator.remote_id if include_translator and translator and translator.remote_id
+    hash  
+  end
+
+  # create translation from API hash for a specific key
+  def self.create_from_sync_hash(tkey, translator, hash, opts = {})
+    # don't add empty translations
+    return if hash["label"].blank? 
+    
+    lang = Tr8n::Language.for(hash["locale"])
+    # don't add translations for an unsupported language
+    return unless lang 
+
+    # generate rules for the translation
+    rules = []
+    
+    if hash["rules"] and hash["rules"].any?
+      hash["rules"].each do |rule_hash|
+        rule = Tr8n::LanguageRule.create_from_sync_hash(lang, translator, rule_hash, opts)
+        pp rule
+        
+        return unless rule # if the rule has not been created, we should not even add the translation
+        rules << {:token => rule_hash["token"], :rule_id => rule.id}
+      end
+    end
+    
+    rules = nil if rules.empty?
+    tkey.add_translation(hash["label"], rules, lang, translator)
+  end
+    
+  ###############################################################
+  ## Search Methods
   ###############################################################
-  
   def self.filter_status_options
     [["all translations", "all"], 
      ["accepted translations", "accepted"], 

data/app/models/tr8n/translation_key.rb

@@ -68,6 +68,7 @@ class Tr8n::TranslationKey < ActiveRecord::Base
                           :locale => locale,
                           :level => level,
                           :admin => Tr8n::Config.block_options[:admin])
+
         unless options[:source].blank?
           # at the time of creation - mark the first source of the key
           Tr8n::TranslationKeySource.find_or_create(new_tkey, Tr8n::TranslationSource.find_or_create(options[:source], options[:url]))
@@ -218,8 +219,10 @@ class Tr8n::TranslationKey < ActiveRecord::Base
     
   def add_translation(label, rules = nil, language = Tr8n::Config.current_language, translator = Tr8n::Config.current_translator)
     raise Tr8n::Exception.new("The sentence contains dirty words") unless language.clean_sentence?(label)
-    translation = Tr8n::Translation.create(:translation_key => self, :language => language, 
-                                           :translator => translator, :label => label, :rules => rules)
+    pp rules
+    translation = Tr8n::Translation.create(:translation_key => self, :language => language, :translator => translator, :label => label, :rules => rules)
+    pp translation
+    
     translation.vote!(translator, 1)
     translation
   end
@@ -524,35 +527,62 @@ class Tr8n::TranslationKey < ActiveRecord::Base
     Tr8n::Cache.delete("translation_key_#{key}")
   end
 
-  def to_api_hash
+  ###############################################################
+  ## Synchronization Methods
+  ###############################################################
+  def mark_as_synced!
+    update_attributes(:synced_at => Time.now + 5.seconds)
+  end
+    
+  def to_sync_hash(default_translation_hashes = nil)
     { 
-      :key => self.key, 
-      :label => self.label, 
-      :description => self.description, 
-      :locale => (locale || Tr8n::Config.default_locale), 
-      :translations => translations_for(nil, Tr8n::Config.translation_threshold).collect{|t| t.to_api_hash}
+      "key" => self.key, 
+      "label" => self.label, 
+      "description" => self.description, 
+      "locale" => (locale || Tr8n::Config.default_locale), 
+      "translations" => default_translation_hashes || translations_for(nil, Tr8n::Config.translation_threshold).collect{|t| t.to_sync_hash}
     }
   end
 
+  def transations_sync_hashes
+    @transations_sync_hashes ||= translations.collect{|t| t.to_sync_hash(false)}
+  end
+    
   # create translation key from API hash
-  def self.create_from_api_hash(tkey_hash, translator, opts = {})
-    return if tkey_hash[:key].blank? or tkey_hash[:label].blank? or tkey_hash[:locale].blank?
+  def self.create_from_sync_hash(tkey_hash, translator, opts = {})
+    return if tkey_hash["key"].blank? or tkey_hash["label"].blank? or tkey_hash["locale"].blank?
      
-    tkey = Tr8n::TranslationKey.find_or_create(tkey_hash[:label], tkey_hash[:description])
+    tkey = Tr8n::TranslationKey.find_or_create(tkey_hash["label"], tkey_hash["description"])
 
     # return unless tkey.key==tkey_hash[:key] # need to warn the user that the key methods don't match
 
-    opts[:force_create] = Tr8n::Config.synchronization_create_rules? if opts[:force_create].nil?
+    # opts[:force_create] = Tr8n::Config.synchronization_create_rules? if opts[:force_create].nil?
+
+    remaining_translations = tkey.transations_sync_hashes.dup
+    # pp :before, remaining_sync_hashes
     
-    (tkey_hash[:translations] || []).each do |trn_hash|
-      Tr8n::Translation.create_from_api_hash(tkey, translator, trn_hash, opts)
+    added_trans = []
+    (tkey_hash["translations"] || []).each do |t_hash|
+      # if the translation came from a linked translator, use the translator
+      translation_translator = translator
+      if t_hash["translator_id"]
+        translation_translator = Tr8n::Translator.find_by_id(t_hash["translator_id"])
+        t_hash.delete("translator_id")
+        translation_translator ||= translator
+      end
+
+      remaining_translations.delete(t_hash)
+      next if tkey.transations_sync_hashes.include?(t_hash)
+      trans = Tr8n::Translation.create_from_sync_hash(tkey, translation_translator, t_hash, opts)
     end
 
-    tkey
+    # need to send back translations that have not been added, but exist in the system
+    # pp :after, remaining_sync_hashes
+    [tkey, remaining_translations]
   end
 
   ###############################################################
-  ## Feature Related Stuff
+  ## Feature Methods
   ###############################################################
   
   def self.title
@@ -580,7 +610,7 @@ class Tr8n::TranslationKey < ActiveRecord::Base
   end
 
   ###############################################################
-  ## Search Related Stuff
+  ## Search Methods
   ###############################################################
   
   def self.filter_phrase_type_options
@@ -641,6 +671,6 @@ class Tr8n::TranslationKey < ActiveRecord::Base
       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
     
-    results
+    results.order("created_at desc")
   end    
 end

data/config/routes.rb

@@ -43,5 +43,5 @@ Tr8n::Engine.routes.draw do
     end
   end
   
-  root :to => "home#index"
+  root :to => "dashboard#index"
 end

data/lib/generators/tr8n/templates/config/tr8n/config.yml

@@ -265,8 +265,8 @@ defaults:
   #############################################################################
   synchronization:
     server:                   "http://tr8n.net"  # alternative, regional locations will be available in the future
-    key:                      "iKjOrZjor68a4UeCD3Cq2r9t9ibBC4HnYoMNMrN7" # replace this with your key
-    secret:                   "iKjOrZjor68a4UeCD3Cq2r9t9ibBC4HnYoMNMrN7" # replace this with your secret   
+    key:                      "YOUR APP KEY"     # replace this with your key
+    secret:                   "YOUR APP SECRET"  # replace this with your secret   
     batch_size:               50     # how many kesy to send to the server at a time
     create_rules:             true   # force rules creation, or skip translations for rules that don't exist
     all_languages:            false  # use only enabled languages, or all languages

data/lib/generators/tr8n/templates/layouts/tr8n.html.erb

@@ -11,6 +11,9 @@
 			<div class="page_head">
 			  <div class="page_fixed">
 			    <div class="mrgn_h">
+				    <ul class="flt_r horiz_list top_nav">
+			        <li><%= tr8n_language_selector_tag(:lightbox=>false) %></li>
+			  		</ul>
 			      <h1 class="logo"><%=tr("Tr8n Translation Engine", "Application title")%></h1>
 			    </div>
 			  </div>
@@ -37,7 +40,7 @@
 				    <li><%=link_to(tr("Credits"), "/tr8n/help/credits", :class => "quiet")%></li>
 				    <li><%=link_to(tr("License"), "/tr8n/help/license", :class => "quiet")%></li>
 				  </ul>
-				  &copy; Copyright 2010 - 2011 tr8n.net
+				  &copy; Copyright 2010 - 2012 tr8n.net
 				</div>
 
 				<div style="padding:15px;">

data/lib/generators/tr8n/templates/layouts/tr8n_admin.html.erb

@@ -23,8 +23,10 @@
 			<div class="page_head">
 			  <div class="page_fixed">
 			    <div class="mrgn_h">
-			    	<%= tr8n_translator_login_tag(:class => "flt_r horiz_list top_nav") %>
-			      <h1 class="logo"><%=link_to(tr("Tr8n Translation Engine", "Application title"), {:controller => "/tr8n/home"}, :style=>"text-decorations:none;")%></h1>
+				    <ul class="flt_r horiz_list top_nav">
+			        <li><%= tr8n_language_selector_tag(:lightbox=>false) %></li>
+			  		</ul>
+			      <h1 class="logo"><%=link_to(tr("Tr8n Translation Engine", "Application title"), "/", :style=>"text-decorations:none;")%></h1>
 			    </div>
 			  </div>
 			</div>
@@ -49,7 +51,7 @@
 				    <li><%=link_to(tr("Credits"), "/tr8n/help/credits", :class => "quiet")%></li>
 				    <li><%=link_to(tr("License"), "/tr8n/help/license", :class => "quiet")%></li>
 				  </ul>
-				  &copy; Copyright 2010 - 2011 tr8n.net
+				  &copy; Copyright 2010 - 2012 tr8n.net
 				</div>
 
 				<div style="padding:15px;">

data/lib/generators/tr8n/tr8n_generator.rb

@@ -45,7 +45,7 @@ class Tr8nGenerator < Rails::Generators::Base
   end
   
   def copy_configuration
-    config_source = File.expand_path("#{self.class.source_root}/config', __FILE__)
+    config_source = File.expand_path("#{self.class.source_root}/config/tr8n", __FILE__)
     system "rsync -ruv #{config_source} #{Rails.root}/config"
   end
   

data/lib/tasks/tr8n.rake

@@ -85,8 +85,10 @@ namespace :tr8n do
     Tr8n::IpLocation.import_from_file('config/tr8n/data/ip_locations.csv', :verbose => true)
   end
   
-  desc "Downloads translations from tr8n.net"
+  desc "Synchronize translations with tr8n.net"
   task :sync => :environment do
-    Tr8n::SyncLog.sync
+    opts = {}
+    opts[:force] = true if ENV["force"] == "true"
+    Tr8n::SyncLog.sync(opts)
   end
 end

data/lib/tr8n/config.rb

@@ -532,7 +532,7 @@ module Tr8n
 
     def self.language_rule_dependencies
       @language_rule_dependencies ||= begin
-        depts = {}
+        depts = HashWithIndifferentAccess.new
         language_rule_classes.each do |cls|
           if depts[cls.dependency]
             raise Tr8n::Exception.new("The same dependency key #{cls.dependency} has been registered for multiple rules. This is not allowed.")

data/lib/tr8n/version.rb

@@ -1,3 +1,3 @@
 module Tr8n
-  VERSION = "3.1.6"
+  VERSION = "3.1.7"
 end

data/local/tr8n_server/app/assets/stylesheets/admin.css.scss

@@ -0,0 +1,200 @@
+/****************************************/
+/*** Classes for the admin user page
+/****************************************/
+@mixin rounded-corners($radius) {
+  border-radius: $radius;
+  -moz-border-radius: $radius;
+  -webkit-border-radius: $radius;
+}
+
+@mixin shadow($info) {
+	box-shadow:$info;
+	-moz-box-shadow:$info;
+	-webkit-box-shadow:$info;
+}
+
+@import "layout.css.scss";
+@import "components.css.scss";
+
+.pagination {
+	text-align:left !important;
+}
+
+.admin_table {
+  width: 100%;
+  font-size: 12px;
+  border: 1px #e5e5e5 solid;
+  border-collapse: collapse;
+  background-color: white;
+  margin-bottom: 10px;
+}
+
+.admin_table th {
+  background-color: #efefef;
+  border: none;
+  border: 1px #e5e5e5 solid;
+  font-weight:bold;
+}
+
+.admin_table tr:hover {
+  background-color: #eee;
+}
+
+.admin_table td {
+  padding: 5px;
+  border: 1px solid #e5e5e5;
+}
+
+.admin_table td.numeric,
+.admin_table th.numeric {
+  text-align: right;
+}
+
+.admin_table span.description {
+  color: #aaaaaa;
+  font-weight: normal;
+  font-size: 11px;
+}
+
+.admin_table td.key {
+  vertical-align:top;
+  width: 33%;
+  color: #666666;
+  font-weight: bold;
+  text-align: right;
+  padding-left: 10px;
+}
+
+.admin_table td.value {
+  vertical-align:top;
+}
+
+.admin_table td.value ul {
+  margin-top:0px;
+  margin-left:1.5em;
+}
+
+.admin_table td.value li {
+  line-height:1em;
+  margin-top:8px;
+  margin-left:0;
+  text-indent:-0.25em;
+}
+
+.admin_table td.value .detail {
+  font-size:11px;
+  color:#666;
+}
+
+.admin_table td .action_link {
+  float:right;
+  font-size:11px;
+}
+
+.admin_table p.status {
+  font-weight:bold;
+}
+
+.admin_table p.closed {
+  color:Red;
+}
+
+.admin_table p.claimed {
+  color:Green;
+}
+
+.admin_table .obscured {
+  background-color:Black;
+  padding:2px 6px;
+}
+
+.admin_table .obscured:hover {
+  background-color:#eee;
+}
+
+.admin_actions {
+  width: 100%;
+  background-color: #fffeee;
+  border: 1px #e5e5e5 solid;
+  margin-bottom: 10px;
+}
+
+.admin_actions th {
+  border: 1px #e5e5e5 solid;
+  font-weight:bold;
+}
+
+.admin_actions td {
+  padding: 5px;
+}
+
+.admin_actions td a {
+  text-decoration: none;
+  display:block;
+  display:inline-block;
+  width: 100%;
+}
+
+.admin_actions td a:hover {
+  text-decoration: underline;
+}
+
+.admin_table .expand_link {
+  float:right;
+}
+
+.admin_footer_edit {font-size:11px;margin-left:10px;margin-bottom:10px;font-weight:normal;height:20px;padding:5px;background-color:#feffef;border:solid 1px #e4e3c9;}
+
+#subtabs {
+  margin-bottom: 1em;
+}
+
+#date_container {
+  margin-bottom: 1em;
+  font-weight: bold;
+}
+
+#totals {
+  border: 2px solid #ccc;
+  font-size: 24px;
+  font-weight: bold;
+}
+
+#totals td, th {
+  padding: 5px;
+  border: 1px solid #999;
+}
+
+.hourly.breakdown th {
+  text-align: center;
+}
+
+a {
+  text-decoration: none;
+}
+
+a:hover {
+  text-decoration: underline;
+}
+
+.admin_menu_item {
+  padding-left:15px;
+  padding-bottom:3px;
+  text-align:left;
+  width:90%;
+  border-right:1px solid #ccc;
+}
+
+.admin_menu_item_selected {
+  padding-left:15px;
+  text-align:left;
+  width:90%;
+  border-top:1px solid #ccc;
+  border-bottom:1px solid #ccc;
+  border-left:1px solid #ccc;
+  border-right:0px;
+}
+
+.admin_menu_item_selected a {
+  color:black;
+}