FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix tests

This commit is contained in:
Yuki 2015-06-07 06:27:21 +05:30
parent 80b1c1af96
commit ce2323d675
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@ -9,6 +9,8 @@ class ApplicationController < ActionController::Base
# check if user wants to read # check if user wants to read
def check_locale def check_locale
return I18n.locale = 'en' if Rails.env.test?
if params[:hl].nil? if params[:hl].nil?
if current_user.present? if current_user.present?
I18n.locale = current_user.locale I18n.locale = current_user.locale

2
app/views/inbox/_entry.html.haml
View File

@ -33,4 +33,4 @@
%input{type: 'checkbox', name: 'ib-share', checked: :checked, data: { ib_id: i.id, service: service.provider }} %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) = raw t('views.inbox.entry.sharing.post', service: service.provider.capitalize)
- else - 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))