tr8n 3.1.1 → 3.1.2

data/app/controllers/tr8n/awards_controller.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 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
@@ -21,21 +21,21 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-class Tr8n::AwardsController < Tr8n::BaseController
+module Tr8n
+  class AwardsController < Tr8n::BaseController
 
-  before_filter :validate_current_translator
+    before_filter :validate_current_translator
   
-  def index
-    params[:mode] = "all" if tr8n_current_language.default?
+    def index
+      if params[:mode] == "all"
+        @translator_metrics = Tr8n::TranslatorMetric.where("language_id is null").order("total_translations desc, total_votes desc").limit(25)
+      else
+        @translator_metrics = Tr8n::TranslatorMetric.where("language_id = ?", tr8n_current_language.id).order("total_translations desc, total_votes desc").limit(25)
+      end
     
-    if params[:mode] == "all"
-      @translator_metrics = Tr8n::TranslatorMetric.where("language_id is null").order("total_translations desc, total_votes desc").limit(25)
-    else
-      @translator_metrics = Tr8n::TranslatorMetric.where("language_id = ?", tr8n_current_language.id).order("total_translations desc, total_votes desc").limit(25)
+      @leaders = @translator_metrics[0..2]
+      @runners = (@translator_metrics.size > 3) ? @translator_metrics[3..-1] : []
     end
     
-    @leaders = @translator_metrics[0..2]
-    @runners = (@translator_metrics.size > 3) ? @translator_metrics[3..-1] : []
   end
-    
 end

data/app/controllers/tr8n/base_controller.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 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
@@ -21,186 +21,189 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-class Tr8n::BaseController < ApplicationController
+module Tr8n
+  class BaseController < ApplicationController
 
-  layout Tr8n::Config.site_info[:tr8n_layout]
+    layout Tr8n::Config.site_info[:tr8n_layout]
 
-  if Tr8n::Config.tr8n_helpers.any?
-    helper *Tr8n::Config.tr8n_helpers
-  end
+    if Tr8n::Config.tr8n_helpers.any?
+      helper *Tr8n::Config.tr8n_helpers
+    end
 
-  if Tr8n::Config.skip_before_filters.any?
-    skip_before_filter *Tr8n::Config.skip_before_filters
-  end
+    if Tr8n::Config.skip_before_filters.any?
+      skip_before_filter *Tr8n::Config.skip_before_filters
+    end
 
-  if Tr8n::Config.before_filters.any?
-    before_filter *Tr8n::Config.before_filters
-  end
+    if Tr8n::Config.before_filters.any?
+      before_filter *Tr8n::Config.before_filters
+    end
   
-  if Tr8n::Config.after_filters.any?
-    after_filter *Tr8n::Config.after_filters
-  end
+    if Tr8n::Config.after_filters.any?
+      after_filter *Tr8n::Config.after_filters
+    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_tr8n_enabled, :except => [:translate]
+    before_filter :validate_guest_user, :except => [:select, :switch, :translate, :table]
+    before_filter :validate_current_user, :except => [:translate]
   
-  layout Tr8n::Config.site_info[:tr8n_layout]
+    layout Tr8n::Config.site_info[:tr8n_layout]
 
-  def tr8n_current_user
-    Tr8n::Config.current_user
-  end
-  helper_method :tr8n_current_user
+    def tr8n_current_user
+      Tr8n::Config.current_user
+    end
+    helper_method :tr8n_current_user
 
-  def tr8n_current_language
-    Tr8n::Config.current_language
-  end
-  helper_method :tr8n_current_language
+    def tr8n_current_language
+      Tr8n::Config.current_language
+    end
+    helper_method :tr8n_current_language
 
-  def tr8n_default_language
-    Tr8n::Config.default_language
-  end
-  helper_method :tr8n_default_language
+    def tr8n_default_language
+      Tr8n::Config.default_language
+    end
+    helper_method :tr8n_default_language
 
-  def tr8n_current_translator
-    Tr8n::Config.current_translator
-  end
-  helper_method :tr8n_current_translator
+    def tr8n_current_translator
+      Tr8n::Config.current_translator
+    end
+    helper_method :tr8n_current_translator
   
