Skip to content

Commit

Permalink
Fixes zammad#4252 - Wrong description for ticket hook position setting
Browse files Browse the repository at this point in the history
  • Loading branch information
mantas committed Oct 17, 2022
1 parent 312d3c7 commit ce1c9fe
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<ul>
<li><%- @T('|Right| means |Some Subject [Ticket#12345]|') %>
<li><%- @T('|Left| means |[Ticket#12345] Some Subject|') %>
<li><%- @T('|None| means |Some Subject| (without ticket number), in which case you should enable "postmaster___follow___up___search___in" to recognize follow-ups based on email headers and/or body.') %>
<li><%- @T('|None| means |Some Subject| (without ticket number), in which case it recognizes follow-ups based on email headers.') %>
</ul>
<div class="horizontal end">
<div class="js-form form-item flex"></div>
<button type="submit" class="btn btn--primary"><%- @T('Submit') %></button>
</div>
</form>
</form>
17 changes: 17 additions & 0 deletions db/migrate/20221014093134_ticket_hook_setting_description.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Copyright (C) 2012-2022 Zammad Foundation, https://zammad-foundation.org/

class TicketHookSettingDescription < ActiveRecord::Migration[6.1]
def up
# return if it's a new setup
return if !Setting.exists?(name: 'system_init_done')

Setting
.find_by(name: 'ticket_hook_position')
.update(description: <<~HTML.chomp)
The format of the subject.
* **Right** means **Some Subject [Ticket#12345]**
* **Left** means **[Ticket#12345] Some Subject**
* **None** means **Some Subject** (without ticket number), in which case it recognizes follow-ups based on email headers.
HTML
end
end
2 changes: 1 addition & 1 deletion db/seeds/settings.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2090,7 +2090,7 @@
description: __("The format of the subject.
* **Right** means **Some Subject [Ticket#12345]**
* **Left** means **[Ticket#12345] Some Subject**
* **None** means **Some Subject** (without ticket number). In the last case you should enable *postmaster_follow_up_search_in* to recognize follow-ups based on email headers and/or body."),
* **None** means **Some Subject** (without ticket number), in which case it recognizes follow-ups based on email headers."),
options: {
form: [
{
Expand Down
2 changes: 1 addition & 1 deletion i18n/zammad.pot
Original file line number Diff line number Diff line change
Expand Up @@ -12845,7 +12845,7 @@ msgid "|Left| means |[Ticket#12345] Some Subject|"
msgstr ""

#: app/assets/javascripts/app/views/settings/ticket_hook_position.jst.eco
msgid "|None| means |Some Subject| (without ticket number), in which case you should enable \"postmaster___follow___up___search___in\" to recognize follow-ups based on email headers and/or body."
msgid "|None| means |Some Subject| (without ticket number), in which case it recognizes follow-ups based on email headers."
msgstr ""

#: app/assets/javascripts/app/views/settings/ticket_hook_position.jst.eco
Expand Down

0 comments on commit ce1c9fe

Please sign in to comment.