diff --git a/app/assets/javascripts/app/controllers/agent_ticket_history.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_history.js.coffee
index 60913ff5d..1d2767d67 100644
--- a/app/assets/javascripts/app/controllers/agent_ticket_history.js.coffee
+++ b/app/assets/javascripts/app/controllers/agent_ticket_history.js.coffee
@@ -66,9 +66,9 @@ class App.TicketHistory extends App.ControllerModal
sortorder: (e) ->
e.preventDefault()
- idDown = @el.find('[data-type="sortorder"]').hasClass('down')
+ isDown = @el.find('[data-type="sortorder"]').hasClass('down')
- if idDown
+ if isDown
@render( @historyListCache, 'up' )
else
@render( @historyListCache.reverse(), 'down' )
diff --git a/app/assets/javascripts/app/views/agent_ticket_history.jst.eco b/app/assets/javascripts/app/views/agent_ticket_history.jst.eco
index 06684cfaf..2b1d1415e 100644
--- a/app/assets/javascripts/app/views/agent_ticket_history.jst.eco
+++ b/app/assets/javascripts/app/views/agent_ticket_history.jst.eco
@@ -23,7 +23,7 @@
<% end %>
<% if ( item['type'] is 'notification' || item['type'] is 'email' ): %>
- <%= item['type'] %>
+ <%- @T( item['type'] ) %>
<% if item['value_from']: %>
"<%= item['value_from'] %>" <%- @T( 'sent to' ) %>
<% end %>
@@ -31,7 +31,7 @@
"<%= item['value_to'] %>"
<% end %>
<% else: %>
- <%= item['type'] %> <%= item['object'] %> <% if item['attribute']: %>"<%= item['attribute'] %>"<% end %>
+ <%- @T( item['type'] ) %> <%= item['object'] %> <% if item['attribute']: %>"<%= item['attribute'] %>"<% end %>
<% if item['value_from']: %>
<% if item['value_to']: %>
<%- @T( 'from' ) %>
diff --git a/db/seeds.rb b/db/seeds.rb
index 3ad5661b7..5df6d0797 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1862,6 +1862,8 @@ Translation.create_if_not_exists( :locale => 'de', :source => "Thanks for your F
Translation.create_if_not_exists( :locale => 'de', :source => "What can you do here?", :target => "Was können Sie hier machen?" )
Translation.create_if_not_exists( :locale => 'de', :source => "Here you can create one.", :target => "Hier können Sie eins erstellen." )
Translation.create_if_not_exists( :locale => 'de', :source => "Fold in", :target => "Einklappen" )
+Translation.create_if_not_exists( :locale => 'de', :source => "from", :target => "von" )
+Translation.create_if_not_exists( :locale => 'de', :source => "to", :target => "nach" )
#Translation.create_if_not_exists( :locale => 'de', :source => "", :target => "" )