-  def tr8n_current_user_is_admin?
-    Tr8n::Config.current_user_is_admin?
-  end
-  helper_method :tr8n_current_user_is_admin?
+    def tr8n_current_user_is_admin?
+      Tr8n::Config.current_user_is_admin?
+    end
+    helper_method :tr8n_current_user_is_admin?
   
-  def tr8n_current_user_is_translator?
-    Tr8n::Config.current_user_is_translator?
-  end
-  helper_method :tr8n_current_user_is_translator?
+    def tr8n_current_user_is_translator?
+      Tr8n::Config.current_user_is_translator?
+    end
+    helper_method :tr8n_current_user_is_translator?
 
-  def tr8n_current_user_is_manager?
-    return false unless Tr8n::Config.current_user_is_translator?
-    tr8n_current_translator.manager?
-  end
-  helper_method :tr8n_current_user_is_manager?
+    def tr8n_current_user_is_manager?
+      return true if Tr8n::Config.current_user_is_admin?
+      return false unless Tr8n::Config.current_user_is_translator?
+      tr8n_current_translator.manager?
+    end
+    helper_method :tr8n_current_user_is_manager?
   
-  def tr8n_current_user_is_guest?
-    Tr8n::Config.current_user_is_guest?
-  end
-  helper_method :tr8n_current_user_is_guest?
+    def tr8n_current_user_is_guest?
+      Tr8n::Config.current_user_is_guest?
+    end
+    helper_method :tr8n_current_user_is_guest?
   
-private
+  private
   
-  def tr8n_features_tabs
-    @tabs ||= begin 
-      tabs = Tr8n::Config.features.clone
-      unless Tr8n::Config.multiple_base_languages?
-        tabs = tabs.select{|tab| tab[:default_language]} if tr8n_current_language.default?
-      end
+    def tr8n_features_tabs
+      @tabs ||= begin 
+        tabs = Tr8n::Config.features.clone
+        unless Tr8n::Config.multiple_base_languages?
+          tabs = tabs.select{|tab| tab[:default_language]} if tr8n_current_language.default?
+        end
     
-      unless tr8n_current_user_is_translator? and tr8n_current_translator.manager?
-        tabs = tabs.select{|tab| !tab[:manager_only]}  
+        unless tr8n_current_user_is_translator? and tr8n_current_translator.manager?
+          tabs = tabs.select{|tab| !tab[:manager_only]}  
+        end
+        tabs
       end
-      tabs
     end
-  end
-  helper_method :tr8n_features_tabs
+    helper_method :tr8n_features_tabs
 
-  def redirect_to_source
-    return redirect_to(params[:source_url]) unless params[:source_url].blank?
-    return redirect_to(request.env['HTTP_REFERER']) unless request.env['HTTP_REFERER'].blank?
-    redirect_to_site_default_url
-  end
+    def redirect_to_source
+      return redirect_to(params[:source_url]) unless params[:source_url].blank?
+      return redirect_to(request.env['HTTP_REFERER']) unless request.env['HTTP_REFERER'].blank?
+      redirect_to_site_default_url
+    end
 
-  def redirect_to_site_default_url
-    redirect_to(Tr8n::Config.default_url)
-  end
+    def redirect_to_site_default_url
+      redirect_to(Tr8n::Config.default_url)
+    end
 
-  def page
-    params[:page] || 1
-  end
+    def page
+      params[:page] || 1
+    end
   
-  def per_page
-    params[:per_page] || 30
-  end
+    def per_page
+      params[:per_page] || 30
+    end
   
-  def sanitize_label(label)
-#  do not double escape    
-#  CGI::escapeHTML(label.strip)
-   ERB::Util.html_escape(label.strip)
-  end
+    def sanitize_label(label)
+  #  do not double escape    
+  #  CGI::escapeHTML(label.strip)
+     ERB::Util.html_escape(label.strip)
+    end
 
-  # handle disabled state for tr8n
-  def validate_tr8n_enabled
-    if Tr8n::Config.disabled?
-      trfe("You don't have rights to access that section.")
-      return redirect_to(Tr8n::Config.default_url)
+    # handle disabled state for tr8n
+    def validate_tr8n_enabled
+      if Tr8n::Config.disabled?
+        trfe("You don't have rights to access that section.")
+        return redirect_to(Tr8n::Config.default_url)
+      end
     end
-  end
 
