tr8n 3.2.1 → 3.2.2

data/app/models/tr8n/translation_key.rb

@@ -20,11 +20,38 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
+#
+#-- Tr8n::TranslationKey Schema Information
+#
+# Table name: tr8n_translation_keys
+#
+#  id                   INTEGER         not null, primary key
+#  type                 varchar(255)    
+#  key                  varchar(255)    not null
+#  label                text            not null
+#  description          text            
+#  verified_at          datetime        
+#  translation_count    integer         
+#  admin                boolean         
+#  locale               varchar(255)    
+#  level                integer         default = 0
+#  created_at           datetime        
+#  updated_at           datetime        
+#  synced_at            datetime        
+#
+# Indexes
+#
+#  index_tr8n_translation_keys_on_key    (key) UNIQUE
+#
+#++
 
 require 'digest/md5'
 
 class Tr8n::TranslationKey < ActiveRecord::Base
   set_table_name :tr8n_translation_keys
+
+  attr_accessible :key, :label, :description, :verified_at, :translation_count, :admin, :locale, :level, :synced_at
+
   after_save      :clear_cache
   after_destroy   :clear_cache
   
@@ -77,13 +104,9 @@ class Tr8n::TranslationKey < ActiveRecord::Base
                               :level => level,
                               :admin => Tr8n::Config.block_options[:admin])
 
-      # for backwards compatibility only
       mark_as_admin(existing_key, options)
       update_default_locale(existing_key, options)
-      
-      # mark each key as verified - but only if caching is enabled
-      # verification is used to cleanup unused keys
-      existing_key.update_attributes(:verified_at => Time.now) if Tr8n::Config.enable_caching?
+      verify_key(existing_key, options)
       existing_key
     end
     
@@ -107,6 +130,14 @@ class Tr8n::TranslationKey < ActiveRecord::Base
     tkey.update_attributes(:locale => key_locale)
   end
 
+  # mark each key as verified - but only if caching is enabled
+  # verification is used to cleanup unused keys
+  def self.verify_key(tkey, options)
+    return unless Tr8n::Config.enable_key_verification?
+    existing_key.update_attributes(:verified_at => Time.now)
+
+  end
+
   # creates associations between the translation keys and sources
   # used for the site map and javascript support
   def self.track_source(translation_key, options = {})
@@ -135,9 +166,8 @@ class Tr8n::TranslationKey < ActiveRecord::Base
       options[:caller_key] = generate_key(options[:caller_key])
       translation_key_source.update_details!(options)
     end
-
   end
-  
+
   def self.generate_key(label, desc = "")
     "#{Digest::MD5.hexdigest("#{label};;;#{desc}")}~"[0..-2]
   end
@@ -553,6 +583,12 @@ class Tr8n::TranslationKey < ActiveRecord::Base
       map
     end
   end
+
+  def touch_sources
+    sources.each do |source|
+      source.touch
+    end
+  end
   
   def touch_sources
     sources.each do |source|
@@ -561,7 +597,7 @@ class Tr8n::TranslationKey < ActiveRecord::Base
   end
 
   def clear_cache
-    Tr8n::Cache.delete(cache_key)
+    # Tr8n::Cache.delete(cache_key)
     touch_sources
   end
 

data/app/models/tr8n/translation_key_comment.rb

