diff options
author | Seb Bacon <seb.bacon@gmail.com> | 2011-11-24 12:46:48 +0000 |
---|---|---|
committer | Seb Bacon <seb.bacon@gmail.com> | 2011-11-24 12:46:48 +0000 |
commit | 76168e23fd78d276a197cc992bb6ef5a065f6f3f (patch) | |
tree | f15093086b2ff767968e6bbd1b816c66f35bd5dd /config/initializers | |
parent | fb2b20037bb176533de4e7fa86701248473f8ee3 (diff) | |
parent | 589d9b8c1e14bb7086a6b7baf0fa7e3b9aaeabf0 (diff) |
Merge branch 'develop' into xapian-dcabo
Conflicts:
spec/models/xapian_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' |