Upgraded to Rails 2.3.4 (#3597)

* Ran the Rails upgrade
* Upgraded to Rails Engines 2.3.2
* Added a plugin to let Engines override application views.
* Converted tests to use the new classes:
** ActionController::TestCase for functional
** ActiveSupport::TestCase for units
* Converted ActiveRecord::Error message to a string.
* ActiveRecord grouping returns an ordered hash which doesn't have #sort!
* Updated the I18n storage_units format.
* Added some default initializers from a fresh rails app
* Changed the order of check_box_tags and hidden_field_tags.  The hidden tag
  needs to appear first in Rails 2.3, otherwise it will override any value in
  the check_box_tag.
* Removed the custom handler for when the cookie store is tampered with.
  Rails 2.3 removed the TamperedWithCookie exception and instead Rails will not
  load the data from it when it's been tampered with (e.g. no user login).
* Fixed mail layouts, 2.3 has problems with implicit multipart emails that
  use layouts.  Also removed some custom Redmine mailer code.
* Fixed a bug that occurred in tests where the "required" span tag would be
  added to the :field_status translation.  This resulted in an email string of:

    <li>Status<span class="required"> *</span><span class="required"> *</span>

  Instead of:

    <li>Status: New</li>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2887 e93f8b46-1217-0410-a6f0-8f06a7374b81

40 files changed, 426 insertions, 23 deletions

diff --git a/config/boot.rb b/config/boot.rb
index 67cc517f2..dd5e3b691 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,7 +1,7 @@
 # Don't change this file!
 # Configure your app in config/environment.rb and config/environments/*.rb
 
-RAILS_ROOT = File.expand_path("#{File.dirname(__FILE__)}/..") unless defined?(RAILS_ROOT)
+RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
 
 module Rails
   class << self
@@ -44,6 +44,7 @@ module Rails
     def load_initializer
       require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
       Rails::Initializer.run(:install_gem_spec_stubs)
+      Rails::GemDependency.add_frozen_gem_path
     end
   end
 
@@ -81,8 +82,8 @@ module Rails
       end
 
       def load_rubygems
+        min_version = '1.3.2'
         require 'rubygems'
-        min_version = '1.3.1'
         unless rubygems_version >= min_version
           $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
           exit 1
diff --git a/config/environment.rb b/config/environment.rb
index f98968bcb..d173db412 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb
index f4ae06cd6..94d40faaf 100644
--- a/config/initializers/10-patches.rb
+++ b/config/initializers/10-patches.rb
@@ -33,7 +33,7 @@ module ActiveRecord
             end
           else
             attr_name = @base.class.human_attribute_name(attr)
-            full_messages << attr_name + ' ' + message
+            full_messages << attr_name + ' ' + message.to_s
           end
         end
       end
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
new file mode 100644
index 000000000..c2169ed01
--- /dev/null
+++ b/config/initializers/backtrace_silencers.rb
@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying do debug a problem that might steem from framework code.
+# Rails.backtrace_cleaner.remove_silencers!
\ No newline at end of file
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
new file mode 100644
index 000000000..d531b8bb8
--- /dev/null
+++ b/config/initializers/inflections.rb
@@ -0,0 +1,10 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format 
+# (all these examples are active by default):
+# ActiveSupport::Inflector.inflections do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index e83c5d893..a66a86bf3 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -59,6 +59,22 @@ bg:
       over_x_years:
         one:   "over 1 year"
         other: "over {{count}} years"
+
+  number: 
+    human: 
+      format: 
+        precision: 1
+        delimiter: ""
+      storage_units: 
+        format: "%n %u"
+        units: 
+          kb: KB
+          tb: TB
+          gb: GB
+          byte: 
+            one: Byte
+            other: Bytes
+          mb: 'MB'
       
 # Used in array.to_sentence.
   support:
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index c03b5aecc..0a5536bdc 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -83,9 +83,16 @@ bs:
       format:
         delimiter: ""
         precision: 1
-
-
-
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
         
 # Used in array.to_sentence.
   support:
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 45f4a644f..7315b1cd6 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -59,6 +59,22 @@ ca:
       over_x_years:
         one:   "més d'un any"
         other: "més de {{count}} anys"
+
+  number:
+    human:
+      format:
+        delimiter: ""
+        precision: 1
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
         
 # Used in array.to_sentence.
   support:
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 087da5fbe..59e1b95f9 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -59,6 +59,22 @@ cs:
       over_x_years:
         one:   "více než 1 rok"
         other: "více než {{count}} roky"
+
+  number: 
+    human: 
+      format: 
+        precision: 1
+        delimiter: ""
+      storage_units: 
+        format: "%n %u"
+        units: 
+          kb: KB
+          tb: TB
+          gb: GB
+          byte: 
+            one: Byte
+            other: Bytes
+          mb: MB
         
 # Used in array.to_sentence.
   support:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index ec0386ab5..2453ec9ab 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -85,7 +85,16 @@ da:
         # separator: 
         delimiter: ""
         precision: 1
-      storage_units: [Bytes, KB, MB, GB, TB]
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
     percentage:
       format:
         # separator:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index da3e8935c..da700a6e4 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -83,6 +83,16 @@ de:
       format:
         delimiter: ""
         precision: 1
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
 
   support:
     array:
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 8e20ed5c0..479b440d4 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -63,6 +63,22 @@ el:
         one:   "πάνω από 1 χρόνο"
         other: "πάνω από {{count}} χρόνια"
         
+  number: 
+    human: 
+      format: 
+        precision: 1
+        delimiter: ""
+      storage_units: 
+        format: "%n %u"
+        units: 
+          kb: KB
+          tb: TB
+          gb: GB
+          byte: 
+            one: Byte
+            other: Bytes
+          mb: MB
+
 # Used in array.to_sentence.
   support:
     array:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 190a6d797..0b30843e9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -59,6 +59,23 @@ en:
       over_x_years:
         one:   "over 1 year"
         other: "over {{count}} years"
+
+  number:
+    human:
+      format:
+        delimiter: ""
+        precision: 1
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
+
         
 # Used in array.to_sentence.
   support:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index af21eeff3..fd1a6405d 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -47,6 +47,16 @@ es:
         # separator: 
         delimiter: "" 
         precision: 1
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
 
   # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
   datetime:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 2a67e7243..b0e00b00c 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -61,7 +61,16 @@ fi:
       format:
         delimiter: ""
         precision: 1
-      storage_units: [Tavua, KB, MB, GB, TB]
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "Tavua"
+            other: "Tavua"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
  
   datetime:
     distance_in_words:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 7eb0f062b..e6231e8ef 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -84,7 +84,16 @@ fr:
     human:
       format:
         precision: 2
-      storage_units: [ Octet, ko, Mo, Go, To ]
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "Octet"
+            other: "Octet"
+          kb: "ko"
+          mb: "Mo"
+          gb: "Go"
+          tb: "To"
   
   support:
     array:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 55bcd0b44..f8aab4b1e 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -33,6 +33,16 @@ gl:
         # separator: 
         delimiter: "" 
         precision: 1
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
   
   
   date:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 423ebfbd5..8124ddac0 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -76,6 +76,17 @@ he:
         unit: 'שח'
         precision: 2
         format: '%u %n'
+    human:
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
         
   support:
     array:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 4d4500546..58fa75049 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -90,7 +90,16 @@
       format:
         delimiter: ""
         precision: 1
-      storage_units: [bájt, KB, MB, GB, TB]
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "bájt"
+            other: "bájt"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
 
   support:
     array:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 5cb022fbe..64d5daf86 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -74,6 +74,17 @@ it:
         unit: '€'
         precision: 2
         format: '%n %u'
+    human:
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
         
   support:
     array:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 0bc521fc3..107f84a33 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -96,6 +96,16 @@ ja:
       format:
         delimiter: ""
         precision: 1
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
 
   activerecord:
     errors:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index e2e01cb99..7b06e4ac7 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -116,7 +116,16 @@ ko:
         # separator: 
         delimiter: ""
         precision: 1
-      storage_units: [Bytes, KB, MB, GB, TB]
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
 
 # Used in array.to_sentence.
   support:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 050fc1ce1..2c27f50cd 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -28,7 +28,16 @@ lt:
       format:
         delimiter: ""
         precision: 1
-      storage_units: [baitai, KB, MB, GB, TB]
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "baitai"
+            other: "baitai"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
 
   datetime:
     distance_in_words:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 4f858aba8..a53f76720 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -59,6 +59,22 @@ nl:
       over_x_years:
         one:   "over 1 jaar"
         other: "over {{count}} jaren"
+
+  number: 
+    human: 
+      format: 
+        precision: 1
+        delimiter: ""
+      storage_units: 
+        format: "%n %u"
+        units: 
+          kb: KB
+          tb: TB
+          gb: GB
+          byte: 
+            one: Byte
+            other: Bytes
+          mb: MB
         
 # Used in array.to_sentence.
   support:
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 82b9d3252..fddcc2f94 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -67,6 +67,18 @@
       format:
         delimiter: ""
         precision: 4
+    human:
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
+
   activerecord:
     errors:
       template:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 77850cae0..d7e4849b3 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -21,7 +21,16 @@ pl:
       format:
         delimiter: ""
         precision: 1
-      storage_units: [B, KB, MB, GB, TB]
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "B"
+            other: "B"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
 
   date:
     formats:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 578c4fa4e..23e571819 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -93,6 +93,16 @@ pt-BR:
       format:
         precision: 1
         delimiter: '.'
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
   support:
     array:
       sentence_connector: "e"
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 20b5b5330..1c444f674 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -83,6 +83,16 @@ pt:
       format:
         precision: 1
         delimiter: ''
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
 
   activerecord:
     errors:
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index dde7dace3..04eb98548 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -57,6 +57,22 @@ ro:
       over_x_years:
         one:   "peste un an"
         other: "peste {{count}} ani"
+
+  number: 
+    human: 
+      format: 
+        precision: 1
+        delimiter: ""
+      storage_units: 
+        format: "%n %u"
+        units: 
+          kb: KB
+          tb: TB
+          gb: GB
+          byte: 
+            one: Byte
+            other: Bytes
+          mb: MB
         
 # Used in array.to_sentence.
   support:
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index feb870d3e..6f3a641dc 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -59,6 +59,22 @@ sk:
       over_x_years:
         one:   "cez 1 rok"
         other: "cez {{count}} roky/ov"
+
+  number: 
+    human: 
+      format: 
+        precision: 1
+        delimiter: ""
+      storage_units: 
+        format: "%n %u"
+        units: 
+          kb: KB
+          tb: TB
+          gb: GB
+          byte: 
+            one: Byte
+            other: Bytes
+          mb: MB
         
 # Used in array.to_sentence.
   support:
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index d7434b99f..6881ac9c5 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -59,6 +59,22 @@ sl:
       over_x_years:
         one:   "over 1 year"
         other: "over {{count}} years"
+
+  number: 
+    human: 
+      format: 
+        precision: 1
+        delimiter: ""
+      storage_units: 
+        format: "%n %u"
+        units: 
+          kb: KB
+          tb: TB
+          gb: GB
+          byte: 
+            one: Byte
+            other: Bytes
+          mb: MB
         
 # Used in array.to_sentence.
   support:
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index c8aa7c26c..1edc4e1f0 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -81,6 +81,17 @@
         unit: 'ДИН'
         precision: 2
         format: '%n %u'
+    human:
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
 
   support:
     array:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index d007017f3..f17c64d09 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -47,7 +47,16 @@ sv:
         # separator: 
         delimiter: ""
         # precision: 1
-      storage_units: [Byte, KB, MB, GB, TB]
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
 
   # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
   datetime:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 49d55940d..98d3c3c2b 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -59,6 +59,22 @@ th:
       over_x_years:
         one:   "over 1 year"
         other: "over {{count}} years"
+
+  number: 
+    human: 
+      format: 
+        precision: 1
+        delimiter: ""
+      storage_units: 
+        format: "%n %u"
+        units: 
+          kb: KB
+          tb: TB
+          gb: GB
+          byte: 
+            one: Byte
+            other: Bytes
+          mb: MB
         
 # Used in array.to_sentence.
   support:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index f7f57b134..d721eeb8f 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -92,6 +92,16 @@ tr:
         delimiter: '.'
         separator: ','
         precision: 2
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
 
   support:
     array:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index dbb085d6e..8209cc4fc 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -59,6 +59,22 @@ uk:
       over_x_years:
         one:   "over 1 year"
         other: "over {{count}} years"
+
+  number: 
+    human: 
+      format: 
+        precision: 1
+        delimiter: ""
+      storage_units: 
+        format: "%n %u"
+        units: 
+          kb: KB
+          tb: TB
+          gb: GB
+          byte: 
+            one: Byte
+            other: Bytes
+          mb: MB
         
 # Used in array.to_sentence.
   support:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 383d1953f..69524197f 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -49,7 +49,16 @@ vi:
         # separator:
         delimiter: ""
         precision: 1
-      storage_units: [Bytes, KB, MB, GB, TB]
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
 
   # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
   datetime:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 4068b3c88..e9199c3d5 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -86,8 +86,9 @@
         precision: 1
         # 儲存單位輸出格式.
         # %u 是儲存單位, %n 是數值 (預設值: 2 MB)
+      storage_units:
         format: "%n %u"
-        storage_units:
+        units:
           byte:
             one: "位元組 (B)"
             other: "位元組 (B)"
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index b55462284..a064828b4 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -86,7 +86,16 @@ zh:
       format:
         delimiter: ""
         precision: 1
-      storage_units: [Bytes, KB, MB, GB, TB]
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
   
   support:
     array:
diff --git a/config/routes.rb b/config/routes.rb
index 5357fc30f..3b790af14 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,11 +6,6 @@ ActionController::Routing::Routes.draw do |map|
   # map.connect 'products/:id', :controller => 'catalog', :action => 'view'
   # Keep in mind you can assign values other than :controller and :action
 
-  # Allow Redmine plugins to map routes and potentially override them
-  Rails.plugins.each do |plugin|
-    map.from_plugin plugin.name.to_sym
-  end
-
   map.home '', :controller => 'welcome'
   
   map.signin 'login', :controller => 'account', :action => 'login'