Skip to content

Commit

Permalink
Fixing default/humanize bug
Browse files Browse the repository at this point in the history
- Hard to explain...
  • Loading branch information
mvaello committed Oct 16, 2016
1 parent 30b67b8 commit 19cd80b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions app/views/events/edit.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
%i.fa.fa-question-circle.fa-fw{"aria-haspopup" => "true", "data-tooltip" => "", title: t("event.subclass_requirements"), class: "radius"}
.row
.large-3.columns
= select("detailed_event", "subclass", Event.subclasses.keys.collect {|s| [t("event.subclasses.#{s}").humanize, s]}, {include_blank: true, selected: "selected"}, class: "radius", required: true, label: false)
= select("detailed_event", "subclass", Event.subclasses.keys.collect {|s| [t("event.subclasses.#{s}.default").humanize, s]}, {include_blank: true, selected: "selected"}, class: "radius", required: true, label: false)

.row
.large-12.columns
Expand Down Expand Up @@ -126,23 +126,23 @@
= t("event.language")
%small
= t("event.required")
= select("detailed_event", "language", t("event.languages").keys.collect {|l| [t("event.languages.#{l}").humanize, l]},{include_blank: true, selected: "selected"}, required: true, class: "radius")
= select("detailed_event", "language", t("event.languages").keys.collect {|l| [t("event.languages.#{l}.default").humanize, l]},{include_blank: true, selected: "selected"}, required: true, class: "radius")

.large-4.columns
%label{for: "duration"}
%i.fa.fa-clock-o.fa-fw.fa-lg.subheader
= t("event.duration")
%small
= t("event.required")
= select("detailed_event", "duration", Event.durations.keys.collect {|d| [t("event.durations.#{d}").humanize, d]}, { include_blank: true, selected: "selected"}, class: "radius", required: true, label: false)
= select("detailed_event", "duration", Event.durations.keys.collect {|d| [t("event.durations.#{d}.default").humanize, d]}, { include_blank: true, selected: "selected"}, class: "radius", required: true, label: false)

.large-4.columns
%label{for: "level"}
%i.fa.fa-lightbulb-o.fa-fw.fa-lg.subheader
= t("event.level")
%small
= t("event.required")
= select("detailed_event", "level", Event.levels.keys.collect {|l| [t("event.levels.#{l}").humanize, l]}, { include_blank: true, selected: "selected"}, class: "radius", required: true, label: false)
= select("detailed_event", "level", Event.levels.keys.collect {|l| [t("event.levels.#{l}.default").humanize, l]}, { include_blank: true, selected: "selected"}, class: "radius", required: true, label: false)

.row
.large-12.columns
Expand Down
6 changes: 3 additions & 3 deletions app/views/events/new_detailed.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -132,23 +132,23 @@
= t("event.language")
%small
= t("event.required")
= select("detailed_event", "language", t("event.languages").keys.collect {|l| [t("event.languages.#{l}").humanize, l]},{include_blank: true, selected: "selected"}, required: true, class: "radius")
= select("detailed_event", "language", t("event.languages").keys.collect {|l| [t("event.languages.#{l}.default").humanize, l]},{include_blank: true, selected: "selected"}, required: true, class: "radius")

.medium-4.columns
%label{for: "duration"}
%i.fa.fa-clock-o.fa-fw.fa-lg.subheader
= t("event.duration")
%small
= t("event.required")
= select("detailed_event", "duration", Event.durations.keys.collect {|d| [t("event.durations.#{d}").humanize, d]}, { include_blank: true, selected: "selected"}, class: "radius", required: true, label: false)
= select("detailed_event", "duration", Event.durations.keys.collect {|d| [t("event.durations.#{d}.default").humanize, d]}, { include_blank: true, selected: "selected"}, class: "radius", required: true, label: false)

.medium-4.columns
%label{for: "level"}
%i.fa.fa-lightbulb-o.fa-fw.fa-lg.subheader
= t("event.level")
%small
= t("event.required")
= select("detailed_event", "level", Event.levels.keys.collect {|l| [t("event.levels.#{l}").humanize, l]}, { include_blank: true, selected: "selected"}, class: "radius", required: true, label: false)
= select("detailed_event", "level", Event.levels.keys.collect {|l| [t("event.levels.#{l}.default").humanize, l]}, { include_blank: true, selected: "selected"}, class: "radius", required: true, label: false)

.row
.large-12.columns
Expand Down
2 changes: 1 addition & 1 deletion app/views/events/propose_speaker.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
.small-10.columns
= f.text_field :twitter, label: false, maxlength: 64, pattern: "([A-Za-z0-9_]{1,15})", class: "radius"

= f.check_box :certificate, label: t('speaker.request_certificate').humanize
= f.check_box :certificate, label: t('speaker.request_certificate.default').humanize

.medium-6.columns
= render "partials/recaptcha"
Expand Down

0 comments on commit 19cd80b

Please sign in to comment.