From b2cb7e8c1ff6ca911ed393b8d43c2ad48565b6a7 Mon Sep 17 00:00:00 2001 From: Godwin Date: Fri, 22 Jul 2016 08:19:23 -0700 Subject: [PATCH] Fixed missing translation on register page * Fixed missing translation for registration page title * Update conferences_controller.rb --- app/controllers/conferences_controller.rb | 1 + .../conferences/_confirm_email.html.haml | 28 +++++++++---------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb index fa6587b..c779791 100644 --- a/app/controllers/conferences_controller.rb +++ b/app/controllers/conferences_controller.rb @@ -531,6 +531,7 @@ class ConferencesController < ApplicationController @is_host = @this_conference.host? current_user else + @page_title = "articles.conference_registration.headings.#{@this_conference.registration_status == :open ? '': 'Pre_'}Registration_Details" @register_template = :confirm_email end diff --git a/app/views/conferences/_confirm_email.html.haml b/app/views/conferences/_confirm_email.html.haml index 3acb27a..f8270b2 100644 --- a/app/views/conferences/_confirm_email.html.haml +++ b/app/views/conferences/_confirm_email.html.haml @@ -1,15 +1,13 @@ -%article - = columns(medium: 12) do - %h2=_"articles.conference_registration.headings.#{@this_conference.registration_status == :open ? '': 'Pre_'}Registration_Details" - %p=_"articles.conference_registration.paragraphs.#{@this_conference.registration_status == :open ? '': 'Pre_'}Registration_Details" - %h3=_'articles.conference_registration.headings.Verify_Account' - %p=_'articles.conference_registration.paragraphs.Verify_Account' - = columns(medium: 12) do - = form_tag register_path(@this_conference.slug), class: 'flex-form' do - .email-field.input-field.big - = email_field_tag :email, nil, required: true - = label_tag :email - = button_tag :continue, :value => :confirm_email - = columns(medium: 12, class: 'flex-column') do - %p.stretch-item=_'articles.conference_registration.paragraphs.facebook_sign_in' - = link_to (_'forms.actions.generic.facebook_sign_in','Facebook Sign In'), auth_at_provider_path(:provider => :facebook), class: [:button, :facebook] += columns(medium: 12) do + %p=_"articles.conference_registration.paragraphs.#{@this_conference.registration_status == :open ? '': 'Pre_'}Registration_Details" + %h3=_'articles.conference_registration.headings.Verify_Account' + %p=_'articles.conference_registration.paragraphs.Verify_Account' + + = form_tag register_path(@this_conference.slug), class: 'flex-form' do + .email-field.input-field.big + = email_field_tag :email, nil, required: true + = label_tag :email + = button_tag :continue, :value => :confirm_email += columns(medium: 12, class: 'flex-column') do + %p.stretch-item=_'articles.conference_registration.paragraphs.facebook_sign_in' + = link_to (_'forms.actions.generic.facebook_sign_in','Facebook Sign In'), auth_at_provider_path(:provider => :facebook), class: [:button, :facebook]