-#{article.body.text2html} --
-#{article.body.text2html} --
Hallo <%= d 'user.firstname' %>,
+das Passwort für Dein <%= c 'product_name' %> Account <%= d 'user.login' %> wurde kürzlich geändert.
+Diese Aktivität ist Dir nicht bekannt? In diesen Fall kontaktiere Deinen System-Administrator.
+Dein <%= c 'product_name' %> Team
diff --git a/app/views/mailer/password_change/en.html.erb b/app/views/mailer/password_change/en.html.erb new file mode 100644 index 000000000..f48793398 --- /dev/null +++ b/app/views/mailer/password_change/en.html.erb @@ -0,0 +1,9 @@ +Your <%= c 'product_name' %> password has been changed + +Hi <%= d 'user.firstname' %>,
+the password for your <%= c 'product_name' %> account <%= d 'user.login' %> has been changed recently.
+This activity is not known to you? If not, contact your system administrator.
+Your <%= c 'product_name' %> Team
diff --git a/app/views/mailer/password_reset/de.html.erb b/app/views/mailer/password_reset/de.html.erb new file mode 100644 index 000000000..be18e9d3c --- /dev/null +++ b/app/views/mailer/password_reset/de.html.erb @@ -0,0 +1,17 @@ +Zurücksetzen Deines <%= c 'product_name' %> Passworts + ++Hallo <%= d 'user.firstname' %>, +
+wir haben eine Anfrage zum Zurücksetzen des Passworts für <%= c 'product_name' %> Account <%= d 'user.login' %> erhalten.
+Wenn Sie Ihr Passwort zurückzusetzen wollen, klicken Sie auf den unten stehenden Link (oder kopieren Sie die URL in den Browser einfügen):
+<%= c 'http_type' %>://<%= c 'fqdn' %>/#password_reset_verify/<%= d 'token.name' %>
+Dieser Link führt Sie zu einer Seite, auf der Sie Ihr Passwort ändern können.
+Wenn Sie Ihr Passwort nicht zurücksetzen wollen, ignorieren Sie diese Meldung. Das Passwort bleibt unverändert.
+Dein <%= c 'product_name' %> Team
diff --git a/app/views/mailer/password_reset/en.html.erb b/app/views/mailer/password_reset/en.html.erb new file mode 100644 index 000000000..33dbecf6b --- /dev/null +++ b/app/views/mailer/password_reset/en.html.erb @@ -0,0 +1,15 @@ +Reset your <%= c 'product_name' %> password + +Hi <%= d 'user.firstname' %>,
+We received a request to reset the password for your <%= c 'product_name' %> account <%= d 'user.login' %>.
+If you want to reset your password, click on the link below (or copy and paste the URL into your browser):
+<%= c 'http_type' %>://<%= c 'fqdn' %>/#password_reset_verify/<%= d 'token.name' %>
+This link takes you to a page where you can change your password.
+If you don't want to reset your password, please ignore this message. Your password will not be reset.
+Your <%= c 'product_name' %> Team
diff --git a/app/views/mailer/signup/de.html.erb b/app/views/mailer/signup/de.html.erb new file mode 100644 index 000000000..39054ac01 --- /dev/null +++ b/app/views/mailer/signup/de.html.erb @@ -0,0 +1,9 @@ +Bestätigung des <%= c 'product_name' %> Accounts, <%= d 'user.firstname' %> <%= d 'user.lastname' %> + +Hallo <%= d 'user.firstname' %>,
+bestätige Deine E-Mail-Adresse um Deine Registrierung bei <%= c 'product_name' %> abzuschließen. Es ist einfach - klick einfach auf den Link unten.
+<%= c 'http_type' %>://<%= c 'fqdn' %>/#email_verify/<%= d 'token.name' %>
+Dein <%= c 'product_name' %> Team
diff --git a/app/views/mailer/signup/en.html.erb b/app/views/mailer/signup/en.html.erb new file mode 100644 index 000000000..f0818eb3a --- /dev/null +++ b/app/views/mailer/signup/en.html.erb @@ -0,0 +1,9 @@ +Confirm your <%= c 'product_name' %> account, <%= d 'user.firstname' %> <%= d 'user.lastname' %> + +Hi <%= d 'user.firstname' %>,
+confirm your email address to complete your <%= c 'product_name' %> account. It's easy, just click the link below.
+<%= c 'http_type' %>://<%= c 'fqdn' %>/#email_verify/<%= d 'token.name' %>
+Your <%= c 'product_name' %> Team
diff --git a/app/views/mailer/ticket_create/de.html.erb b/app/views/mailer/ticket_create/de.html.erb new file mode 100644 index 000000000..5d5c07a02 --- /dev/null +++ b/app/views/mailer/ticket_create/de.html.erb @@ -0,0 +1,24 @@ +Neues Ticket (<%= d 'ticket.title' %>) + +Hallo <%= d 'recipient.firstname' %>,
+es wurde ein neues Ticket (<%= d 'ticket.title' %>) von "<%= d 'ticket.updated_by.fullname' %>" erstellt.
+
+<%= t 'Group' %>: <%= d 'ticket.group.name' %>
+<%= t 'Owner' %>: <%= d 'ticket.owner.fullname' %>
+<%= t 'State' %>: <%= t d 'ticket.state.name' %>
+
+ <%= t 'Information' %>: +
+ <%= d('article.body').text2html %> ++ +<% end %> +
+ <%= t 'View this in Zammad' %> +
diff --git a/app/views/mailer/ticket_create/en.html.erb b/app/views/mailer/ticket_create/en.html.erb new file mode 100644 index 000000000..78dda990c --- /dev/null +++ b/app/views/mailer/ticket_create/en.html.erb @@ -0,0 +1,24 @@ +New Ticket (<%= d 'ticket.title' %>) + +Hi <%= d 'recipient.firstname' %>,
+a new Ticket (<%= d 'ticket.title' %>) has been created by "<%= d 'ticket.updated_by.fullname' %>".
+
+<%= t 'Group' %>: <%= d 'ticket.group.name' %>
+<%= t 'Owner' %>: <%= d 'ticket.owner.fullname' %>
+<%= t 'State' %>: <%= t d 'ticket.state.name' %>
+
+ <%= t 'Information' %>: +
+ <%= d('article.body').text2html %> ++ +<% end %> +
+ <%= t 'View this in Zammad' %> +
diff --git a/app/views/mailer/ticket_update/de.html.erb b/app/views/mailer/ticket_update/de.html.erb new file mode 100644 index 000000000..e1ded5b70 --- /dev/null +++ b/app/views/mailer/ticket_update/de.html.erb @@ -0,0 +1,29 @@ +Ticket aktualisiert (<%= d 'ticket.title' %>) + +Hi <%= d 'recipient.firstname' %>,
+
+ <%= t 'Changes' %>:
+ <% @objects[:changes].each do |key, value| %>
+ <%= t key %>: <%= h value[0] %> -> <%= h value[1] %>
+ <% end %>
+
+ <%= t 'Information' %>: +
+ <%= a 'article' %> ++ +<% end %> +
+ <%= t 'View this in Zammad' %> +
diff --git a/app/views/mailer/ticket_update/en.html.erb b/app/views/mailer/ticket_update/en.html.erb new file mode 100644 index 000000000..e8ac7cd50 --- /dev/null +++ b/app/views/mailer/ticket_update/en.html.erb @@ -0,0 +1,29 @@ +Updated Ticket (<%= d 'ticket.title' %>) + +Hi <%= d 'recipient.firstname' %>,
+
+ <%= t 'Changes' %>:
+ <% @objects[:changes].each do |key, value| %>
+ <%= t key %>: <%= h value[0] %> -> <%= h value[1] %>
+ <% end %>
+
+ <%= t 'Information' %>: +
+ <%= d('article.body').text2html %> ++ +<% end %> +
+ <%= t 'View this in Zammad' %> +
diff --git a/app/views/mailer/user_device/de.html.erb b/app/views/mailer/user_device/de.html.erb new file mode 100644 index 000000000..254f1c610 --- /dev/null +++ b/app/views/mailer/user_device/de.html.erb @@ -0,0 +1,18 @@ +<%= c 'product_name' %>-Anmeldung erfasst von einem neuen Gerät + +Hallo <%= d 'user.firstname' %>,
+es sieht aus, als ob Du Dich bei <%= c 'product_name' %> mit einem neuen Gerät um "<%= d 'user_device.created_at' %>" angemeldet hast:
+
+Deine Lokation (relativ): <%= d 'user_device.location' %>
+Deine IP: <%= d 'user_device.ip' %>
+
+
Das Gerät wurde in die Liste der bekannten Geräte hinzugefügt, diese Liste kannst Du hier einsehen:
+<%= c 'http_type' %>://<%= c 'fqdn' %>/#profile/devices
+Wenn dies nicht Du warst, entferne das Gerät aus der Liste, ändere Dein Account-Passwort und kontaktieren Deinen Administrator. Jemand könnte unberechtigten Zugriff auf Dein Konto bekommen haben.
+Dein <%= c 'product_name' %> Team
diff --git a/app/views/mailer/user_device/en.html.erb b/app/views/mailer/user_device/en.html.erb new file mode 100644 index 000000000..57a33213b --- /dev/null +++ b/app/views/mailer/user_device/en.html.erb @@ -0,0 +1,18 @@ +<%= c 'product_name' %> signin detected from a new device + +Hi <%= d 'user.firstname' %>,
+it looks like you signed into your <%= c 'product_name' %> account using a new device on "<%= d 'user_device.created_at' %>":
+
+Your Location: <%= d 'user_device.location' %>
+Your IP: <%= d 'user_device.ip' %>
+
+
Your device has been added to your list of known devices, which you can view here:
+<%= c 'http_type' %>://<%= c 'fqdn' %>/#profile/devices
+If this wasn't you, remove the device, changing your account password, and contacting your administrator. Somebody might have gained unauthorized access to your account.
+Your <%= c 'product_name' %> Team
diff --git a/app/views/mailer/user_invite/de.html.erb b/app/views/mailer/user_invite/de.html.erb new file mode 100644 index 000000000..c9f39e4e4 --- /dev/null +++ b/app/views/mailer/user_invite/de.html.erb @@ -0,0 +1,13 @@ +Einladung zu <%= c 'product_name' %> über <%= c 'fqdn' %> + +Hallo <%= d 'user.firstname' %>,
+Ich (<%= d 'current_user.firstname' %> <%= d 'current_user.lastname' %>) möchte Dich zu <%= c 'product_name' %> einladen - unsere Kundensupport / Ticket System Platform.
+Um sich anzumelden kann hier das Password gesetzt werden.
+Enjoy,
+<%= d 'current_user.firstname' %> <%= d 'current_user.lastname' %>
+Dein <%= c 'product_name' %> Team
diff --git a/app/views/mailer/user_invite/en.html.erb b/app/views/mailer/user_invite/en.html.erb new file mode 100644 index 000000000..54a09d366 --- /dev/null +++ b/app/views/mailer/user_invite/en.html.erb @@ -0,0 +1,13 @@ +Invitation to <%= c 'product_name' %> at <%= c 'fqdn' %> + +Hi <%= d 'user.firstname' %>,
+I (<%= d 'current_user.firstname' %> <%= d 'current_user.lastname' %>) invite you to <%= c 'product_name' %> - our customer support / ticket system platform.
+Click here and set your password.
+Enjoy,
+<%= d 'current_user.firstname' %> <%= d 'current_user.lastname' %>
+Your <%= c 'product_name' %> Team
diff --git a/lib/notification_factory.rb b/lib/notification_factory.rb index e393330bb..8db5e1540 100644 --- a/lib/notification_factory.rb +++ b/lib/notification_factory.rb @@ -2,6 +2,8 @@ module NotificationFactory =begin +# deprecated, will be removed with 2.0 + result_string = NotificationFactory.build( string: 'Hi #{recipient.firstname},', objects: { @@ -125,4 +127,172 @@ module NotificationFactory true ) end + +=begin + + NotificationFactory.notification( + template: 'password_reset', + user: User.find(2), + objects: { + recipient: User.find(2), + }, + ) + +=end + + def self.notification(data) + + # get subject + result = NotificationFactory.template( + template: data[:template], + locale: data[:user].preferences[:locale], + objects: data[:objects], + ) + + NotificationFactory.send( + recipient: data[:user], + subject: result[:subject], + body: result[:body], + content_type: 'text/html', + ) + end + +=begin + + result = NotificationFactory.template( + template: 'password_reset', + locale: 'en-us', + objects: { + recipient: User.find(2), + }, + ) + + result = NotificationFactory.template( + templateInline: "Invitation to <%= c 'product_name' %> at <%= c 'fqdn' %>", + locale: 'en-us', + objects: { + recipient: User.find(2), + }, + ) + +=end + + def self.template(data) + + if data[:templateInline] + return NotificationFactory::Template.new(data[:objects], data[:locale], data[:templateInline], false).render + end + + template_subject = nil + template_body = '' + locale = data[:locale] || 'en' + template = data[:template] + location = "app/views/mailer/#{template}/#{locale}.html.erb" + + # as fallback, use 2 char locale + if !File.exist?(location) + locale = locale[0, 2] + location = "app/views/mailer/#{template}/#{locale}.html.erb" + end + + # as fallback, use en + if !File.exist?(location) + location = "app/views/mailer/#{template}/en.html.erb" + end + + File.open(location, 'r:UTF-8').each do |line| + if !template_subject + template_subject = line + next + end + template_body += line + end + + message_subject = NotificationFactory::Template.new(data[:objects], data[:locale], template_subject, false).render + message_body = NotificationFactory::Template.new(data[:objects], data[:locale], template_body).render + + application_template = nil + File.open('app/views/mailer/application.html.erb', 'r:UTF-8') do |file| + application_template = file.read + end + data[:objects][:message] = message_body + message_body = NotificationFactory::Template.new(data[:objects], data[:locale], application_template).render + { + subject: message_subject, + body: message_body, + } + end + + class Template + + def initialize(objects, locale, template, escape = true) + @objects = objects + @locale = locale || 'en-us' + @template = template + @escape = escape + end + + def render + ERB.new(@template).result(binding) + end + + def d(key, escape = nil) + + # do validaton, ignore some methodes + if key =~ /(`|\.(|\s*)(save|destroy|delete|remove|drop|update\(|update_att|create\(|new|all|where|find))/i + return "#{key} (not allowed)" + end + + value = nil + object_methods = key.split('.') + object_name = object_methods.shift.to_sym + object_refs = @objects[object_name] + object_methods_s = '' + object_methods.each {|method| + if object_methods_s != '' + object_methods_s += '.' + end + object_methods_s += method + + # if method exists + if !object_refs.respond_to?( method.to_sym ) + value = "\#{#{object_name}.#{object_methods_s} / no such method}" + break + end + object_refs = object_refs.send( method.to_sym ) + } + placeholder = if !value + object_refs + else + value + end + return placeholder if escape == false || (escape.nil? && !@escape) + h placeholder + end + + def c(key, escape = nil) + config = Setting.get(key) + return config if escape == false || (escape.nil? && !@escape) + h config + end + + def t(key, escape = nil) + translation = Translation.translate(@locale, key) + return translation if escape == false || (escape.nil? && !@escape) + h translation + end + + def a(article) + content_type = d "#{article}.content_type", false + if content_type =~ /html/ + return d "#{article}.body", false + end + d("#{article}.content_type", false).text2html + end + + def h(key) + return key if !key + CGI.escapeHTML(key.to_s) + end + end end diff --git a/lib/static_assets.rb b/lib/static_assets.rb index 2ce877a28..722b27de1 100644 --- a/lib/static_assets.rb +++ b/lib/static_assets.rb @@ -122,7 +122,7 @@ returns # store hash in config if list && list[0] - file = Store.find(list[0]) + file = Store.find(list[0].id) filelocation = filename(file) Setting.set('product_logo', filelocation) return file diff --git a/test/unit/notification_factory_test.rb b/test/unit/notification_factory_test.rb index cc695ea34..b6c03e5a3 100644 --- a/test/unit/notification_factory_test.rb +++ b/test/unit/notification_factory_test.rb @@ -296,4 +296,139 @@ next line, Group: Users', ticket.destroy end + + test 'notifications template' do + groups = Group.where(name: 'Users') + roles = Role.where(name: 'Agent') + agent1 = User.create_or_update( + login: 'notification-template-agent1@example.com', + firstname: 'Notificationxxx', + lastname: 'Agent1yyy', + email: 'notification-template-agent1@example.com', + password: 'agentpw', + active: true, + roles: roles, + groups: groups, + preferences: { + locale: 'de-de', + }, + updated_by_id: 1, + created_by_id: 1, + ) + + result = NotificationFactory.template( + template: 'password_reset', + locale: 'de-de', + objects: { + user: agent1, + }, + ) + assert_match('Zurücksetzen Deines', result[:subject]) + assert_match('wir haben eine Anfrage zum Zurücksetzen', result[:body]) + assert_match('Dein', result[:body]) + assert_match('Dein', result[:body]) + assert_match('Notification<b>xxx</b>', result[:body]) + assert_no_match('Your', result[:body]) + + result = NotificationFactory.template( + template: 'password_reset', + locale: 'de', + objects: { + user: agent1, + }, + ) + assert_match('Zurücksetzen Deines', result[:subject]) + assert_match('wir haben eine Anfrage zum Zurücksetzen', result[:body]) + assert_match('Dein', result[:body]) + assert_match('Notification<b>xxx</b>', result[:body]) + assert_no_match('Your', result[:body]) + + result = NotificationFactory.template( + template: 'password_reset', + locale: 'es-us', + objects: { + user: agent1, + }, + ) + assert_match('Reset your', result[:subject]) + assert_match('We received a request to reset the password', result[:body]) + assert_match('Your', result[:body]) + assert_match('Notification<b>xxx</b>', result[:body]) + assert_no_match('Dein', result[:body]) + + ticket = Ticket.first + article = ticket.articles.first + changes = {} + result = NotificationFactory.template( + template: 'ticket_create', + locale: 'es-us', + objects: { + ticket: ticket, + article: article, + recipient: agent1, + changes: changes, + }, + ) + assert_match('New Ticket', result[:subject]) + assert_match('Notification<b>xxx</b>', result[:body]) + assert_match('has been created by', result[:body]) + assert_match('Manage your notifications settings', result[:body]) + assert_no_match('Dein', result[:body]) + + result = NotificationFactory.template( + template: 'ticket_create', + locale: 'de-de', + objects: { + ticket: ticket, + article: article, + recipient: agent1, + changes: changes, + }, + ) + assert_match('Neues Ticket', result[:subject]) + assert_match('Notification<b>xxx</b>', result[:body]) + assert_match('es wurde ein neues Ticket', result[:body]) + assert_match('Manage your notifications settings', result[:body]) + assert_no_match('Your', result[:body]) + + ticket = Ticket.first + article = ticket.articles.first + changes = { + state: %w(aaa bbb), + group: %w(xxx yyy), + } + result = NotificationFactory.template( + template: 'ticket_update', + locale: 'es-us', + objects: { + ticket: ticket, + article: article, + recipient: agent1, + changes: changes, + }, + ) + assert_match('Updated Ticket', result[:subject]) + assert_match('Notification<b>xxx</b>', result[:body]) + assert_match('has been updated by', result[:body]) + assert_match('Manage your notifications settings', result[:body]) + assert_no_match('Dein', result[:body]) + + result = NotificationFactory.template( + template: 'ticket_update', + locale: 'de-de', + objects: { + ticket: ticket, + article: article, + recipient: agent1, + changes: changes, + }, + ) + assert_match('Ticket aktualisiert', result[:subject]) + assert_match('Notification<b>xxx</b>', result[:body]) + assert_match('wurde von', result[:body]) + assert_match('Manage your notifications settings', result[:body]) + assert_no_match('Your', result[:body]) + + end + end diff --git a/test/unit/ticket_notification_test.rb b/test/unit/ticket_notification_test.rb index 4eb878893..5f0885bac 100644 --- a/test/unit/ticket_notification_test.rb +++ b/test/unit/ticket_notification_test.rb @@ -927,129 +927,142 @@ class TicketNotificationTest < ActiveSupport::TestCase ) # check changed attributes - human_changes = bg.human_changes(agent1, ticket1) + human_changes = bg.human_changes(agent2, ticket1) assert( human_changes['Priority'], 'Check if attributes translated based on ObjectManager::Attribute' ) assert( human_changes['Pending till'], 'Check if attributes translated based on ObjectManager::Attribute' ) - assert_equal( 'i18n(1 low)', human_changes['Priority'][0] ) - assert_equal( 'i18n(2 normal)', human_changes['Priority'][1] ) - assert_equal( 'i18n()', human_changes['Pending till'][0] ) - assert_equal( 'i18n(2015-01-11 23:33:47 UTC)', human_changes['Pending till'][1] ) + assert_equal( '1 low', human_changes['Priority'][0] ) + assert_equal( '2 normal', human_changes['Priority'][1] ) + assert_equal( '', human_changes['Pending till'][0].to_s ) + assert_equal( '2015-01-11 23:33:47 UTC', human_changes['Pending till'][1].to_s ) assert_not( human_changes['priority_id'] ) assert_not( human_changes['pending_time'] ) assert_not( human_changes['pending_till'] ) - # en template - template = bg.template_update(agent2, ticket1, article, human_changes) - assert( template[:subject] ) - assert( template[:body] ) - assert_match( /Priority/, template[:body] ) - assert_match( /1 low/, template[:body] ) - assert_match( /2 normal/, template[:body] ) - assert_match( /Pending till/, template[:body] ) - assert_match( /2015-01-11 23:33:47 UTC/, template[:body] ) - assert_match( /updated/i, template[:subject] ) - # en notification - subject = NotificationFactory.build( + result = NotificationFactory.template( locale: agent2.preferences[:locale], - string: template[:subject], + template: 'ticket_update', objects: { ticket: ticket1, article: article, recipient: agent2, + changes: human_changes, } ) - assert_match( /Bobs's resumé/, subject ) - body = NotificationFactory.build( - locale: agent2.preferences[:locale], - string: template[:body], - objects: { - ticket: ticket1, - article: article, - recipient: agent2, - } - ) - assert_match(/Priority/, body) - assert_match(/1 low/, body) - assert_match(/2 normal/, body) - assert_match(/Pending till/, body) - assert_match(/2015-01-11 23:33:47 UTC/, body) - assert_match(/update/, body) - assert_no_match(/pending_till/, body) - assert_no_match(/i18n/, body) + assert_match(/Bobs's resumé/, result[:subject]) + assert_match(/Priority/, result[:body]) + assert_match(/1 low/, result[:body]) + assert_match(/2 normal/, result[:body]) + assert_match(/Pending till/, result[:body]) + assert_match(/2015-01-11 23:33:47 UTC/, result[:body]) + assert_match(/update/, result[:body]) + assert_no_match(/pending_till/, result[:body]) + assert_no_match(/i18n/, result[:body]) - # de template - template = bg.template_update(agent1, ticket1, article, human_changes) - assert(template[:subject]) - assert(template[:body]) - assert_match(/Priority/, template[:body]) - assert_match(/1 low/, template[:body]) - assert_match(/2 normal/, template[:body]) - assert_match(/Pending till/, template[:body]) - assert_match(/2015-01-11 23:33:47 UTC/, template[:body]) - assert_match(/aktualis/, template[:subject]) + human_changes = bg.human_changes(agent1, ticket1) + assert( human_changes['Priority'], 'Check if attributes translated based on ObjectManager::Attribute' ) + assert( human_changes['Pending till'], 'Check if attributes translated based on ObjectManager::Attribute' ) + assert_equal( '1 niedrig', human_changes['Priority'][0] ) + assert_equal( '2 normal', human_changes['Priority'][1] ) + assert_equal( '', human_changes['Pending till'][0].to_s ) + assert_equal( '2015-01-11 23:33:47 UTC', human_changes['Pending till'][1].to_s ) + assert_not( human_changes['priority_id'] ) + assert_not( human_changes['pending_time'] ) + assert_not( human_changes['pending_till'] ) # de notification - subject = NotificationFactory.build( + result = NotificationFactory.template( locale: agent1.preferences[:locale], - string: template[:subject], - objects: { - ticket: ticket1, - article: article, - recipient: agent2, - } - ) - assert_match(/Bobs's resumé/, subject) - body = NotificationFactory.build( - locale: agent1.preferences[:locale], - string: template[:body], + template: 'ticket_update', objects: { ticket: ticket1, article: article, recipient: agent1, + changes: human_changes, } ) - assert_match(/Priorität/, body) - assert_match(/1 niedrig/, body) - assert_match(/2 normal/, body) - assert_match(/Warten/, body) - assert_match(/2015-01-11 23:33:47 UTC/, body) - assert_match(/aktualis/, body) - assert_no_match(/pending_till/, body) - assert_no_match(/i18n/, body) + assert_match(/Bobs's resumé/, result[:subject]) + assert_match(/Priorität/, result[:body]) + assert_match(/1 niedrig/, result[:body]) + assert_match(/2 normal/, result[:body]) + assert_match(/Warten/, result[:body]) + assert_match(/2015-01-11 23:33:47 UTC/, result[:body]) + assert_match(/aktualis/, result[:body]) + assert_no_match(/pending_till/, result[:body]) + assert_no_match(/i18n/, result[:body]) bg = Observer::Ticket::Notification::BackgroundJob.new( ticket_id: ticket1.id, article_id: article.id, type: 'update', changes: { - title: ['some notification template test 1', 'some notification template test 1 #2'], + title: ['some notification template test old 1', 'some notification template test 1 #2'], priority_id: [2, 3], }, ) - #puts "hc #{human_changes.inspect}" # check changed attributes human_changes = bg.human_changes(agent1, ticket1) assert(human_changes['Title'], 'Check if attributes translated based on ObjectManager::Attribute') assert(human_changes['Priority'], 'Check if attributes translated based on ObjectManager::Attribute') - assert_equal('i18n(2 normal)', human_changes['Priority'][0]) - assert_equal('i18n(3 high)', human_changes['Priority'][1]) - assert_equal('some notification template test 1', human_changes['Title'][0]) + assert_equal('2 normal', human_changes['Priority'][0]) + assert_equal('3 hoch', human_changes['Priority'][1]) + assert_equal('some notification template test old 1', human_changes['Title'][0]) assert_equal('some notification template test 1 #2', human_changes['Title'][1]) assert_not(human_changes['priority_id']) assert_not(human_changes['pending_time']) assert_not(human_changes['pending_till']) + # de notification + result = NotificationFactory.template( + locale: agent1.preferences[:locale], + template: 'ticket_update', + objects: { + ticket: ticket1, + article: article, + recipient: agent1, + changes: human_changes, + } + ) + + assert_match(/Bobs's resumé/, result[:subject]) + assert_match(/Titel/, result[:body]) + assert_no_match(/Title/, result[:body]) + assert_match(/some notification template test old 1/, result[:body]) + assert_match(/some notification template test 1 #2/, result[:body]) + assert_match(/Priorität/, result[:body]) + assert_no_match(/Priority/, result[:body]) + assert_match(/3 hoch/, result[:body]) + assert_match(/2 normal/, result[:body]) + assert_match(/aktualisier/, result[:body]) + human_changes = bg.human_changes(agent2, ticket1) - #puts "hc2 #{human_changes.inspect}" - template = bg.template_update(agent1, ticket1, article, human_changes) - #puts "t1 #{template.inspect}" + # en notification + result = NotificationFactory.template( + locale: agent2.preferences[:locale], + template: 'ticket_update', + objects: { + ticket: ticket1, + article: article, + recipient: agent2, + changes: human_changes, + } + ) - template = bg.template_update(agent2, ticket1, article, human_changes) - #puts "t2 #{template.inspect}" + assert_match(/Bobs's resumé/, result[:subject]) + assert_match(/Title/, result[:body]) + assert_match(/some notification template test old 1/, result[:body]) + assert_match(/some notification template test 1 #2/, result[:body]) + assert_match(/Priority/, result[:body]) + assert_match(/3 high/, result[:body]) + assert_match(/2 normal/, result[:body]) + assert_no_match(/Pending till/, result[:body]) + assert_no_match(/2015-01-11 23:33:47 UTC/, result[:body]) + assert_match(/update/, result[:body]) + assert_no_match(/pending_till/, result[:body]) + assert_no_match(/i18n/, result[:body]) end