From de27a602458b00f9ff004e2f008d0aa2233bae0d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 1 May 2008 11:25:36 +0000
Subject: [PATCH] Remove useless set_language calls (language is now defined
 application wide).

git-svn-id: http://redmine.rubyforge.org/svn/branches/work@1396 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 gloc-1.2.0/app/helpers/ifpdf_helper.rb    | 3 +--
 gloc-1.2.0/app/models/changeset.rb        | 2 +-
 gloc-1.2.0/app/models/query.rb            | 2 --
 gloc-1.2.0/app/views/issues/index.rfpdf   | 2 +-
 gloc-1.2.0/app/views/issues/show.rfpdf    | 2 +-
 gloc-1.2.0/app/views/projects/gantt.rfpdf | 2 +-
 6 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/gloc-1.2.0/app/helpers/ifpdf_helper.rb b/gloc-1.2.0/app/helpers/ifpdf_helper.rb
index 2cfca1929..dc6136e59 100644
--- a/gloc-1.2.0/app/helpers/ifpdf_helper.rb
+++ b/gloc-1.2.0/app/helpers/ifpdf_helper.rb
@@ -24,9 +24,8 @@ module IfpdfHelper
     include GLoc
     attr_accessor :footer_date
     
-    def initialize(lang)
+    def initialize(*args)
       super()
-      set_language_if_valid lang
       case current_language.to_s
       when 'ja'
         extend(PDF_Japanese)
diff --git a/gloc-1.2.0/app/models/changeset.rb b/gloc-1.2.0/app/models/changeset.rb
index 3e95ce111..8375a3407 100644
--- a/gloc-1.2.0/app/models/changeset.rb
+++ b/gloc-1.2.0/app/models/changeset.rb
@@ -96,7 +96,7 @@ class Changeset < ActiveRecord::Base
           if self.scmid && (! (csettext =~ /^r[0-9]+$/))
             csettext = "commit:\"#{self.scmid}\""
           end
-          journal = issue.init_journal(user, l(:text_status_changed_by_changeset, csettext))
+          journal = issue.init_journal(user, ll(Setting.default_language, :text_status_changed_by_changeset, csettext))
           issue.status = fix_status
           issue.done_ratio = done_ratio if done_ratio
           issue.save
diff --git a/gloc-1.2.0/app/models/query.rb b/gloc-1.2.0/app/models/query.rb
index d9a720812..28492866f 100644
--- a/gloc-1.2.0/app/models/query.rb
+++ b/gloc-1.2.0/app/models/query.rb
@@ -26,7 +26,6 @@ class QueryColumn
   end
   
   def caption
-    set_language_if_valid(User.current.language)
     l("field_#{name}")
   end
 end
@@ -113,7 +112,6 @@ class Query < ActiveRecord::Base
   def initialize(attributes = nil)
     super attributes
     self.filters ||= { 'status_id' => {:operator => "o", :values => [""]} }
-    set_language_if_valid(User.current.language)
   end
   
   def after_initialize
diff --git a/gloc-1.2.0/app/views/issues/index.rfpdf b/gloc-1.2.0/app/views/issues/index.rfpdf
index d5a8d3c31..ca3eeb247 100644
--- a/gloc-1.2.0/app/views/issues/index.rfpdf
+++ b/gloc-1.2.0/app/views/issues/index.rfpdf
@@ -1,4 +1,4 @@
-<%	pdf=IfpdfHelper::IFPDF.new(current_language)
+<%	pdf=IfpdfHelper::IFPDF.new
 	title = @project ? "#{@project.name} - #{l(:label_issue_plural)}" : "#{l(:label_issue_plural)}"
 	pdf.SetTitle(title)
 	pdf.AliasNbPages
diff --git a/gloc-1.2.0/app/views/issues/show.rfpdf b/gloc-1.2.0/app/views/issues/show.rfpdf
index 08f2cb92d..0272ff7b9 100644
--- a/gloc-1.2.0/app/views/issues/show.rfpdf
+++ b/gloc-1.2.0/app/views/issues/show.rfpdf
@@ -1,4 +1,4 @@
-<%	pdf=IfpdfHelper::IFPDF.new(current_language)
+<%	pdf=IfpdfHelper::IFPDF.new
 	pdf.SetTitle("#{@project.name} - ##{@issue.tracker.name} #{@issue.id}")
 	pdf.AliasNbPages
 	pdf.footer_date = format_date(Date.today)
diff --git a/gloc-1.2.0/app/views/projects/gantt.rfpdf b/gloc-1.2.0/app/views/projects/gantt.rfpdf
index a293906ba..dce1a5b45 100644
--- a/gloc-1.2.0/app/views/projects/gantt.rfpdf
+++ b/gloc-1.2.0/app/views/projects/gantt.rfpdf
@@ -1,5 +1,5 @@
 <%
-pdf=IfpdfHelper::IFPDF.new(current_language)
+pdf=IfpdfHelper::IFPDF.new
 pdf.SetTitle("#{@project.name} - #{l(:label_gantt)}")
 pdf.AliasNbPages
 pdf.footer_date = format_date(Date.today)