Fixed typos.

app/assets/javascripts/app/views/session.jst.eco

@@ -18,7 +18,7 @@
       <tr>
         <td><% if session.data.user: %><%= session.data.user.displayName() %><% end %></td>
         <td title="<%= session.data.user_agent %>"><%= session.data.user_agent %></td>
-        <td title="<%= session.data.remote_id %>"><% if session.data.geo && session.data.geo.country_name: %><%= session.data.geo.country_name %> <%= session.data.geo.city_name %><% else: %><%= session.data.remote_id %><% end %></td>
+        <td title="<%= session.data.remote_ip %>"><% if session.data.geo && session.data.geo.country_name: %><%= session.data.geo.country_name %> <%= session.data.geo.city_name %><% else: %><%= session.data.remote_ip %><% end %></td>
         <td><%- @humanTime(session.created_at) %></td>
         <td><%- @humanTime(session.updated_at) %></td>
         <td><a href="#" data-session-id="<%- session.id %>" class="js-delete" title="<%- @Ti('Delete') %>"><%- @Icon('trash') %></a></td>

app/controllers/application_controller.rb

@@ -84,8 +84,8 @@ def session_update
     session[:ping] = Time.zone.now.iso8601
 
     # check if remote ip need to be updated
-    if !session[:remote_id] || session[:remote_id] != request.remote_ip
-      session[:remote_id]  = request.remote_ip
+    if !session[:remote_ip] || session[:remote_ip] != request.remote_ip
+      session[:remote_ip]  = request.remote_ip
       session[:geo]        = Service::GeoIp.location(request.remote_ip)
     end
 
@@ -122,7 +122,7 @@ def user_device_update
     UserDevice.action(
       session[:user_device_id],
       session[:user_agent],
-      session[:remote_id],
+      session[:remote_ip],
       session[:user_id],
     )
   end

lib/sessions/event/chat_session_init.rb

@@ -6,8 +6,8 @@ def run
 
     # geo ip lookup
     geo_ip = nil
-    if @remote_id
-      geo_ip = Service::GeoIp.location(@remote_id)
+    if @remote_ip
+      geo_ip = Service::GeoIp.location(@remote_ip)
     end
 
     # create chat session
@@ -17,7 +17,7 @@ def run
       state: 'waiting',
       preferences: {
         participants: [@client_id],
-        remote_id: @remote_id,
+        remote_ip: @remote_ip,
         geo_ip: geo_ip,
       },
     )

public/assets/chat/chat.coffee

@@ -170,7 +170,7 @@ do($ = window.jQuery, window) ->
     isOpen: false
     blinkOnlineInterval: null
     stopBlinOnlineStateTimeout: null
-    showTimeEveryXMinutes: 1
+    showTimeEveryXMinutes: 2
     lastTimestamp: null
     lastAddedType: null
     inputTimeout: null
@@ -188,7 +188,7 @@ do($ = window.jQuery, window) ->
         'Today': 'Heute'
         'Send': 'Senden'
         'Compose your message...': 'Ihre Nachricht...'
-        'All colleges are busy.': 'Alle Kollegen sind belegt.'
+        'All colleagues are busy.': 'Alle Kollegen sind belegt.'
         'You are on waiting list position <strong>%s</strong>.': 'Sie sind in der Warteliste an der Position <strong>%s</strong>.'
         'Start new conversation': 'Neue Konversation starten'
         'Since you didn\'t respond in the last %s minutes your conversation with <strong>%s</strong> got closed.': 'Da Sie in den letzten %s Minuten nichts geschrieben haben wurde Ihre Konversation mit <strong>%s</strong> geschlossen.'

public/assets/chat/chat.js

@@ -289,7 +289,7 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
 
     ZammadChat.prototype.stopBlinOnlineStateTimeout = null;
 
-    ZammadChat.prototype.showTimeEveryXMinutes = 1;
+    ZammadChat.prototype.showTimeEveryXMinutes = 2;
 
     ZammadChat.prototype.lastTimestamp = null;
 
@@ -314,7 +314,7 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
         'Today': 'Heute',
         'Send': 'Senden',
         'Compose your message...': 'Ihre Nachricht...',
-        'All colleges are busy.': 'Alle Kollegen sind belegt.',
+        'All colleagues are busy.': 'Alle Kollegen sind belegt.',
         'You are on waiting list position <strong>%s</strong>.': 'Sie sind in der Warteliste an der Position <strong>%s</strong>.',
         'Start new conversation': 'Neue Konversation starten',
         'Since you didn\'t respond in the last %s minutes your conversation with <strong>%s</strong> got closed.': 'Da Sie in den letzten %s Minuten nichts geschrieben haben wurde Ihre Konversation mit <strong>%s</strong> geschlossen.',
@@ -1709,7 +1709,7 @@ window.zammadChatTemplates["waiting"] = function (__obj) {
     (function() {
       __out.push('<div class="zammad-chat-modal">\n  <div class="zammad-chat-modal-text">\n    <span class="zammad-chat-loading-animation">\n      <span class="zammad-chat-loading-circle"></span>\n      <span class="zammad-chat-loading-circle"></span>\n      <span class="zammad-chat-loading-circle"></span>\n    </span>\n    ');
 
-      __out.push(this.T('All colleges are busy.'));
+      __out.push(this.T('All colleagues are busy.'));
 
       __out.push('<br>\n    ');
 

public/assets/chat/views/waiting.eco

@@ -5,7 +5,7 @@
       <span class="zammad-chat-loading-circle"></span>
       <span class="zammad-chat-loading-circle"></span>
     </span>
-    <%- @T('All colleges are busy.') %><br>
+    <%- @T('All colleagues are busy.') %><br>
     <%- @T('You are on waiting list position <strong>%s</strong>.', @position) %>
   </div>
 </div>

script/websocket-server.rb

@@ -111,7 +111,7 @@
           last_ping:   Time.now.utc.to_i,
           error_count: 0,
           headers:     headers,
-          remote_id:   remote_ip,
+          remote_ip:   remote_ip,
         }
       end
     }
@@ -158,7 +158,7 @@
           event: data['event'],
           payload: data,
           session: @clients[client_id][:session],
-          remote_ip: @clients[client_id][:remote_id],
+          remote_ip: @clients[client_id][:remote_ip],
           client_id: client_id,
           clients: @clients,
           options: @options,