Fixes #2661 - Inconsistency in "follow up" strings

app/assets/javascripts/app/controllers/ticket_zoom.coffee

@@ -645,7 +645,7 @@ class App.TicketZoom extends App.Controller
       state = App.TicketState.findByAttribute('id', @ticket.state_id)
       return if state && state.default_create is true
 
-    # prevent multiple changes for the default follow up state
+    # prevent multiple changes for the default follow-up state
     @isDefaultFollowUpStateSet = true
 
     # get state
@@ -952,7 +952,7 @@ class App.TicketZoom extends App.Controller
     # reset task
     @taskReset()
 
-    # reset default follow up state
+    # reset default follow-up state
     @resetDefaultFollowUpState()
 
     # reset/delete uploaded attachments

app/assets/javascripts/app/models/group.coffee

@@ -6,8 +6,8 @@ class App.Group extends App.Model
   @configure_attributes = [
     { name: 'name',                 display: 'Name',              tag: 'input',  type: 'text', limit: 100, null: false },
     { name: 'assignment_timeout',   display: 'Assignment Timeout', tag: 'input', note: 'Assignment timeout in minutes if assigned agent is not working on it. Ticket will be shown as unassigend.', type: 'text', limit: 100, null: true },
-    { name: 'follow_up_possible',   display: 'Follow up possible',tag: 'select', default: 'yes', options: { yes: 'yes', 'new_ticket': 'do not reopen Ticket but create new Ticket' }, null: false, note: 'Follow up for closed ticket possible or not.', translate: true },
-    { name: 'follow_up_assignment', display: 'Assign Follow Ups', tag: 'select', default: 'yes', options: { true: 'yes', false: 'no' }, null: false, note: 'Assign follow up to latest agent again.', translate: true },
+    { name: 'follow_up_possible',   display: 'Follow-up possible',tag: 'select', default: 'yes', options: { yes: 'yes', 'new_ticket': 'do not reopen Ticket but create new Ticket' }, null: false, note: 'Follow-up for closed ticket possible or not.', translate: true },
+    { name: 'follow_up_assignment', display: 'Assign Follow-Ups', tag: 'select', default: 'yes', options: { true: 'yes', false: 'no' }, null: false, note: 'Assign follow-up to latest agent again.', translate: true },
     { name: 'email_address_id',     display: 'Email',             tag: 'select', multiple: false, null: true, relation: 'EmailAddress', nulloption: true, do_not_log: true },
     { name: 'signature_id',         display: 'Signature',         tag: 'select', multiple: false, null: true, relation: 'Signature', nulloption: true, do_not_log: true },
     { name: 'note',                 display: 'Note',              tag: 'textarea', note: 'Notes are visible to agents only, never to customers.', limit: 250, null: true },

app/controllers/integration/check_mk_controller.rb

@@ -20,7 +20,7 @@ class Integration::CheckMkController < ApplicationController
     # check if ticket with host is open
     customer = User.lookup(id: 1)
 
-    # follow up detection by meta data
+    # follow-up detection by meta data
     integration = 'check_mk'
     open_states = Ticket::State.by_category(:open)
     ticket_ids = Ticket.where(state: open_states).order(created_at: :desc).limit(5000).pluck(:id)

app/controllers/tickets_controller.rb

@@ -675,7 +675,7 @@ class TicketsController < ApplicationController
     return true if ticket.group.follow_up_possible != 'new_ticket' # check if the setting for follow_up_possible is disabled
     return true if ticket.state.name != 'closed' # check if the ticket state is already closed
 
-    raise Exceptions::UnprocessableEntity, 'Cannot follow up on a closed ticket. Please create a new ticket.'
+    raise Exceptions::UnprocessableEntity, 'Cannot follow-up on a closed ticket. Please create a new ticket.'
   end
 
   def ticket_all(ticket)

app/models/channel/filter/bounce_follow_up_check.rb

@@ -21,7 +21,7 @@ module Channel::Filter::BounceFollowUpCheck
       article = Ticket::Article.where(message_id_md5: message_id_md5).order('created_at DESC, id DESC').limit(1).first
       next if !article
 
-      Rails.logger.debug { "Follow up for '##{article.ticket.number}' in bounce email." }
+      Rails.logger.debug { "Follow-up for '##{article.ticket.number}' in bounce email." }
       mail[ 'x-zammad-ticket-id'.to_sym ] = article.ticket_id
       mail[ 'x-zammad-is-auto-response'.to_sym ] = true
 

app/models/channel/filter/follow_up_check.rb

@@ -9,7 +9,7 @@ module Channel::Filter::FollowUpCheck
     # get ticket# from subject
     ticket = Ticket::Number.check(mail[:subject])
     if ticket
-      Rails.logger.debug { "Follow up for '##{ticket.number}' in subject." }
+      Rails.logger.debug { "Follow-up for '##{ticket.number}' in subject." }
       mail['x-zammad-ticket-id'.to_sym] = ticket.id
       return true
     end
@@ -20,7 +20,7 @@ module Channel::Filter::FollowUpCheck
     if setting.include?('body')
       ticket = Ticket::Number.check(mail[:body].html2text)
       if ticket
-        Rails.logger.debug { "Follow up for '##{ticket.number}' in body." }
+        Rails.logger.debug { "Follow-up for '##{ticket.number}' in body." }
         mail['x-zammad-ticket-id'.to_sym] = ticket.id
         return true
       end
@@ -34,7 +34,7 @@ module Channel::Filter::FollowUpCheck
         ticket = Ticket::Number.check(attachment[:data].html2text)
         next if !ticket
 
-        Rails.logger.debug { "Follow up for '##{ticket.number}' in attachment." }
+        Rails.logger.debug { "Follow-up for '##{ticket.number}' in attachment." }
         mail['x-zammad-ticket-id'.to_sym] = ticket.id
         return true
       end
@@ -61,7 +61,7 @@ module Channel::Filter::FollowUpCheck
           article = Ticket::Article.where(message_id_md5: message_id_md5).order('created_at DESC, id DESC').limit(1).first
           next if !article
 
-          Rails.logger.debug { "Follow up for '##{article.ticket.number}' in references." }
+          Rails.logger.debug { "Follow-up for '##{article.ticket.number}' in references." }
           mail['x-zammad-ticket-id'.to_sym] = article.ticket_id
           return true
         end
@@ -102,7 +102,7 @@ module Channel::Filter::FollowUpCheck
           # if subject is different, it's no followup
           next if subject_to_check != article_first.subject
 
-          Rails.logger.debug { "Follow up for '##{article.ticket.number}' in references with same subject as inital article." }
+          Rails.logger.debug { "Follow-up for '##{article.ticket.number}' in references with same subject as inital article." }
           mail['x-zammad-ticket-id'.to_sym] = article_first.ticket_id
           return true
         end

app/models/channel/filter/follow_up_possible_check.rb

@@ -10,7 +10,7 @@ module Channel::Filter::FollowUpPossibleCheck
     return true if !ticket
     return true if ticket.state.state_type.name !~ /^(closed|merged|removed)/i
 
-    # in case of closed tickets, remove follow up information
+    # in case of closed tickets, remove follow-up information
     case ticket.group.follow_up_possible
     when 'new_ticket'
       mail[:subject]                        = ticket.subject_clean(mail[:subject])

app/models/channel/filter/monitoring_base.rb

@@ -80,7 +80,7 @@ class Channel::Filter::MonitoringBase
                         end
     end
 
-    # follow up detection by meta data
+    # follow-up detection by meta data
     open_states = Ticket::State.by_category(:open)
     ticket_ids = Ticket.where(state: open_states).order(created_at: :desc).limit(5000).pluck(:id)
     ticket_ids.each do |ticket_id|

app/models/observer/ticket/article_changes.rb

@@ -111,7 +111,7 @@ class Observer::Ticket::ArticleChanges < ActiveRecord::Observer
     ticket = record.ticket
     if sender.name == 'Customer'
 
-      # in case, update last_contact_customer_at on any customer follow up
+      # in case, update last_contact_customer_at on any customer follow-up
       if Setting.get('ticket_last_contact_behaviour') == 'based_on_customer_reaction'
 
         # set last_contact_at customer

db/migrate/20170116000002_fixed_typos_622.rb

@@ -16,7 +16,7 @@ class FixedTypos622 < ActiveRecord::Migration[4.2]
       'password_min_2_lower_2_upper_characters' => 'Password needs to contain 2 lower and 2 upper characters.',
       'password_need_digit'                     => 'Password needs to have at least one digit.',
       'ticket_subject_size'                     => 'Max size of the subject in an email reply.',
-      'postmaster_follow_up_search_in'          => 'In default the follow up check is done via the subject of an email. With this setting you can add more fields where the follow up check is executed.',
+      'postmaster_follow_up_search_in'          => 'In default the follow-up check is done via the subject of an email. With this setting you can add more fields where the follow-up check is executed.',
     }
 
     setting_map.each do |key, description|