diff --git a/app/controllers/application_forms_controller.rb b/app/controllers/application_forms_controller.rb index 496c8e2..10a522e 100644 --- a/app/controllers/application_forms_controller.rb +++ b/app/controllers/application_forms_controller.rb @@ -27,7 +27,7 @@ class ApplicationFormsController < ApplicationController application_forms = application_forms.map do |application_form| link_url = OrbitHelper.url_to_show(application_form.to_param) if (application_form.application_form_start_date <= time_now rescue false) && ( application_form.application_form_end_date.nil? || application_form.application_form_end_date+1 >= time_now ) - sign_up = ('' + I18n.t('application_form.signup') + '').html_safe + sign_up = ('' + I18n.t('application_form.signup') + '').html_safe elsif application_form.registration_status.blank? sign_up = I18n.t('application_form.sign_up_not_open') elsif (application_form.application_form_start_date > @time_now rescue false) @@ -304,7 +304,7 @@ class ApplicationFormsController < ApplicationController application_form = ApplicationFormMain.find_by(uid: params[:uid]) if application_form.application_form_start_date <= time_now && ( application_form.application_form_end_date.nil? || application_form.application_form_end_date+1 >= time_now ) - sign_up = ('' + t('application_form.signup') + '').html_safe + sign_up = ('' + t('application_form.signup') + '').html_safe elsif application_form.registration_status.blank? sign_up = t('application_form.sign_up_not_open') elsif application_form.application_form_start_date > time_now diff --git a/app/views/application_forms/index.html.erb b/app/views/application_forms/index.html.erb index 80d4095..f708ca9 100644 --- a/app/views/application_forms/index.html.erb +++ b/app/views/application_forms/index.html.erb @@ -23,7 +23,7 @@ @application_forms.each do |application_form| if (application_form.application_form_start_date <= @time_now rescue false) and ( application_form.application_form_end_date.nil? or application_form.application_form_end_date+1 >= @time_now ) - sign_up = ('' + t('application_form.signup') + '').html_safe + sign_up = ('' + t('application_form.signup') + '').html_safe elsif application_form.registration_status.blank? sign_up = t('application_form.sign_up_not_open') elsif (application_form.application_form_start_date > @time_now rescue false) @@ -36,9 +36,9 @@ <%= application_form.category.title %> <% if (application_form.enable_custom_template rescue false) %> - <%= ('' + application_form.title + '').html_safe %> + <%= ('' + application_form.title + '').html_safe %> <% else %> - <%= ('' + application_form.title + '').html_safe %> + <%= ('' + application_form.title + '').html_safe %> <% end %>