Maintenance: Improve translatable strings by using placeholders rather than concatenating fragments.

app/assets/javascripts/app/controllers/_application_controller/_modal_generic_history.coffee

@@ -66,22 +66,24 @@ class App.GenericHistory extends App.ControllerModal
 
       # build content
       content = ''
-      if item.type is 'notification' || item.type is 'email'
-        content = "#{ @T( item.type ) } #{ @T( 'sent to' ) } '#{ item.value_to }'"
+      if item.type is 'notification'
+        content = App.i18n.translateContent( "notification sent to '%s'", item.value_to )
+      if item.type is 'email'
+        content = App.i18n.translateContent( "email sent to '%s'", item.value_to )
       else if item.type is 'received_merge'
         ticket = App.Ticket.find( item.id_from )
         ticket_link = if ticket
                         "<a href=\"#ticket/zoom/#{ item.id_from }\">##{ ticket.number }</a>"
                       else
                         item.value_from
-        content = "#{ @T( 'Ticket' ) } #{ ticket_link } #{ @T( 'was merged into this ticket' ) }"
+        content = App.i18n.translatePlain( 'ticket %s was merged into this ticket', ticket_link )
       else if item.type is 'merged_into'
         ticket = App.Ticket.find( item.id_to )
         ticket_link = if ticket
                         "<a href=\"#ticket/zoom/#{ item.id_to }\">##{ ticket.number }</a>"
                       else
                         item.value_to
-        content = "#{ @T( 'This ticket was merged into' ) } #{ @T( 'ticket' ) } #{ ticket_link }"
+        content = App.i18n.translatePlain( 'this ticket was merged into ticket %s', ticket_link)
       else
         content = "#{ @T( item.type ) } #{ @T(item.object) } "
         if item.attribute

i18n/zammad.pot

@@ -9191,10 +9191,6 @@ msgstr ""
 msgid "This signature is inactive, it won't be included in the reply. Change state <a href=\"#channels/email\">here</a>"
 msgstr ""
 
-#: app/assets/javascripts/app/controllers/_application_controller/_modal_generic_history.coffee
-msgid "This ticket was merged into"
-msgstr ""
-
 #: app/assets/javascripts/app/views/widget/mention.jst.eco
 msgid "This user has no access and will not receive notifications."
 msgstr ""
@@ -9214,7 +9210,6 @@ msgstr ""
 msgid "Thursday"
 msgstr ""
 
-#: app/assets/javascripts/app/controllers/_application_controller/_modal_generic_history.coffee
 #: app/assets/javascripts/app/controllers/_manage/ticket.coffee
 #: app/assets/javascripts/app/controllers/_ui_element/_application_selector.coffee
 #: app/assets/javascripts/app/controllers/_ui_element/core_workflow_condition.coffee
@@ -10948,6 +10943,10 @@ msgstr ""
 msgid "email"
 msgstr ""
 
+#: app/assets/javascripts/app/controllers/_application_controller/_modal_generic_history.coffee
+msgid "email sent to '%s'"
+msgstr ""
+
 #: app/assets/javascripts/app/models/ticket.coffee
 msgid "escalated"
 msgstr ""
@@ -11222,6 +11221,10 @@ msgstr ""
 msgid "note"
 msgstr ""
 
+#: app/assets/javascripts/app/controllers/_application_controller/_modal_generic_history.coffee
+msgid "notification sent to '%s'"
+msgstr ""
+
 #: app/assets/javascripts/app/controllers/knowledge_base/content_can_be_published_form.coffee
 msgid "now"
 msgstr ""
@@ -11326,10 +11329,6 @@ msgstr ""
 msgid "select attachment…"
 msgstr ""
 
-#: app/assets/javascripts/app/controllers/_application_controller/_modal_generic_history.coffee
-msgid "sent to"
-msgstr ""
-
 #: app/assets/javascripts/app/controllers/_ui_element/core_workflow_perform.coffee
 msgid "set fixed to"
 msgstr ""
@@ -11419,10 +11418,17 @@ msgid "telegram personal-message"
 msgstr ""
 
 #: app/assets/javascripts/app/controllers/_application_controller/_modal_generic_history.coffee
+msgid "this ticket was merged into ticket %s"
+msgstr ""
+
 #: lib/calendar_subscriptions/tickets.rb
 msgid "ticket"
 msgstr ""
 
+#: app/assets/javascripts/app/controllers/_application_controller/_modal_generic_history.coffee
+msgid "ticket %s was merged into this ticket"
+msgstr ""
+
 #: lib/calendar_subscriptions/tickets.rb
 msgid "ticket escalation"
 msgstr ""
@@ -11487,10 +11493,6 @@ msgstr ""
 msgid "updated"
 msgstr ""
 
-#: app/assets/javascripts/app/controllers/_application_controller/_modal_generic_history.coffee
-msgid "was merged into this ticket"
-msgstr ""
-
 #: db/seeds/ticket_article_types.rb
 msgid "web"
 msgstr ""

spec/system/ticket/update_spec.rb

@@ -240,7 +240,7 @@ RSpec.describe 'Ticket Update', type: :system do
         click '.js-actions .dropdown-menu [data-type="ticket-history"]'
 
         in_modal do
-          expect(page).to have_content "This ticket was merged into ticket ##{target_ticket.number}"
+          expect(page).to have_content "this ticket was merged into ticket ##{target_ticket.number}"
           expect(page).to have_link "##{target_ticket.number}", href: "#ticket/zoom/#{target_ticket.id}"
         end
 
@@ -250,7 +250,7 @@ RSpec.describe 'Ticket Update', type: :system do
         click '.js-actions .dropdown-menu [data-type="ticket-history"]'
 
         in_modal do
-          expect(page).to have_content("Ticket ##{origin_ticket.number} was merged into this ticket")
+          expect(page).to have_content("ticket ##{origin_ticket.number} was merged into this ticket")
           expect(page).to have_link "##{origin_ticket.number}", href: "#ticket/zoom/#{origin_ticket.id}"
         end
       end