Skip to content

Commit

Permalink
Update decidim (#89)
Browse files Browse the repository at this point in the history 
* Update decidim

* Update decidim

* Add missing i18n
  • Loading branch information
@mrcasals @josepjaume
mrcasals authored and josepjaume committed Mar 29, 2017
1 parent ebe4a92 commit b32fcbc
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 47 deletions.
93 changes: 47 additions & 46 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
GIT
remote: https://github.com/AjuntamentdeBarcelona/decidim.git
revision: c1a80c0f354da6708908ed220a72729fe70e8f40
revision: 53e9ed63c7fa5d716a0d4f40d420e2aa9447686d
specs:
decidim (0.0.5)
decidim-admin (= 0.0.5)
decidim-api (= 0.0.5)
decidim-budgets (= 0.0.5)
decidim-comments (= 0.0.5)
decidim-core (= 0.0.5)
decidim-meetings (= 0.0.5)
decidim-pages (= 0.0.5)
decidim-proposals (= 0.0.5)
decidim-results (= 0.0.5)
decidim-system (= 0.0.5)
decidim (0.0.6)
decidim-admin (= 0.0.6)
decidim-api (= 0.0.6)
decidim-budgets (= 0.0.6)
decidim-comments (= 0.0.6)
decidim-core (= 0.0.6)
decidim-meetings (= 0.0.6)
decidim-pages (= 0.0.6)
decidim-proposals (= 0.0.6)
decidim-results (= 0.0.6)
decidim-system (= 0.0.6)
rails (~> 5.0.2)
rails-i18n (~> 5.0.2)
decidim-admin (0.0.5)
decidim-admin (0.0.6)
active_link_to (~> 1.0.0)
carrierwave (~> 1.0.0.rc)
decidim-core (= 0.0.5)
decidim-core (= 0.0.6)
devise (~> 4.2)
devise-i18n (~> 1.1.0)
devise_invitable (~> 1.7.0)
Expand All @@ -27,29 +27,29 @@ GIT
rails (~> 5.0.2)
rectify (~> 0.8.0)
sassc-rails (~> 1.3.0)
decidim-api (0.0.5)
decidim-api (0.0.6)
graphiql-rails (~> 1.4.1)
graphql (~> 1.5.1)
graphql (~> 1.5.3)
rack-cors (~> 0.4.0)
rails (~> 5.0.2)
sprockets-es6 (~> 0.9.2)
decidim-budgets (0.0.5)
decidim-comments (= 0.0.5)
decidim-core (= 0.0.5)
decidim-budgets (0.0.6)
decidim-comments (= 0.0.6)
decidim-core (= 0.0.6)
kaminari (~> 1.0.0.rc1)
rectify (~> 0.8)
searchlight (~> 4.1.0)
decidim-comments (0.0.5)
decidim-core (= 0.0.5)
decidim-comments (0.0.6)
decidim-core (= 0.0.6)
jquery-rails (~> 4.0)
rails (~> 5.0.2)
decidim-core (0.0.5)
decidim-core (0.0.6)
active_link_to (~> 1.0.0)
autoprefixer-rails (~> 6.7, >= 6.7.4)
cancancan (~> 1.16.0)
carrierwave (~> 1.0.0)
date_validator (~> 0.9.0)
decidim-api (= 0.0.5)
decidim-api (= 0.0.6)
devise (~> 4.2)
devise-i18n (~> 1.1.0)
file_validators (~> 2.1.0)
Expand All @@ -74,14 +74,14 @@ GIT
sprockets-es6 (~> 0.9.2)
truncato (~> 0.7.9)
wisper (~> 1.6.1)
decidim-dev (0.0.5)
decidim-dev (0.0.6)
byebug
capybara (~> 2.12.0)
capybara-screenshot (~> 1.0.14)
codecov (~> 0.1.9)
database_cleaner (~> 1.5.0)
db-query-matchers (~> 0.7.0)
decidim (= 0.0.5)
decidim (= 0.0.6)
factory_girl_rails
faker (~> 1.7.3)
i18n-tasks (= 0.9.12)
Expand All @@ -97,33 +97,33 @@ GIT
simplecov (~> 0.13)
webmock (~> 2.3.2)
wisper-rspec (~> 0.0.3)
decidim-meetings (0.0.5)
decidim-meetings (0.0.6)
date_validator (~> 0.9)
decidim-core (= 0.0.5)
decidim-core (= 0.0.6)
httparty (~> 0.14.0)
jquery-tmpl-rails (~> 1.1.0)
kaminari (~> 1.0.1)
rectify (~> 0.8)
searchlight (~> 4.1.0)
decidim-pages (0.0.5)
decidim-comments (= 0.0.5)
decidim-core (= 0.0.5)
decidim-pages (0.0.6)
decidim-comments (= 0.0.6)
decidim-core (= 0.0.6)
rectify (~> 0.8.0)
decidim-proposals (0.0.5)
decidim-comments (= 0.0.5)
decidim-core (= 0.0.5)
decidim-proposals (0.0.6)
decidim-comments (= 0.0.6)
decidim-core (= 0.0.6)
kaminari (~> 1.0.1)
rectify (~> 0.8.0)
social-share-button (~> 0.9.0)
decidim-results (0.0.5)
decidim-comments (= 0.0.5)
decidim-core (= 0.0.5)
decidim-results (0.0.6)
decidim-comments (= 0.0.6)
decidim-core (= 0.0.6)
kaminari (~> 1.0.0.rc1)
rectify (~> 0.8)
searchlight (~> 4.1.0)
decidim-system (0.0.5)
decidim-system (0.0.6)
active_link_to (~> 1.0.0)
decidim-core (= 0.0.5)
decidim-core (= 0.0.6)
devise (~> 4.2)
devise-i18n (~> 1.1.0)
devise_invitable (~> 1.7.1)
Expand Down Expand Up @@ -176,8 +176,9 @@ GEM
erubis (~> 2.7.0)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
active_link_to (1.0.3)
active_link_to (1.0.4)
actionpack
addressable
activejob (5.0.2)
activesupport (= 5.0.2)
globalid (>= 0.3.6)
Expand All @@ -196,7 +197,7 @@ GEM
public_suffix (~> 2.0, >= 2.0.2)
arel (7.1.4)
ast (2.3.0)
autoprefixer-rails (6.7.7)
autoprefixer-rails (6.7.7.1)
execjs
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
Expand Down Expand Up @@ -259,7 +260,7 @@ GEM
railties (>= 4.1.0, < 5.1)
responders
warden (~> 1.2.3)
devise-i18n (1.1.1)
devise-i18n (1.1.2)
devise_invitable (1.7.1)
actionmailer (>= 4.1.0)
devise (>= 4.0.0)
Expand Down Expand Up @@ -522,7 +523,7 @@ GEM
rspec-repeat (1.0.2)
rspec (~> 3.0)
rspec-support (3.5.0)
rubocop (0.47.1)
rubocop (0.48.0)
parser (>= 2.3.3.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
Expand Down Expand Up @@ -551,7 +552,7 @@ GEM
connection_pool (~> 2.2, >= 2.2.0)
rack-protection (>= 1.5.0)
redis (~> 3.2, >= 3.2.1)
simplecov (0.14.0)
simplecov (0.14.1)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
Expand All @@ -574,19 +575,19 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
term-ansicolor (1.4.0)
term-ansicolor (1.5.0)
tins (~> 1.0)
terminal-table (1.7.3)
unicode-display_width (~> 1.1.1)
thor (0.19.4)
thread (0.2.2)
thread_safe (0.3.6)
tilt (2.0.6)
tilt (2.0.7)
tins (1.13.2)
truncato (0.7.9)
htmlentities (~> 4.3.1)
nokogiri (~> 1.7.0)
tzinfo (1.2.2)
tzinfo (1.2.3)
thread_safe (~> 0.1)
uglifier (3.0.4)
execjs (>= 0.3.0, < 3)
Expand Down
2 changes: 1 addition & 1 deletion app/services/census_authorization_handler.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ def request_body
end

def over_16
errors.add(:date_of_birth, I18n.t("census_authorization_handler.age_under_18")) unless age && age >= 16
errors.add(:date_of_birth, I18n.t("census_authorization_handler.age_under_16")) unless age && age >= 16
end

def age
Expand Down
1 change: 1 addition & 0 deletions config/locales/ca.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
ca:
census_authorization_handler:
age_under_16: Has de ser major de 16 anys per validar-te
invalid_document: Número de document incorrecte
activemodel:
attributes:
Expand Down
1 change: 1 addition & 0 deletions config/locales/es.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
es:
census_authorization_handler:
age_under_16: Tienes que ser mayor de 16 años para validarte
invalid_document: Número de documento incorrecto
activemodel:
attributes:
Expand Down

0 comments on commit b32fcbc

Please sign in to comment.