From 19cd80b10edce8dff957be47e8031f5d0c7975c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Vaello=20Mart=C3=ADnez?= Date: Sun, 16 Oct 2016 16:25:24 +0200 Subject: [PATCH] Fixing default/humanize bug - Hard to explain... --- app/views/events/edit.html.haml | 8 ++++---- app/views/events/new_detailed.html.haml | 6 +++--- app/views/events/propose_speaker.html.haml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/events/edit.html.haml b/app/views/events/edit.html.haml index 706b5d1..a42f12d 100644 --- a/app/views/events/edit.html.haml +++ b/app/views/events/edit.html.haml @@ -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 @@ -126,7 +126,7 @@ = 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"} @@ -134,7 +134,7 @@ = 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"} @@ -142,7 +142,7 @@ = 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 diff --git a/app/views/events/new_detailed.html.haml b/app/views/events/new_detailed.html.haml index b5925c9..8ec9b37 100644 --- a/app/views/events/new_detailed.html.haml +++ b/app/views/events/new_detailed.html.haml @@ -132,7 +132,7 @@ = 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"} @@ -140,7 +140,7 @@ = 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"} @@ -148,7 +148,7 @@ = 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 diff --git a/app/views/events/propose_speaker.html.haml b/app/views/events/propose_speaker.html.haml index aa7a3aa..9171d85 100644 --- a/app/views/events/propose_speaker.html.haml +++ b/app/views/events/propose_speaker.html.haml @@ -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"