-  # guest users can still switch between languages outside of the site
-  def validate_guest_user
-    if tr8n_current_user_is_guest?
-      trfe("You must be a registered user in order to access this section of the site.")
-      return redirect_to(Tr8n::Config.default_url)
+    # guest users can still switch between languages outside of the site
+    def validate_guest_user
+      if tr8n_current_user_is_guest?
+        trfe("You must be a registered user in order to access this section of the site.")
+        return redirect_to(Tr8n::Config.default_url)
+      end
     end
-  end
 
-  # 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? 
-      trfe("You don't have rights to access that section.")
-      return redirect_to(Tr8n::Config.default_url)
+    # 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? 
+        trfe("You don't have rights to access that section.")
+        return redirect_to(Tr8n::Config.default_url)
+      end
     end
-  end
 
-  # make sure that the current user is a translator
-  def validate_current_translator
-    if tr8n_current_user_is_translator? and tr8n_current_translator.blocked?
-      trfe("Your translation privileges have been revoked. Please contact the site administrator for more details.")
-      return redirect_to(Tr8n::Config.default_url)
+    # make sure that the current user is a translator
+    def validate_current_translator
+      if tr8n_current_user_is_translator? and tr8n_current_translator.blocked?
+        trfe("Your translation privileges have been revoked. Please contact the site administrator for more details.")
+        return redirect_to(Tr8n::Config.default_url)
+      end
     end
-  end
 
-  # make sure that the current user is a language manager
-  def validate_language_management
-    # admins can do everything
-    return if tr8n_current_user_is_admin?
+    # make sure that the current user is a language manager
+    def validate_language_management
+      # admins can do everything
+      return if tr8n_current_user_is_admin?
     
-    if tr8n_current_language.default?
-      trfe("Only administrators can modify this language")
-      return redirect_to(@tabs.first[:link])
-    end
+      if tr8n_current_language.default?
+        trfe("Only administrators can modify this language")
+        return redirect_to(@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])
+      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])
+      end
     end
-  end
   
-  def validate_default_language
-    return if Tr8n::Config.multiple_base_languages?
-    redirect_to(tr8n_features_tabs.first[:link]) if tr8n_current_language.default?
-  end
+    def validate_default_language
+      return if Tr8n::Config.multiple_base_languages?
+      redirect_to(tr8n_features_tabs.first[:link]) if tr8n_current_language.default?
+    end
   
-  def validate_language
-    return unless params[:language]
-    return if params[:language][:fallback_language_id].blank? # default
+    def validate_language
+      return unless params[:language]
+      return if params[:language][:fallback_language_id].blank? # default
     
-    fallback_language = Tr8n::Language.find(params[:language][:fallback_language_id])
+      fallback_language = Tr8n::Language.find(params[:language][:fallback_language_id])
     
-    while fallback_language do
-      if fallback_language == tr8n_current_language
-        return "You are creating an infinite loop with fallback languages. Please ensure that languages do not fall back onto each other."
+      while fallback_language do
+        if fallback_language == tr8n_current_language
+          return "You are creating an infinite loop with fallback languages. Please ensure that languages do not fall back onto each other."
+        end
+        fallback_language = fallback_language.fallback_language
       end
-      fallback_language = fallback_language.fallback_language
     end
-  end
     
-  def validate_admin
-    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
+    def validate_admin
+      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
+      end
     end
-  end
   
+  end
 end

data/app/controllers/tr8n/dashboard_controller.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 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
@@ -27,6 +27,7 @@ module Tr8n
     before_filter :validate_current_translator
   
     def index
+      
     end
     
   end

data/app/controllers/tr8n/forum_controller.rb

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

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 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
@@ -21,62 +21,60 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-class Tr8n::LanguageCasesController < Tr8n::BaseController
+module Tr8n
+  class LanguageCasesController < Tr8n::BaseController
 
-  before_filter :validate_current_translator
-  before_filter :validate_language_management, :only => [:index]
+    before_filter :validate_current_translator
+    before_filter :validate_language_management, :only => [:index]
     
