diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-11-12 15:06:46 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-11-12 15:06:46 +0000 |
| commit | a1ca0f9123a3aea843ba35508a97d5a4fd5cb0db (patch) | |
| tree | b9d3c1390f6b9c8b201e47507f26829b239f2773 /config/initializers/fast_gettext.rb | |
| parent | 8271b2c664f04d1b68a8b4d4fdb801f5c6b00b8c (diff) | |
| parent | c96b27c301023a6a1f50c12f0c387205b0255836 (diff) | |
Merge remote-tracking branch 'origin/release/0.6.8'0.6.8
Conflicts:
locale/cs/app.po
locale/sl/app.po
locale/sq/app.po
locale/tr/app.po
locale/uk/app.po
Diffstat (limited to 'config/initializers/fast_gettext.rb')
| -rw-r--r-- | config/initializers/fast_gettext.rb | 1 |
1 files changed, 0 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' |