diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index d753d06..1c03f0d 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -4,7 +4,7 @@ class AdminController < ApplicationController def new return do_404 unless logged_in? && current_user.administrator? @this_conference = Conference.new - @page_title = 'articles.conferences.headings.new' + @main_title = @page_title = 'articles.conferences.headings.new' end def edit diff --git a/app/views/admin/new.html.haml b/app/views/admin/new.html.haml index 0730908..63cf736 100644 --- a/app/views/admin/new.html.haml +++ b/app/views/admin/new.html.haml @@ -5,7 +5,7 @@ = row do = form_tag save_conference_path, class: 'composition' do = columns(medium: 12) do - %h2=_@page_title, :t + %h2=_"articles.conferences.headings.#{@this_conference.id.present? ? 'edit' : 'new'}_conference", :t, vars: { title: @this_conference.title } = hidden_field_tag :id, @this_conference.id if @this_conference.id.present? = columns(medium: 12) do diff --git a/config/locales/en.yml b/config/locales/en.yml index 04f94c6..c5adb0d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -933,6 +933,9 @@ en: conferences: National and Regional Conferences Conference_List: Conferences edit: Edit Conference + new: New Conference + edit_conference: Edit %{title} + new_conference: Create a new conference types: future: Upcoming conferences passed: Passed conferences