diff --git a/Gemfile b/Gemfile index f5086d2714..35beb4c69e 100644 --- a/Gemfile +++ b/Gemfile @@ -7,6 +7,11 @@ gem 'rails', '3.1.4' gem 'pg' gem 'spree' +gem 'spree_i18n', :git => 'git://github.com/spree/spree_i18n.git' + +gem 'spree_usa_epay' +gem 'spree_skrill' + gem 'unicorn' # gem 'spree_heroku' @@ -41,5 +46,4 @@ group :test do # Pretty printed test output gem 'turn', '~> 0.8.3', :require => false end -gem 'spree_usa_epay' -gem 'spree_skrill' + diff --git a/Gemfile.lock b/Gemfile.lock index a7c8532610..f09f494c37 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,10 @@ +GIT + remote: git://github.com/spree/spree_i18n.git + revision: 1aef1d10a65027db7c28119da38213ba3dab9a03 + specs: + spree_i18n (1.0.0) + spree_core (>= 0.30.0) + GEM remote: http://rubygems.org/ specs: @@ -233,6 +240,7 @@ DEPENDENCIES rails (= 3.1.4) sass-rails (~> 3.1.5) spree + spree_i18n! spree_skrill spree_usa_epay turn (~> 0.8.3) diff --git a/config/application.rb b/config/application.rb index 8bc7ad1ebc..e514503c33 100644 --- a/config/application.rb +++ b/config/application.rb @@ -11,7 +11,7 @@ end module Openfoodweb class Application < Rails::Application - + config.to_prepare do # Load application's model / class decorators Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c| @@ -44,7 +44,7 @@ module Openfoodweb # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] - # config.i18n.default_locale = :de + config.i18n.default_locale = 'en-AU' # Configure the default encoding used in templates for Ruby 1.9. config.encoding = "utf-8"