Merge branch 'develop' of github.com:zammad/zammad into develop

This commit is contained in:
Martin Edenhofer 2017-02-07 12:20:25 +01:00
commit 1e5e6acfef
3 changed files with 60 additions and 0 deletions

View file

@ -0,0 +1,24 @@
Nowe zgłoszenie (#{ticket.title})
<div>Witaj #{recipient.firstname},</div>
<br>
<divOtrzymałeś nowe zgłoszenie (#{ticket.title}) od "<b>#{current_user.longname}</b>".</div>
<br>
<div>
#{t('Group')}: #{ticket.group.name}<br>
#{t('Owner')}: #{ticket.owner.fullname}<br>
#{t('State')}: #{t(ticket.state.name)}<br>
</div>
<br>
<% if @objects[:article] %>
<div>
#{t('Information')}:
<blockquote type="cite">
#{article.body_as_html}
</blockquote>
</div>
<% end %>
<br>
<div>
<a href="#{config.http_type}://#{config.fqdn}/#ticket/zoom/#{ticket.id}" target="zammad_app">#{t('Zobacz w Zammad')}</a>
</div>

View file

@ -0,0 +1,18 @@
Zgłoszenie (#{ticket.title}) zostało eskalowane
<div>Witaj #{recipient.firstname},</div>
<br>
<div>Zgłosznie (#{ticket.title}) od "<b>#{ticket.customer.longname}</b>" jest eskalowane od "#{ticket.escalation_at}"!</div>
<br>
<% if @objects[:article] %>
<div>
#{t('Information')}:
<blockquote type="cite">
#{article.body_as_html}
</blockquote>
</div>
<% end %>
<br>
<div>
<a href="#{config.http_type}://#{config.fqdn}/#ticket/zoom/#{ticket.id}" target="zammad_app">#{t('Zobacz w Zammad')}</a>
</div

View file

@ -0,0 +1,18 @@
Zgłoszenie (#{ticket.title}) zostanie eskalowane
<div>Witaj #{recipient.firstname},</div>
<br>
<div>Zgłosznie (#{ticket.title}) od "<b>#{ticket.customer.longname}</b>" zostanie eskalowane "#{ticket.escalation_at}"!</div>
<br>
<% if @objects[:article] %>
<div>
#{t('Information')}:
<blockquote type="cite">
#{article.body_as_html}
</blockquote>
</div>
<% end %>
<br>
<div>
<a href="#{config.http_type}://#{config.fqdn}/#ticket/zoom/#{ticket.id}" target="zammad_app">#{t('Zobacz w Zammad')}</a>
</div>