Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved wording.

Browse source
This commit is contained in:
Martin Edenhofer 2015-06-12 07:59:06 +02:00
parent b3bbcc0b60
commit ff41b81713
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/widget/maintenance.js.coffee
View file

@ -14,7 +14,7 @@ class Widget extends App.Controller
showMessage: (message = {}) => showMessage: (message = {}) =>
if message.reload if message.reload
@disconnectClient() @disconnectClient()
button = 'Reload application' button = 'Continue session'
# convert to html and linkify # convert to html and linkify
message.message = App.Utils.textCleanup( message.message ) message.message = App.Utils.textCleanup( message.message )

4
app/assets/javascripts/app/controllers/widget/session_taken_over.js.coffee
View file

@ -40,11 +40,11 @@ class Widget extends App.Controller
if data.taskbar_id isnt App.TaskManager.TaskbarId() if data.taskbar_id isnt App.TaskManager.TaskbarId()
@error = new App.SessionMessage( @error = new App.SessionMessage(
head: 'Session' head: 'Session'
message: 'Session taken over... please reload page or work with other browser window.' message: App.i18n.translateInline('A new session with your account was created. This session will be stopped to prevent a conflict.')
keyboard: false keyboard: false
backdrop: true backdrop: true
close: false close: false
button: 'Reload application' button: 'Continue session'
forceReload: true forceReload: true
) )
@disconnectClient() @disconnectClient()

2
test/browser/maintenance_message_test.rb
View file

@ -162,7 +162,7 @@ class MaintenanceMessageTest < TestCase
watch_for( watch_for(
browser: browser2, browser: browser2,
css: '.modal', css: '.modal',
value: 'Reload application', value: 'Continue session',
) )
match_not( match_not(