tr8n 3.1.8 → 3.2.0

data/app/assets/stylesheets/tr8n/layout.css.scss

@@ -49,7 +49,7 @@
   .page_body .main_col        {overflow:hidden;_overflow:visible;_zoom:1;}
   .page_body .left_col        {float:left; width:250px;_margin-right:-3px;}
   .page_body .right_col       {float:right; width: 300px;_margin-left:-3px;}
-
+  .content_inner              {padding:10px}
 
 /* Header */
 

data/app/assets/stylesheets/tr8n/tr8n.css.scss

@@ -442,3 +442,23 @@ body.tr8n_grey_disabled_button                  {background-position: left -300p
 body.tr8n_grey_disabled_button span             {background-position: right -626px; }
 
 .tr8n_cancel_link                               {font-size:12px;font-family:arial;}
+
+/****************************************/
+/*** Logger Objects
+/****************************************/
+.tr8n_logger_obj_key {
+  padding-right: 10px;
+  color: #444;
+}
+.tr8n_logger_obj_value_string {
+  color: green;
+}
+.tr8n_logger_obj_value_string {
+  color: green;
+}
+.tr8n_logger_obj_value_boolean {
+  color: blue;
+}
+.tr8n_logger_obj_value_number {
+  color: red;
+}

data/app/controllers/tr8n/admin/base_controller.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
@@ -50,12 +50,15 @@ private
         {"title" => "Translators", "description" => "Admin tab", "controller" => "translator"},
         {"title" => "Glossary", "description" => "Admin tab", "controller" => "glossary"},
         {"title" => "Forum", "description" => "Admin tab", "controller" => "forum"},
+        {"title" => "Metrics", "description" => "Metrics tab", "controller" => "metrics"},
         {"title" => "Client SDK", "description" => "Admin tab", "controller" => "clientsdk"}
     ]
   end
   helper_method :tr8n_admin_tabs
 
   def validate_admin
+    return if Tr8n::Config.env == 'development'
+
     unless tr8n_current_user_is_admin?
       trfe("You must be an admin in order to view this section of the site")
       redirect_to_site_default_url

data/app/controllers/tr8n/admin/clientsdk_controller.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/controllers/tr8n/admin/metrics_controller.rb

@@ -0,0 +1,30 @@
+#--
+# 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::Admin::MetricsController < Tr8n::Admin::BaseController
+
+  def index
+    @languages = Tr8n::Language.enabled_languages
+  end
+
+end

data/app/controllers/tr8n/api/v1/base_controller.rb

@@ -23,6 +23,18 @@
 
 class Tr8n::Api::V1::BaseController < ApplicationController
 
+  if Tr8n::Config.api_skip_before_filters.any?
+    skip_before_filter *Tr8n::Config.api_skip_before_filters
+  end
+
+  if Tr8n::Config.api_before_filters.any?
+    before_filter *Tr8n::Config.api_before_filters
+  end
+  
+  if Tr8n::Config.api_after_filters.any?
+    after_filter *Tr8n::Config.api_after_filters
+  end
+
 private
 
   def tr8n_current_user

data/app/controllers/tr8n/api/v1/language_controller.rb

@@ -40,10 +40,8 @@ class Tr8n::Api::V1::LanguageController < Tr8n::Api::V1::BaseController
   def translate
     return sanitize_api_response({"error" => "Api is disabled"}) unless Tr8n::Config.enable_api?
 
-#   return sanitize_api_response({"error" => "You must be logged in to use the api"}) if tr8n_current_user_is_guest?
-
     language = Tr8n::Language.for(params[:language]) || tr8n_current_language
-    source = CGI.unescape(params[:source]) || "API"
+    source = CGI.unescape(params[:source] || "API") 
     
     return sanitize_api_response(translate_phrase(language, params, {:source => source})) if params[:label]
     
@@ -51,7 +49,7 @@ class Tr8n::Api::V1::LanguageController < Tr8n::Api::V1::BaseController
     # {:source => "", :language => "", :phrases => [{:label => ""}]}
     
     # get all phrases for the specified source
-    if params[:batch] == "true"
+    if params[:batch] == "true" or params[:cache] == "true"
       if params[:sources].blank? and params[:source].blank?
         return sanitize_api_response({"error" => "No source/sources have been provided for the batch request."})
       end
@@ -73,6 +71,10 @@ class Tr8n::Api::V1::LanguageController < Tr8n::Api::V1::BaseController
         translations << trn 
       end
       
+      if params[:sdk_jsvar]
+        return render(:text => "#{params[:sdk_jsvar]}.updateTranslations(#{translations.to_json});", :content_type => "text/javascript")
+      end 
+      
       return sanitize_api_response({:phrases => translations})
     elsif params[:phrases]
       
@@ -92,7 +94,7 @@ class Tr8n::Api::V1::LanguageController < Tr8n::Api::V1::BaseController
       return sanitize_api_response({:phrases => translations})    
     end
     
-    sanitize_api_response({"error" => "Invalid API request. Please read the documentation and try again."})
+    sanitize_api_response(:phrases => {})
   rescue Tr8n::KeyRegistrationException => ex
     sanitize_api_response({"error" => ex.message})
   end

data/app/controllers/tr8n/awards_controller.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/controllers/tr8n/base_controller.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
@@ -43,8 +43,8 @@ module Tr8n
     end
   
     before_filter :validate_tr8n_enabled, :except => [:translate]
