Merged Rails 2.2 branch. Redmine now requires Rails 2.2.2.

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

test/unit/default_data_test.rb

@@ -18,6 +18,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class DefaultDataTest < Test::Unit::TestCase
+  include Redmine::I18n
   fixtures :roles
   
   def test_no_data
@@ -30,7 +31,7 @@ class DefaultDataTest < Test::Unit::TestCase
   end
   
   def test_load
-    GLoc.valid_languages.each do |lang|
+    valid_languages.each do |lang|
       begin
         Role.delete_all("builtin = 0")
         Tracker.delete_all