diff options
| author | Jonne Haß <me@mrzyx.de> | 2012-11-30 21:16:23 +0400 |
|---|---|---|
| committer | Jonne Haß <me@mrzyx.de> | 2012-11-30 21:16:56 +0400 |
| commit | bf27cca03a516cf127d18d81171096909792418c (patch) | |
| tree | 5205415d111f4c1736ba1903f26196941d981060 /config/initializers | |
| parent | 2a7a0b7b990b70835e336ddffe62bf0e4b198ac4 (diff) | |
Do not generate paths like /a/b/c/config/boot.rb/../../Gemfile to require and open things, create a proper path instead.
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/locale.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/initializers/locale.rb b/config/initializers/locale.rb index 015dc6d8c..ce7a4379d 100644 --- a/config/initializers/locale.rb +++ b/config/initializers/locale.rb @@ -5,9 +5,9 @@ require 'i18n_interpolation_fallbacks' require "i18n/backend/fallbacks" - -if File.exists?(File.expand_path("./config/locale_settings.yml")) - locale_settings = YAML::load(File.open(File.expand_path("./config/locale_settings.yml"))) +settings_file = Pathname.new(__FILE__).dirname.join('..').expand_path.join('locale_settings.yml') +if settings_file.exist? + locale_settings = YAML.load_file(settings_file) AVAILABLE_LANGUAGES = (locale_settings['available'].length > 0) ? locale_settings['available'] : { "en" => 'English' } AVAILABLE_LANGUAGE_CODES = locale_settings['available'].keys DEFAULT_LANGUAGE = (AVAILABLE_LANGUAGE_CODES.include?(locale_settings['default'].to_s)) ? locale_settings['default'].to_s : "en" |