-    before_filter :validate_guest_user, :except => [:select, :switch, :translate, :table]
-    before_filter :validate_current_user, :except => [:translate]
+    before_filter :validate_guest_user, :except => [:select, :switch, :translate, :table, :registration]
+    before_filter :validate_current_user, :except => [:select, :switch, :translate, :table, :registration]
   
     layout Tr8n::Config.site_info[:tr8n_layout]
 
@@ -149,10 +149,16 @@ module Tr8n
 
     # make sure users have the rights to access this section
     def validate_current_user
-      unless Tr8n::Config.open_registration_mode? or Tr8n::Config.current_user_is_translator? 
+      return if Tr8n::Config.current_user_is_translator?
+
+      unless Tr8n::Config.open_registration_mode?
         trfe("You don't have rights to access that section.")
         return redirect_to(Tr8n::Config.default_url)
       end
+
+      if Tr8n::Config.enable_registration_disclaimer?
+        redirect_to("/tr8n/translator/registration")
+      end
     end
 
     # make sure that the current user is a translator
@@ -170,12 +176,12 @@ module Tr8n
     
       if tr8n_current_language.default?
         trfe("Only administrators can modify this language")
-        return redirect_to(@tabs.first[:link])
+        return redirect_to(tr8n_features_tabs.first[:link])
       end
 
       unless tr8n_current_user_is_translator? and tr8n_current_translator.manager? 
         trfe("In order to manage a language you first must request to become a manager of that language. Please send your request to Geni support.")
-        return redirect_to(@tabs.first[:link])
+        return redirect_to(tr8n_features_tabs.first[:link])
       end
     end
   

data/app/controllers/tr8n/dashboard_controller.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/controllers/tr8n/forum_controller.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/controllers/tr8n/glossary_controller.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/controllers/tr8n/help_controller.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/controllers/tr8n/phrases_controller.rb

@@ -41,7 +41,7 @@ class Tr8n::PhrasesController < Tr8n::BaseController
       end
     end
     
-    @translation_keys = @translation_keys.order("label asc").page(page).per(per_page)
+    @translation_keys = @translation_keys.order("created_at desc").page(page).per(per_page)
   end
   
   def view

data/app/controllers/tr8n/translator_controller.rb

@@ -23,6 +23,14 @@
 
 class Tr8n::TranslatorController < Tr8n::BaseController
 
+  def registration
+    if params[:agree] == "yes"
+      Tr8n::Config.current_translator # this will register a translator
+      trfn("Thank you! You have been register as a translator")
+      return redirect_to("/tr8n/phrases")
+    end
+  end
+
   def index
     @fallback_language = (tr8n_current_translator.fallback_language || tr8n_default_language)
   end

data/app/helpers/tr8n/admin/base_helper.rb

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

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

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# 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/base_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/daily_language_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/date_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/models/tr8n/gender_list_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/models/tr8n/gender_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/models/tr8n/glossary.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/glossary_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/integration/ru/russian_gender_list_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/models/tr8n/integration/ru/russian_numeric_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/models/tr8n/ip_location.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/ip_location_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/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
@@ -36,25 +36,33 @@ class Tr8n::Language < ActiveRecord::Base
   has_many :translation_key_locks,  :class_name => 'Tr8n::TranslationKeyLock',  :dependent => :destroy
   has_many :language_metrics,       :class_name => 'Tr8n::LanguageMetric'
   
-  def self.find_or_create(lcl, english_name)
-    find_by_locale(lcl) || create(:locale => lcl, :english_name => english_name) 
+  def self.cache_key(locale)
+    "language_#{locale}"
+  end
+
+  def cache_key
+    self.class.cache_key(locale)
   end
   
   def self.for(locale)
     return nil if locale.nil?
-    Tr8n::Cache.fetch("language_#{locale}") do 
+    Tr8n::Cache.fetch(cache_key(locale)) do 
       find_by_locale(locale)
     end
   end
 
+  def self.find_or_create(lcl, english_name)
+    find_by_locale(lcl) || create(:locale => lcl, :english_name => english_name) 
+  end
+
   def rules
-    Tr8n::Cache.fetch("language_rules_#{id}") do 
+    Tr8n::Cache.fetch("language_rules_#{locale}") do 
       language_rules
     end
   end
 
   def cases
-    Tr8n::Cache.fetch("language_cases_#{id}") do 
+    Tr8n::Cache.fetch("language_cases_#{locale}") do 
       language_cases
     end
   end
@@ -64,6 +72,7 @@ class Tr8n::Language < ActiveRecord::Base
     reset_language_cases!
   end
   
+  # reloads rules for the language from the yml file
   def reset_language_rules!
     rules.delete_all
     Tr8n::Config.language_rule_classes.each do |rule_class|
@@ -73,6 +82,7 @@ class Tr8n::Language < ActiveRecord::Base
     end
   end
   
+  # reloads language cases for the language from the yml file
   def reset_language_cases!
     cases.delete_all
     Tr8n::Config.default_language_cases_for(locale).each do |lcase|
@@ -308,7 +318,9 @@ class Tr8n::Language < ActiveRecord::Base
   end
   
   def update_cache
-    Tr8n::Cache.delete("language_#{locale}")
+    Tr8n::Cache.delete(cache_key)
+    Tr8n::Cache.delete("language_rules_#{locale}")
+    Tr8n::Cache.delete("language_cases_#{locale}")
     Tr8n::Cache.delete("featured_languages")
     Tr8n::Cache.delete("enabled_languages")
   end