diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-11-24 10:35:49 +0000 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-11-24 10:35:49 +0000 |
| commit | 8494003ebf71ef437dfccb9374366a51ecb5924c (patch) | |
| tree | 88f105ebb3ebdd84b64b4b5cb5f00db5cacd9e2d /config/initializers | |
| parent | fbfebdbe1c5b13f86f92404c3397d6dcb75766ce (diff) | |
| parent | b7075181100852ff2117d61b02881e84deaafa87 (diff) | |
Merge remote-tracking branch 'jpmckinney/pre1.9' into develop
Conflicts:
spec/controllers/request_controller_spec.rb
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/fast_gettext.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/fast_gettext.rb b/config/initializers/fast_gettext.rb index 026c4111c..63cf6b50d 100644 --- a/config/initializers/fast_gettext.rb +++ b/config/initializers/fast_gettext.rb @@ -1,2 +1,2 @@ -FastGettext.add_text_domain 'app', :path => 'locale', :type => :po +FastGettext.add_text_domain 'app', :path => File.join(Rails.root, 'locale'), :type => :po FastGettext.default_text_domain = 'app' |