diff --git a/Gemfile b/Gemfile index 3905133..bce7e6b 100644 --- a/Gemfile +++ b/Gemfile @@ -5,14 +5,14 @@ source "http://rubygems.org" # development dependencies will be added by default to the :development group. gemspec -gem "rails", "4.2.0.rc2" +gem "rails", "4.2.0" group :assets do - gem 'sass-rails', '5.0.0.beta1' + gem 'sass-rails', ' ~> 5.0.0' gem 'bourbon' gem 'coffee-script' #gem 'therubyracer', :platforms => :ruby #gem 'less-rails' - gem 'bootstrap-sass', '~>2.3' + gem 'bootstrap-sass', '~> 2.3' end gem 'couch_potato' , github: 'bterkuile/couch_potato' diff --git a/Gemfile.lock b/Gemfile.lock index 77246e3..e20334c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,48 +43,48 @@ PATH GEM remote: http://rubygems.org/ specs: - actionmailer (4.2.0.rc2) - actionpack (= 4.2.0.rc2) - actionview (= 4.2.0.rc2) - activejob (= 4.2.0.rc2) + actionmailer (4.2.0) + actionpack (= 4.2.0) + actionview (= 4.2.0) + activejob (= 4.2.0) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.0.rc2) - actionview (= 4.2.0.rc2) - activesupport (= 4.2.0.rc2) - rack (~> 1.6.0.beta2) + actionpack (4.2.0) + actionview (= 4.2.0) + activesupport (= 4.2.0) + rack (~> 1.6.0) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.1) actionpack-page_caching (1.0.2) actionpack (>= 4.0.0, < 5) - actionview (4.2.0.rc2) - activesupport (= 4.2.0.rc2) + actionview (4.2.0) + activesupport (= 4.2.0) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.1) - activejob (4.2.0.rc2) - activesupport (= 4.2.0.rc2) + activejob (4.2.0) + activesupport (= 4.2.0) globalid (>= 0.3.0) - activemodel (4.2.0.rc2) - activesupport (= 4.2.0.rc2) + activemodel (4.2.0) + activesupport (= 4.2.0) builder (~> 3.1) - activerecord (4.2.0.rc2) - activemodel (= 4.2.0.rc2) - activesupport (= 4.2.0.rc2) + activerecord (4.2.0) + activemodel (= 4.2.0) + activesupport (= 4.2.0) arel (~> 6.0) - activesupport (4.2.0.rc2) - i18n (>= 0.7.0.beta1, < 0.8) + activesupport (4.2.0) + i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) - thread_safe (~> 0.1) + thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) arel (6.0.0) bcrypt (3.1.9) bootstrap-sass (2.3.2.2) sass (~> 3.2) - bourbon (4.0.2) + bourbon (4.1.1) sass (~> 3.3) thor builder (3.2.2) @@ -119,7 +119,7 @@ GEM email_validator (1.5.0) activemodel erubis (2.7.0) - eventmachine (1.0.3) + eventmachine (1.0.4) execjs (2.2.2) factory_girl (4.5.0) activesupport (>= 3.0.0) @@ -129,22 +129,22 @@ GEM globalid (0.3.0) activesupport (>= 4.1.0) hike (1.2.3) - i18n (0.7.0.beta1) - jquery-rails (4.0.0) + i18n (0.7.0) + jquery-rails (4.0.3) rails-dom-testing (~> 1.0) - railties (>= 4.2.0.beta, < 5.0) + railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.3) railties (>= 3.2.16) - json (1.8.1) + json (1.8.2) loofah (2.0.1) nokogiri (>= 1.5.9) mail (2.6.3) mime-types (>= 1.16, < 3) method_source (0.8.2) mime-types (1.25.1) - mini_portile (0.6.1) - minitest (5.4.3) + mini_portile (0.6.2) + minitest (5.5.1) multi_json (1.10.1) nokogiri (1.6.5) mini_portile (~> 0.6.0) @@ -159,19 +159,19 @@ GEM slop (~> 3.4) pry-rails (0.3.2) pry (>= 0.9.10) - rack (1.6.0.beta2) - rack-test (0.6.2) + rack (1.6.0) + rack-test (0.6.3) rack (>= 1.0) - rails (4.2.0.rc2) - actionmailer (= 4.2.0.rc2) - actionpack (= 4.2.0.rc2) - actionview (= 4.2.0.rc2) - activejob (= 4.2.0.rc2) - activemodel (= 4.2.0.rc2) - activerecord (= 4.2.0.rc2) - activesupport (= 4.2.0.rc2) + rails (4.2.0) + actionmailer (= 4.2.0) + actionpack (= 4.2.0) + actionview (= 4.2.0) + activejob (= 4.2.0) + activemodel (= 4.2.0) + activerecord (= 4.2.0) + activesupport (= 4.2.0) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.0.rc2) + railties (= 4.2.0) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -181,9 +181,9 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.1) loofah (~> 2.0) - railties (4.2.0.rc2) - actionpack (= 4.2.0.rc2) - activesupport (= 4.2.0.rc2) + railties (4.2.0) + actionpack (= 4.2.0) + activesupport (= 4.2.0) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.4.2) @@ -214,19 +214,21 @@ GEM rspec-support (~> 3.1.0) rspec-support (3.1.2) sass (3.4.9) - sass-rails (5.0.0.beta1) + sass-rails (5.0.1) railties (>= 4.0.0, < 5.0) - sass (~> 3.2) - sprockets (~> 2.12) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) - slim (2.1.0) - temple (~> 0.6.9) + tilt (~> 1.1) + slim (3.0.1) + temple (~> 0.7.3) tilt (>= 1.3.3, < 2.1) - slim-rails (2.1.5) - actionpack (>= 3.0, < 4.2) - activesupport (>= 3.0, < 4.2) - railties (>= 3.0, < 4.2) - slim (~> 2.0) + slim-rails (3.0.1) + actionmailer (>= 3.1, < 5.0) + actionpack (>= 3.1, < 5.0) + activesupport (>= 3.1, < 5.0) + railties (>= 3.1, < 5.0) + slim (~> 3.0) slop (3.6.0) sprockets (2.12.3) hike (~> 1.2) @@ -240,7 +242,7 @@ GEM steak (2.0.0) capybara (>= 1.0.0) rspec-rails (>= 2.5.0) - temple (0.6.10) + temple (0.7.5) thin (1.6.3) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0) @@ -276,9 +278,9 @@ DEPENDENCIES orm_adapter! paperclip pry-rails - rails (= 4.2.0.rc2) + rails (= 4.2.0) rspec-its - sass-rails (= 5.0.0.beta1) + sass-rails (~> 5.0.0) simply_stored! slim-rails steak diff --git a/app/views/cmtool/pages/index.html.slim b/app/views/cmtool/pages/index.html.slim index 5228553..51d8506 100644 --- a/app/views/cmtool/pages/index.html.slim +++ b/app/views/cmtool/pages/index.html.slim @@ -11,7 +11,7 @@ table.index-table.table.table-striped.table-hover th th tbody - - Rails.configuration.available_locales.each do |locale| + - Page.locales.each do |locale| = render 'nested_pages', pages: Page.full_tree(locale) - content_for :page_links do diff --git a/lib/cmtool/includes/page.rb b/lib/cmtool/includes/page.rb index 132ca31..4f14d84 100644 --- a/lib/cmtool/includes/page.rb +++ b/lib/cmtool/includes/page.rb @@ -61,7 +61,6 @@ module Cmtool [:ad, :ae, :af, :ag, :ai, :al, :am, :an, :ao, :aq, :ar, :as, :at, :au, :aw, :az, :ba, :bb, :bd, :be, :bf, :bg, :bh, :bi, :bj, :bm, :bn, :bo, :br, :bs, :bt, :bw, :by, :bz, :ca, :cd, :cf, :cg, :ch, :ci, :ck, :cl, :cm, :cn, :co, :cr, :cu, :cv, :cy, :cz, :de, :dj, :dk, :dm, :do, :dz, :ec, :ee, :eg, :eh, :en, :er, :es, :et, :fi, :fj, :fm, :fo, :fr, :ga, :gb, :gd, :ge, :gg, :gh, :gi, :gl, :gm, :gn, :gp, :gq, :gr, :gt, :gu, :gw, :gy, :hk, :hn, :hr, :ht, :hu, :id, :ie, :il, :im, :in, :iq, :ir, :is, :it, :je, :jm, :jo, :jp, :ke, :kg, :kh, :ki, :km, :kn, :kp, :kr, :kw, :ky, :kz, :la, :lb, :lc, :li, :lk, :lr, :ls, :lt, :lu, :lv, :ly, :ma, :mc, :md, :me, :mg, :mh, :mk, :ml, :mm, :mn, :mo, :mq, :mr, :ms, :mt, :mu, :mv, :mw, :mx, :my, :mz, :na, :nc, :ne, :ng, :ni, :nl, :no, :np, :nr, :nz, :om, :pa, :pe, :pf, :pg, :ph, :pk, :pl, :pr, :ps, :pt, :pw, :py, :qa, :re, :ro, :rs, :ru, :rw, :sa, :sb, :sc, :sd, :se, :sg, :si, :sk, :sl, :sm, :sn, :so, :sr, :st, :sv, :sy, :sz, :tc, :td, :tg, :th, :tj, :tl, :tm, :tn, :to, :tr, :tt, :tv, :tw, :tz, :ua, :ug, :us, :uy, :uz, :va, :vc, :ve, :vg, :vi, :vn, :vu, :ws, :ye, :za, :zm, :zw] end def locales - #[:en, :nl, :de, :es] Rails.configuration.i18n.available_locales.presence || [] end def default_locale diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb index f1a681d..8f1c971 100644 --- a/spec/dummy/config/application.rb +++ b/spec/dummy/config/application.rb @@ -38,6 +38,7 @@ module Dummy # 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.available_locales = [:en, :nl, :de, :es] # Configure the default encoding used in templates for Ruby 1.9. config.encoding = "utf-8"