bike/BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Fixed ocale not found translations and copy on email confirmation page

Browse Source
This commit is contained in:
Godwin 2016-07-22 16:42:43 -07:00
parent b2cb7e8c1f
commit 79bb86e8c7
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/_application.scss
View File

@ -1175,7 +1175,7 @@ ul.warnings li,
ul { ul {
@include _-(display, flex); @include _-(display, flex);
list-style: none; list-style: none;
margin: 2em 0 5em; margin: 2em 2em 5em 0;
padding: 0; padding: 0;
} }
@ -3630,7 +3630,7 @@ html[data-ontop] {
.flow-steps { .flow-steps {
ul { ul {
margin-bottom: 1em; margin: 2em 0 1em 0;
} }
.step { .step {

2
app/controllers/application_controller.rb
View File

@ -194,7 +194,7 @@ class ApplicationController < LinguaFrancaApplicationController
end end
def locale_not_available!(locale = nil) def locale_not_available!(locale = nil)
# set_default_locale set_default_locale
params[:_original_action] = params[:action] params[:_original_action] = params[:action]
params[:action] = 'error-locale-not-available' params[:action] = 'error-locale-not-available'
@page_title = 'page_titles.404.Locale_Not_Available' @page_title = 'page_titles.404.Locale_Not_Available'

5
app/controllers/conferences_controller.rb
View File

@ -531,7 +531,6 @@ 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
@ -880,8 +879,8 @@ class ConferencesController < ApplicationController
@entire_page = true @entire_page = true
get_scheule_data get_scheule_data
end end
when :done when :confirm_email
@amount = ((@registration.registration_fees_paid || 0) * 100).to_i.to_s.gsub(/^(.*)(\d\d)$/, '\1.\2') @page_title = "articles.conference_registration.headings.#{@this_conference.registration_status == :open ? '': 'Pre_'}Registration_Details"
end end
end end