Browse Source

Fixed missing translation on register page

* Fixed missing translation for registration page title

* Update conferences_controller.rb
development
Godwin 9 years ago
committed by GitHub
parent
commit
b2cb7e8c1f
  1. 1
      app/controllers/conferences_controller.rb
  2. 8
      app/views/conferences/_confirm_email.html.haml

1
app/controllers/conferences_controller.rb

@ -531,6 +531,7 @@ class ConferencesController < ApplicationController
@is_host = @this_conference.host? current_user @is_host = @this_conference.host? current_user
else else
@page_title = "articles.conference_registration.headings.#{@this_conference.registration_status == :open ? '': 'Pre_'}Registration_Details"
@register_template = :confirm_email @register_template = :confirm_email
end end

8
app/views/conferences/_confirm_email.html.haml

@ -1,15 +1,13 @@
%article = columns(medium: 12) do
= 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" %p=_"articles.conference_registration.paragraphs.#{@this_conference.registration_status == :open ? '': 'Pre_'}Registration_Details"
%h3=_'articles.conference_registration.headings.Verify_Account' %h3=_'articles.conference_registration.headings.Verify_Account'
%p=_'articles.conference_registration.paragraphs.Verify_Account' %p=_'articles.conference_registration.paragraphs.Verify_Account'
= columns(medium: 12) do
= form_tag register_path(@this_conference.slug), class: 'flex-form' do = form_tag register_path(@this_conference.slug), class: 'flex-form' do
.email-field.input-field.big .email-field.input-field.big
= email_field_tag :email, nil, required: true = email_field_tag :email, nil, required: true
= label_tag :email = label_tag :email
= button_tag :continue, :value => :confirm_email = button_tag :continue, :value => :confirm_email
= columns(medium: 12, class: 'flex-column') do = columns(medium: 12, class: 'flex-column') do
%p.stretch-item=_'articles.conference_registration.paragraphs.facebook_sign_in' %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] = link_to (_'forms.actions.generic.facebook_sign_in','Facebook Sign In'), auth_at_provider_path(:provider => :facebook), class: [:button, :facebook]

Loading…
Cancel
Save