tr8n 3.2.1 → 3.2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tr8n (3.2.1)
+    tr8n (3.2.2)
       coffee-script
       kaminari
       rails (>= 3.1.0)

data/README.rdoc

@@ -1,16 +1,16 @@
 = Welcome to Tr8n Translation Engine
 
-Tr8n Translation Engine is a Rails Engine Plugin/Gem that provides a framework for crowd-sourced translation of any Rails based application. 
+Tr8n Translation Engine is a Rails Engine Plugin/Gem that provides a framework for crowd-sourced translations of your Rails application. 
 The power of the engine comes from its simple and friendly user interface that allows site users as well as professional translators to rapidly 
-translate the site into hundreds of languages. The flexible and robust rules engine that powers Tr8n allows for any combination of language 
-specific rules in any translatable sentence. Users can provide information on what sentences depend on gender rules, number rules or other rules configured for each language. 
-The language specific context and case rules can be registered and managed for any language in the advanced user interface. The engine 
-provides a set of powerful administration tools that allow admins to manage any aspect of the engine; enabling and disabling its features 
+translate the site into hundreds of languages. 
+
+The rules engine that powers Tr8n allows translators to indicate whether sentences depend on gender rules, number rules or other rules configured for each language. The language specific context and case rules can be registered and managed for any language in the advanced user interface. The engine 
+provides a set of powerful administration tools that allow admins to configure any aspect of the engine; enabling and disabling its features 
 and monitoring translation progress.
 
 http://img507.imageshack.us/img507/2876/tr8nlogo.png
 
-The Tr8n engine itself is based on a very robust and flexible pluggable architecture where rule types and the syntax of the "tr" tokens 
+The Tr8n engine is based on a robust and flexible pluggable architecture where rule types and even the syntax of the "tr" tokens 
 can be configured or extended for any application deployment.
 
 Tr8n translation engine has been successfully deployed by the following companies:
@@ -21,8 +21,18 @@ Yammer Inc, http://www.yammer.com
 
 You can visit their web sites and see how it is being used. If your company is using Tr8n, please let me know and you will be added to the list.
 
+
 = Documentation
 
+Please look through the following slides to get familiar with Tr8n concepts and features:
+
+http://wiki.tr8n.org/slides
+
+Once you are done, you can try out Tr8n features yourself by following the deployement instructions from one of the examples:
+
+https://github.com/tr8n
+
+
 Configuration Guide
 
 https://github.com/berk/tr8n/wiki/4.-Configuration-Instructions
@@ -31,9 +41,9 @@ Integration Guide
 
 https://github.com/berk/tr8n/wiki/5.-Integration-Instructions
 
-Label Internationalization
+Translation Markup Language (TML)
 
-https://github.com/berk/tr8n/wiki/6.-Tr8n-Syntax
+https://github.com/berk/tr8n/wiki/6.-Tr8n-Syntax-and-Translation-Markup-Language
 
 Rules Engine 
 
@@ -56,12 +66,8 @@ https://github.com/berk/tr8n/wiki/9.-Supported-Languages
 
 Add the following gems to your Gemfile: 
 
-  gem 'kaminari'
   gem 'will_filter', "~> 3.1.2" 
-  gem 'tr8n', "~> 3.1.1" 
-  gem 'sass'
-  gem 'coffee-script'
-
+  gem 'tr8n', "~> 3.2.1" 
 	
 And run:
 

data/app/controllers/tr8n/base_controller.rb

@@ -108,7 +108,11 @@ module Tr8n
     helper_method :tr8n_features_tabs
 
     def redirect_to_source