-  # used by a client app
-  def index
-    conditions = ["language_id = ? and (reported is null or reported = ?)", tr8n_current_language.id, false]
-    
-    unless params[:search].blank?
-      conditions[0] << " and keyword like ?" 
-      conditions << "%#{params[:search]}%"
+    # used by a client app
+    def index
+      @maps = Tr8n::LanguageCaseValueMap.where("language_id = ? and (reported is null or reported = ?)", tr8n_current_language.id, false)
+      @maps = @maps.where("keyword like ?", "%#{params[:search]}%") unless params[:search].blank?
+      @maps = @maps.order("updated_at desc").page(page).per(per_page)
     end
-    
-    @maps = Tr8n::LanguageCaseValueMap.paginate(:per_page => per_page, :page => page, :conditions => conditions, :order => "updated_at desc")    
-  end
   
-  def manager
-    @lcase = Tr8n::LanguageCase.by_id(params[:case_id]) unless params[:case_id].blank?
-    @rule = Tr8n::LanguageCaseRule.by_id(params[:rule_id]) unless params[:rule_id].blank?
+    def manager
+      @lcase = Tr8n::LanguageCase.by_id(params[:case_id]) unless params[:case_id].blank?
+      @rule = Tr8n::LanguageCaseRule.by_id(params[:rule_id]) unless params[:rule_id].blank?
     
-    @map = Tr8n::LanguageCaseValueMap.by_language_and_keyword(tr8n_current_language, params[:case_key])
-    @map ||= Tr8n::LanguageCaseValueMap.new(:language => tr8n_current_language, :translator => tr8n_current_translator, :keyword => params[:case_key])
+      @map = Tr8n::LanguageCaseValueMap.by_language_and_keyword(tr8n_current_language, params[:case_key])
+      @map ||= Tr8n::LanguageCaseValueMap.new(:language => tr8n_current_language, :translator => tr8n_current_translator, :keyword => params[:case_key])
     
-    render :layout => false
-  end
+      render :layout => false
+    end
   
-  def switch_manager_mode
-    @map = Tr8n::LanguageCaseValueMap.by_language_and_keyword(tr8n_current_language, params[:map_keyword])
-    @map ||= Tr8n::LanguageCaseValueMap.new(:language => tr8n_current_language, :keyword => params[:case_key], :reported => false)
+    def switch_manager_mode
+      @map = Tr8n::LanguageCaseValueMap.by_language_and_keyword(tr8n_current_language, params[:map_keyword])
+      @map ||= Tr8n::LanguageCaseValueMap.new(:language => tr8n_current_language, :keyword => params[:case_key], :reported => false)
     
-    render :partial => params[:mode]
-  end
+      render :partial => params[:mode]
+    end
   
-  def update_value_map
-    map = Tr8n::LanguageCaseValueMap.find_by_id(params[:map_id]) unless params[:map_id].blank?
-    map ||= Tr8n::LanguageCaseValueMap.new(:language => tr8n_current_language, :reported => false)
-    map.keyword = params[:case_key]
-    map.map = params[:map][:map]
-    map.save_with_log!(tr8n_current_translator)
+    def update_value_map
+      map = Tr8n::LanguageCaseValueMap.find_by_id(params[:map_id]) unless params[:map_id].blank?
+      map ||= Tr8n::LanguageCaseValueMap.new(:language => tr8n_current_language, :reported => false)
+      map.keyword = params[:case_key]
+      map.map = params[:map][:map]
+      map.save_with_log!(tr8n_current_translator)
 
-    redirect_to_source
-  end
+      redirect_to_source
+    end
   
-  def delete_value_map
-    map = Tr8n::LanguageCaseValueMap.find_by_id(params[:map_id]) if params[:map_id]
-    map.destroy_with_log!(tr8n_current_translator) if map
+    def delete_value_map
+      map = Tr8n::LanguageCaseValueMap.find_by_id(params[:map_id]) if params[:map_id]
+      map.destroy_with_log!(tr8n_current_translator) if map
 
-    redirect_to_source
-  end
+      redirect_to_source
+    end
   
-  def report_value_map
-    map = Tr8n::LanguageCaseValueMap.find_by_id(params[:map_id]) unless params[:map_id].blank?
-    map.report_with_log!(tr8n_current_translator) if map
+    def report_value_map
+      map = Tr8n::LanguageCaseValueMap.find_by_id(params[:map_id]) unless params[:map_id].blank?
+      map.report_with_log!(tr8n_current_translator) if map
     
-    redirect_to_source
-  end
+      redirect_to_source
+    end
   
-end
+  end
+end
+