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-12-28 00:53:45 +01:00
parent 8b10b2accf
commit cc224ac80d
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/layout_ref.coffee
View file

@ -2045,7 +2045,7 @@ class ChatWindowRef extends Spine.Controller
timestamp = Date.now() timestamp = Date.now()
if !@lastTimestamp or timestamp - @lastTimestamp > @showTimeEveryXMinutes * 60000 if !@lastTimestamp or timestamp - @lastTimestamp > @showTimeEveryXMinutes * 60000
label = 'Today' label = 'today'
time = new Date().toTimeString().substr(0,5) time = new Date().toTimeString().substr(0,5)
if @lastAddedType is 'timestamp' if @lastAddedType is 'timestamp'
# update last time # update last time

2
app/assets/javascripts/app/views/channel/chat.jst.eco
View file

@ -64,7 +64,7 @@
</div> </div>
</div> </div>
<div class="zammad-chat-body"> <div class="zammad-chat-body">
<div class="zammad-chat-timestamp"><strong><%- @T('Today') %></strong> 14:45</div> <div class="zammad-chat-timestamp"><strong><%- @T('today') %></strong> 14:45</div>
<div class="zammad-chat-message zammad-chat-message--customer"> <div class="zammad-chat-message zammad-chat-message--customer">
<span class="zammad-chat-message-body js-backgroundColor"><%- @T('Hello! I need help with your product.') %></span> <span class="zammad-chat-message-body js-backgroundColor"><%- @T('Hello! I need help with your product.') %></span>
</div> </div>

6
db/seeds.rb
View file

@ -796,9 +796,9 @@ Setting.create_if_not_exists(
name: 'ticket_hook_position', name: 'ticket_hook_position',
tag: 'select', tag: 'select',
options: { options: {
'left' => 'Left', 'left' => 'left',
'right' => 'Right', 'right' => 'right',
'none' => 'None', 'none' => 'none',
}, },
}, },
], ],