-      return redirect_to(params[:source_url]) unless params[:source_url].blank?
+      # Do not allow redirects to external websites
+      escaped_origin_host = Regexp.escape("#{request.protocol}#{request.host}")
+      if(!params[:source_url].blank? && params[:source_url] =~ /^#{escaped_origin_host}/)
+        return redirect_to(params[:source_url])
+      end
       return redirect_to(request.env['HTTP_REFERER']) unless request.env['HTTP_REFERER'].blank?
       redirect_to_site_default_url
     end

data/app/controllers/tr8n/language_controller.rb

@@ -209,7 +209,7 @@ module Tr8n
     def lists
       if request.post? 
         if params[:language_action] == "remove"
-          lu = Tr8n::LanguageUser.find(:first, :conditions => ["language_id = ? and user_id = ?", params[:language_id], tr8n_current_user.id])
+          lu = Tr8n::LanguageUser.find(:first, :conditions => ["language_id = ? and user_id = ?", params[:language_id].to_i, tr8n_current_user.id])
           lu.destroy
         end
       end
@@ -220,7 +220,7 @@ module Tr8n
     end
   
     def remove
-      lu = Tr8n::LanguageUser.find(:first, :conditions => ["language_id = ? and user_id = ?", params[:language_id], tr8n_current_user.id])
+      lu = Tr8n::LanguageUser.find(:first, :conditions => ["language_id = ? and user_id = ?", params[:language_id].to_i, tr8n_current_user.id])
       lu.destroy if lu
       redirect_to_source
     end

data/app/models/tr8n/base_filter.rb

@@ -20,11 +20,32 @@
 # 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::BaseFilter 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) 
+#
+#++
 
 require 'will_filter'
 
 class Tr8n::BaseFilter < WillFilter::Filter
 
+  attr_accessible :name, :data, :user, :user_id, :model_class_name
+
   def definition
     meta = super
     meta.keys.each do |key|

data/app/models/tr8n/daily_language_metric.rb

@@ -1,25 +1,49 @@
-#--
-# 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.
-#++
+#--
+# 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::DailyLanguageMetric Schema Information
+#
+# Table name: tr8n_language_metrics
+#
+#  id                      INTEGER         not null, primary key
+#  type                    varchar(255)    
+#  language_id             integer         not null
+#  metric_date             date            
+#  user_count              integer         default = 0
+#  translator_count        integer         default = 0
+#  translation_count       integer         default = 0
+#  key_count               integer         default = 0
+#  locked_key_count        integer         default = 0
+#  translated_key_count    integer         default = 0
+#  created_at              datetime        
+#  updated_at              datetime        
+#
+# Indexes
+#
+#  index_tr8n_language_metrics_on_created_at     (created_at) 
+#  index_tr8n_language_metrics_on_language_id    (language_id) 
+#
+#++
 
 class Tr8n::DailyLanguageMetric < Tr8n::LanguageMetric
 

data/app/models/tr8n/date_rule.rb

@@ -1,25 +1,44 @@
-#--
-# 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.
-#++
+#--
+# 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::DateRule Schema Information
+#
+# Table name: tr8n_language_rules
+#
+#  id               INTEGER         not null, primary key
+#  language_id      integer         not null
+#  translator_id    integer         
+#  type             varchar(255)    
+#  definition       text            
+#  created_at       datetime        
+#  updated_at       datetime        
+#
+# Indexes
+#
+#  index_tr8n_language_rules_on_language_id_and_translator_id    (language_id, translator_id) 
+#  index_tr8n_language_rules_on_language_id                      (language_id) 
+#
+#++
 
 class Tr8n::DateRule < Tr8n::LanguageRule
   

data/app/models/tr8n/gender_list_rule.rb

@@ -1,25 +1,44 @@
-#--
-# 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.
-#++
+#--
+# 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::GenderListRule Schema Information
+#
+# Table name: tr8n_language_rules
+#
+#  id               INTEGER         not null, primary key
+#  language_id      integer         not null
+#  translator_id    integer         
+#  type             varchar(255)    
+#  definition       text            
+#  created_at       datetime        
+#  updated_at       datetime        
+#
+# Indexes
+#
+#  index_tr8n_language_rules_on_language_id_and_translator_id    (language_id, translator_id) 
+#  index_tr8n_language_rules_on_language_id                      (language_id) 
+#
+#++
 
 class Tr8n::GenderListRule < Tr8n::LanguageRule
   

data/app/models/tr8n/gender_rule.rb

@@ -1,25 +1,44 @@
-#--
-# 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.
-#++
+#--
+# 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::GenderRule Schema Information
+#
+# Table name: tr8n_language_rules
+#
+#  id               INTEGER         not null, primary key
+#  language_id      integer         not null
+#  translator_id    integer         
+#  type             varchar(255)    
+#  definition       text            
+#  created_at       datetime        
+#  updated_at       datetime        
+#
+# Indexes
+#
+#  index_tr8n_language_rules_on_language_id_and_translator_id    (language_id, translator_id) 
+#  index_tr8n_language_rules_on_language_id                      (language_id) 
+#
+#++
 
 class Tr8n::GenderRule < Tr8n::LanguageRule
   

data/app/models/tr8n/glossary.rb

@@ -1,27 +1,44 @@
-#--
-# 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::Glossary < ActiveRecord::Base
-  set_table_name :tr8n_glossary
-  
-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::Glossary Schema Information
+#
+# Table name: tr8n_glossary
+#
+#  id             INTEGER         not null, primary key
+#  keyword        varchar(255)    
+#  description    text            
+#  created_at     datetime        
+#  updated_at     datetime        
+#
+# Indexes
+#
+#  index_tr8n_glossary_on_keyword    (keyword) 
+#
+#++
+
+class Tr8n::Glossary < ActiveRecord::Base
+  set_table_name :tr8n_glossary
+  attr_accessible :keyword, :description
+  
+end