Skip to content

Commit

Permalink
Latest translations
Browse files Browse the repository at this point in the history
  • Loading branch information
feliciaan committed Apr 5, 2017
1 parent 37e7d53 commit 8b9afaf
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 11 deletions.
4 changes: 2 additions & 2 deletions app/helpers/application_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ def form_collection_select(f, *args)
render partial: "form_collection_select", locals: {f: f, args: args}
end

def form_check_box(f, tag)
render partial: "form_check_box", locals: {f: f, tag: tag}
def form_check_box(f, tag, options=nil)
render partial: "form_check_box", locals: {f: f, tag: tag, options: options}
end

# Pagination
Expand Down
6 changes: 5 additions & 1 deletion app/views/application/_form_check_box.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,9 @@
<label>
<%= f.label tag %>
</label>
<%= f.check_box tag %>
<% if options %>
<%= f.check_box tag, options %>
<% else %>
<%= f.check_box tag %>
<% end %>
</div>
6 changes: 3 additions & 3 deletions app/views/registrations/_basic.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
<% end %>
<%= form_collection_select f, :access_levels, @event.access_levels.find_all { |al| can? :register, al }, :id, :name_with_price %>
<% if @registration.event.allow_plus_one %>
<%= form_check_box f, :has_plus_one %>
<div class="plus_one" style="">
<%= form_check_box f, :has_plus_one, options={:onclick=>"$('.plus_one').toggle()"} %>
<div class="plus_one" style="<%= 'display:none' unless @registration.has_plus_one %>">
<% if @registration.event.extra_info %>
<%= form_radio_field f, :plus_one_title, @registration.plus_one_title, Registration.personal_titles, false, true, Registration.personal_titles_scope %>
<%= form_radio_field f, :plus_one_title, @registration.plus_one_title, Registration.personal_titles, true, true, Registration.personal_titles_scope %>
<% end %>
<%= form_text_field f, :plus_one_firstname %>
<%= form_text_field f, :plus_one_lastname %>
Expand Down
9 changes: 5 additions & 4 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ en:
access_levels: Ticket
comment: Comments
email: E-mail
has_plus_one: Plus one?
has_plus_one: Accompanied by partner?
job_function: Job function
name: Name
phone_number: Phone number
plus_one_firstname: Plus one first name
plus_one_lastname: Plus one last name
plus_one_title: Plus one title
plus_one_firstname: Partner first name
plus_one_lastname: Partner last name
plus_one_title: Partner title
register: Register
title: Title
datagrid:
Expand Down Expand Up @@ -62,6 +62,7 @@ en:
confirm: Register for %{event}
overpayment: Overpayment for %{event}
ticket: Ticket for %{event}
plus_one_title: Partner title
registration:
titles:
dr: Dr
Expand Down
3 changes: 2 additions & 1 deletion config/locales/nl.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
nl:
plus_one_title: Partner aanspreking
activerecord:
attributes:
registration:
Expand All @@ -11,7 +12,7 @@ nl:
phone_number: Telefoonnummer
register: Registreer
title: Aanspreking
has_plus_one: Partner?
has_plus_one: Vergezeld door partner?
plus_one_title: Partner aanspreking
plus_one_firstname: Partner voornaam
plus_one_lastname: Partner achternaam
Expand Down

0 comments on commit 8b9afaf

Please sign in to comment.