Support frozen_string_literal in lib/redmine/export/*.rb (#26561).

Contributed by Pavel Rosický.

git-svn-id: http://svn.redmine.org/redmine/trunk@17985 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/export/csv.rb b/lib/redmine/export/csv.rb
index d85b7925ae4ed6798ee02b8586484f8bcdde3566..9df6cf29cb192964403a0ecdc1e2368905978e78 100644 (file)
--- a/lib/redmine/export/csv.rb
+++ b/lib/redmine/export/csv.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 # Redmine - project management software
 # Copyright (C) 2006-2017  Jean-Philippe Lang
@@ -35,11 +35,12 @@ module Redmine
             col_sep = l(:general_csv_separator)
             encoding = Encoding.find(options[:encoding]) rescue Encoding.find(l(:general_csv_encoding))
 
-            str = ''.force_encoding(encoding)
-            if encoding == Encoding::UTF_8
-              # BOM
-              str = "\xEF\xBB\xBF".force_encoding(encoding)
-            end
+            str =
+              if encoding == Encoding::UTF_8
+                +"\xEF\xBB\xBF" # BOM
+              else
+                (+'').force_encoding(encoding)
+              end
 
             super(str, :col_sep => col_sep, :encoding => encoding, &block)
           end

diff --git a/lib/redmine/export/pdf/issues_pdf_helper.rb b/lib/redmine/export/pdf/issues_pdf_helper.rb
index 6113064c1e5ef5502b87d47507f4a771863cf4e6..14a20d74ee5fc1030dc52001403a2bd984b16f67 100644 (file)
--- a/lib/redmine/export/pdf/issues_pdf_helper.rb
+++ b/lib/redmine/export/pdf/issues_pdf_helper.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 # Redmine - project management software
 # Copyright (C) 2006-2017  Jean-Philippe Lang
@@ -305,7 +305,7 @@ module Redmine
             if query.grouped? &&
                  (group = query.group_by_column.group_value(issue)) != previous_group
               pdf.SetFontStyle('B',10)
-              group_label = group.blank? ? 'None' : group.to_s.dup
+              group_label = group.blank? ? +'None' : group.to_s.dup
               group_label << " (#{result_count_by_group[group]})"
               pdf.bookmark group_label, 0, -1
               pdf.RDMCell(table_width, row_height * 2, group_label, 'LR', 1, 'L')