aboutsummaryrefslogtreecommitdiffstats
path: root/config/initializers
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2012-10-11 15:17:09 +0100
committerLouise Crow <louise.crow@gmail.com>2012-10-11 15:17:09 +0100
commitfd461b18824bc5e22fd093ea4d53e74c7ada1721 (patch)
tree7647b73abe4d4c4405b08d3fdf7ac6f6bb2275bd /config/initializers
parente0e0542d17cba590218d1eed11b7997f29b46026 (diff)
parenta902a8308fe05e9fd7a61aa8378aaf95729fcc88 (diff)
Merge branch 'feature/ruby-19-compat-immediate' into develop
Diffstat (limited to 'config/initializers')
-rw-r--r--config/initializers/fast_gettext.rb1
-rw-r--r--config/initializers/missing_source_file.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/config/initializers/fast_gettext.rb b/config/initializers/fast_gettext.rb
index 721c49cd0..2ecf5cb5d 100644
--- a/config/initializers/fast_gettext.rb
+++ b/config/initializers/fast_gettext.rb
@@ -1,4 +1,3 @@
-Encoding.default_external = 'UTF-8' if RUBY_VERSION.to_f >= 1.9
FastGettext.add_text_domain 'app', :path => File.join(Rails.root, 'locale'), :type => :po
FastGettext.default_text_domain = 'app'
diff --git a/config/initializers/missing_source_file.rb b/config/initializers/missing_source_file.rb
new file mode 100644
index 000000000..a114fa972
--- /dev/null
+++ b/config/initializers/missing_source_file.rb
@@ -0,0 +1,2 @@
+# For Rails 2.3 on Ruby 1.9.3 @see https://github.com/rails/rails/pull/3745
+MissingSourceFile::REGEXPS << [/^cannot load such file -- (.+)$/i, 1]