@@ -1,37 +1,60 @@
-#--
-# 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
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
-
-class Tr8n::TranslationKeyComment < ActiveRecord::Base
-  set_table_name :tr8n_translation_key_comments
-  
-  belongs_to :language,               :class_name => "Tr8n::Language"  
-  belongs_to :translator,             :class_name => "Tr8n::Translator"  
-  belongs_to :translation_key,        :class_name => "Tr8n::TranslationKey"
-  
-  alias :key :translation_key
-
-  def toHTML
-    return "" unless message
-    message.gsub("\n", "<br>")
-  end
-end
+#--
+# 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
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+#
+#-- Tr8n::TranslationKeyComment Schema Information
+#
+# Table name: tr8n_translation_key_comments
+#
+#  id                    INTEGER     not null, primary key
+#  language_id           integer     not null
+#  translation_key_id    integer     not null
+#  translator_id         integer     not null
+#  message               text        not null
+#  created_at            datetime    
+#  updated_at            datetime    
+#
+# Indexes
+#
+#  tr8n_tkey_msgs_lang_id_tkey_id    (language_id, translation_key_id) 
+#  tr8n_tkey_msgs_translator_id      (translator_id) 
+#  tr8n_tkey_msgs_lang_id            (language_id) 
+#
+#++
+
+class Tr8n::TranslationKeyComment < ActiveRecord::Base
+  set_table_name :tr8n_translation_key_comments
+  
+  attr_accessible :language_id, :translation_key_id, :translator_id, :message
+  attr_accessible :language, :translator, :translation_key
+  
+  belongs_to :language,               :class_name => "Tr8n::Language"  
+  belongs_to :translator,             :class_name => "Tr8n::Translator"  
+  belongs_to :translation_key,        :class_name => "Tr8n::TranslationKey"
+  
+  alias :key :translation_key
+
+  def toHTML
+    return "" unless message
+    message.gsub("\n", "<br>")
+  end
+end

data/app/models/tr8n/translation_key_comment_filter.rb

@@ -1,30 +1,53 @@
-#--
-# 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
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
-
-class Tr8n::TranslationKeyCommentFilter < Tr8n::BaseFilter
-
-  def inner_joins
-    [:language, :translation_key, :translator]
-  end
-
-end
+#--
+# 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
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+#
+#-- Tr8n::TranslationKeyCommentFilter Schema Information
+#
+# Table name: will_filter_filters
+#
+#  id                  INTEGER         not null, primary key
+#  type                varchar(255)    
+#  name                varchar(255)    
+#  data                text            
+#  user_id             integer         
+#  model_class_name    varchar(255)    
+#  created_at          datetime        
+#  updated_at          datetime        
+#
+# Indexes
+#
+#  index_will_filter_filters_on_user_id    (user_id) 
+#
+#++
+
+class Tr8n::TranslationKeyCommentFilter < Tr8n::BaseFilter
+
+  def model_class
+    Tr8n::TranslationKeyComment
+  end
+
+  def inner_joins
+    [:language, :translation_key, :translator]
+  end
+
+end

data/app/models/tr8n/translation_key_filter.rb

@@ -1,45 +1,68 @@
-#--
-# 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
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
-
-class Tr8n::TranslationKeyFilter < Tr8n::BaseFilter
-  
-  def default_filters
-    super + [
-      ["Verified Keys", "verified"],
-      ["Unverified Keys", "unverified"]
-    ]
-  end
-
-  def default_filter_conditions(key)
-    super_conditions = super(key)
-    return super_conditions if super_conditions
-
-    case key
-      when "verified"
-        return [:verified_at, :is_provided]
-      when "unverified"
-        return [:verified_at, :is_not_provided]
-    end
-  end
-  
-end
+#--
+# 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
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+#
+#-- Tr8n::TranslationKeyFilter Schema Information
+#
+# Table name: will_filter_filters
+#
+#  id                  INTEGER         not null, primary key
+#  type                varchar(255)    
+#  name                varchar(255)    
+#  data                text            
+#  user_id             integer         
+#  model_class_name    varchar(255)    
+#  created_at          datetime        
+#  updated_at          datetime        
+#
+# Indexes
+#
+#  index_will_filter_filters_on_user_id    (user_id) 
+#
+#++
+
+class Tr8n::TranslationKeyFilter < Tr8n::BaseFilter
+  
+  def model_class
+    Tr8n::TranslationKey
+  end
+
+  def default_filters
+    super + [
+      ["Verified Keys", "verified"],
+      ["Unverified Keys", "unverified"]
+    ]
+  end
+
+  def default_filter_conditions(key)
+    super_conditions = super(key)
+    return super_conditions if super_conditions
+
+    case key
+      when "verified"
+        return [:verified_at, :is_provided]
+      when "unverified"
+        return [:verified_at, :is_not_provided]
+    end
+  end
+  
+end

