diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 09191790..474d3bb4 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -9,6 +9,8 @@ class ApplicationController < ActionController::Base # check if user wants to read def check_locale + return I18n.locale = 'en' if Rails.env.test? + if params[:hl].nil? if current_user.present? I18n.locale = current_user.locale diff --git a/app/views/inbox/_entry.html.haml b/app/views/inbox/_entry.html.haml index 1a514547..fcc37568 100644 --- a/app/views/inbox/_entry.html.haml +++ b/app/views/inbox/_entry.html.haml @@ -33,4 +33,4 @@ %input{type: 'checkbox', name: 'ib-share', checked: :checked, data: { ib_id: i.id, service: service.provider }} = raw t('views.inbox.entry.sharing.post', service: service.provider.capitalize) - else - %p= raw t('views.inbox.entry.sharing.none', settings: link_to(t('views.inbox.entry.sharing.settings', services_path))) + %p= raw t('views.inbox.entry.sharing.none', settings: link_to(t('views.inbox.entry.sharing.settings'), services_path))