diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-03-25 15:20:59 +0000 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-03-25 15:20:59 +0000 |
| commit | 2bb79f893805e972f6efe5cb7cfe90dd0efa4107 (patch) | |
| tree | 47084acc8d48126b9e891bb50c217be43be27641 /config/initializers/fast_gettext.rb | |
| parent | 22c25e42847d41924d43d31f3ef67be1ae4a155e (diff) | |
| parent | 1fb57d66c22000d4164c033ffd9353aa9030255b (diff) | |
resolve merge conflicts
Diffstat (limited to 'config/initializers/fast_gettext.rb')
| -rw-r--r-- | config/initializers/fast_gettext.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/initializers/fast_gettext.rb b/config/initializers/fast_gettext.rb index 9ce0955e9..b01b129fa 100644 --- a/config/initializers/fast_gettext.rb +++ b/config/initializers/fast_gettext.rb @@ -1,3 +1,3 @@ -FastGettext.add_text_domain 'app', :path => File.join(RAILS_ROOT, 'locale'), :type => :po -FastGettext.default_available_locales = ['en'] #all you want to allow -FastGettext.default_text_domain = 'app'
\ No newline at end of file +FastGettext.add_text_domain 'app', :path => 'locale', :type => :po +FastGettext.default_available_locales = ['en','es'] #all you want to allow +FastGettext.default_text_domain = 'app' |