diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-09-24 11:29:31 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-09-24 11:29:31 +0100 |
| commit | d8deb8418b4cd26c68eb1301959e156c19b111e2 (patch) | |
| tree | 99c346db95d17be9c5105ce47d5f3ac8e943e952 /config/initializers | |
| parent | 8459314b691f5b02277035219cd58f510d100a77 (diff) | |
| parent | 75542416a1cc36b353ade557b1bc4f729b02423a (diff) | |
Merge branch 'release/0.14'0.14
Conflicts:
locale/bg/app.po
locale/fr/app.po
locale/fr_CA/app.po
locale/he_IL/app.po
locale/hr/app.po
locale/it/app.po
locale/nb_NO/app.po
locale/pl/app.po
locale/sv/app.po
locale/vi/app.po
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/alaveteli.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb index 2c6ee2fbc..8ae78c80c 100644 --- a/config/initializers/alaveteli.rb +++ b/config/initializers/alaveteli.rb @@ -10,7 +10,7 @@ load "debug_helpers.rb" load "util.rb" # Application version -ALAVETELI_VERSION = '0.13' +ALAVETELI_VERSION = '0.14' # Add new inflection rules using the following format # (all these examples are active by default): @@ -25,7 +25,6 @@ ALAVETELI_VERSION = '0.13' # Mime::Type.register "text/richtext", :rtf # Mime::Type.register "application/x-mobile", :mobile -# The Rails cache is set up by the Interlock plugin to use memcached # Domain for URLs (so can work for scripts, not just web pages) ActionMailer::Base.default_url_options[:host] = AlaveteliConfiguration::domain @@ -50,6 +49,7 @@ require 'ability' require 'normalize_string' require 'alaveteli_file_types' require 'alaveteli_localization' +require 'message_prominence' AlaveteliLocalization.set_locales(AlaveteliConfiguration::available_locales, AlaveteliConfiguration::default_locale) |