data/app/models/tr8n/translation_key_lock.rb

@@ -1,59 +1,81 @@
-#--
-# 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
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
-
-class Tr8n::TranslationKeyLock < ActiveRecord::Base
-  set_table_name :tr8n_translation_key_locks
-  after_save      :clear_cache
-  after_destroy   :clear_cache
-
-  belongs_to :translation_key,  :class_name => "Tr8n::TranslationKey"
-  belongs_to :language,         :class_name => "Tr8n::Language"
-  belongs_to :translator,       :class_name => "Tr8n::Translator"
-
-  alias :key :translation_key
-  
-  def self.find_or_create(translation_key, language)
-    lock = where("translation_key_id = ? and language_id = ?", translation_key.id, language.id).first
-    lock || create(:translation_key => translation_key, :language => language)
-  end
-
-  def self.for(translation_key, language)
-    Tr8n::Cache.fetch("translation_key_lock_#{language.locale}_#{translation_key.key}") do 
-      find_or_create(translation_key, language)
-    end
-  end
-
-  def lock!(translator = Tr8n::Config.current_translator)
-    update_attributes(:locked => true, :translator => translator)
-    translator.locked_translation_key!(translation_key, language)
-  end
-
-  def unlock!(translator = Tr8n::Config.current_translator)
-    update_attributes(:locked => false, :translator => translator)
-    translator.unlocked_translation_key!(translation_key, language)
-  end
-  
-  def clear_cache
-    Tr8n::Cache.delete("translation_key_lock_#{language.locale}_#{translation_key.key}")
-  end
-end
+#--
+# 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
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+#
+#-- Tr8n::TranslationKeyLock Schema Information
+#
+# Table name: tr8n_translation_key_locks
+#
+#  id                    INTEGER     not null, primary key
+#  translation_key_id    integer     not null
+#  language_id           integer     not null
+#  translator_id         integer     
+#  locked                boolean     
+#  created_at            datetime    
+#  updated_at            datetime    
+#
+# Indexes
+#
+#  tr8n_locks_key_id_lang_id    (translation_key_id, language_id) 
+#
+#++
+
+class Tr8n::TranslationKeyLock < ActiveRecord::Base
+  set_table_name :tr8n_translation_key_locks
+  
+  attr_accessible :translation_key_id, :language_id, :translator_id, :locked
+  attr_accessible :language, :translator, :translation_key
+
+  after_save      :clear_cache
+  after_destroy   :clear_cache
+
+  belongs_to :translation_key,  :class_name => "Tr8n::TranslationKey"
+  belongs_to :language,         :class_name => "Tr8n::Language"
+  belongs_to :translator,       :class_name => "Tr8n::Translator"
+
+  alias :key :translation_key
+  
+  def self.find_or_create(translation_key, language)
+    lock = where("translation_key_id = ? and language_id = ?", translation_key.id, language.id).first
+    lock || create(:translation_key => translation_key, :language => language)
+  end
+
+  def self.for(translation_key, language)
+    Tr8n::Cache.fetch("translation_key_lock_#{language.locale}_#{translation_key.key}") do 
+      find_or_create(translation_key, language)
+    end
+  end
+
+  def lock!(translator = Tr8n::Config.current_translator)
+    update_attributes(:locked => true, :translator => translator)
+    translator.locked_translation_key!(translation_key, language)
+  end
+
+  def unlock!(translator = Tr8n::Config.current_translator)
+    update_attributes(:locked => false, :translator => translator)
+    translator.unlocked_translation_key!(translation_key, language)
+  end
+  
+  def clear_cache
+    Tr8n::Cache.delete("translation_key_lock_#{language.locale}_#{translation_key.key}")
+  end
+end