From 79bb86e8c7ae4393376212ea94209e14ad584dbc Mon Sep 17 00:00:00 2001
From: Godwin <goodgodwin@hotmail.com>
Date: Fri, 22 Jul 2016 16:42:43 -0700
Subject: [PATCH] Fixed ocale not found translations and copy on email
 confirmation page

---
 app/assets/stylesheets/_application.scss  | 4 ++--
 app/controllers/application_controller.rb | 2 +-
 app/controllers/conferences_controller.rb | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss
index 775872a..c3310ac 100644
--- a/app/assets/stylesheets/_application.scss
+++ b/app/assets/stylesheets/_application.scss
@@ -1175,7 +1175,7 @@ ul.warnings li,
 	ul {
 		@include _-(display, flex);
 		list-style: none;
-		margin: 2em 0 5em;
+		margin: 2em 2em 5em 0;
 		padding: 0;
 	}
 
@@ -3630,7 +3630,7 @@ html[data-ontop] {
 
 	.flow-steps {
 		ul {
-			margin-bottom: 1em;
+			margin: 2em 0 1em 0;
 		}
 
 		.step {
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e4903c3..5c9e8b6 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -194,7 +194,7 @@ class ApplicationController < LinguaFrancaApplicationController
 	end
 	
 	def locale_not_available!(locale = nil)
-		# set_default_locale
+		set_default_locale
 		params[:_original_action] = params[:action]
 		params[:action] = 'error-locale-not-available'
 		@page_title = 'page_titles.404.Locale_Not_Available'
diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb
index c779791..0bceebe 100644
--- a/app/controllers/conferences_controller.rb
+++ b/app/controllers/conferences_controller.rb
@@ -531,7 +531,6 @@ 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
 
@@ -880,8 +879,8 @@ class ConferencesController < ApplicationController
 				@entire_page = true
 				get_scheule_data
 			end
-		when :done
-			@amount = ((@registration.registration_fees_paid || 0) * 100).to_i.to_s.gsub(/^(.*)(\d\d)$/, '\1.\2')
+		when :confirm_email
+			@page_title = "articles.conference_registration.headings.#{@this_conference.registration_status == :open ? '': 'Pre_'}Registration_Details"
 		end
 
 	end