From 9d0bfa1faeab0b207fc0a769df211cb86db28231 Mon Sep 17 00:00:00 2001 From: Elias Probst Date: Mon, 16 Jan 2017 15:12:06 +0100 Subject: [PATCH] Fix typos (#622) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix typo (`Colleges` → `Colleagues`) * Fix typo (`Modues` → `Modules`) * Fix typo (`Additionals` → `Additional`) * Fix typo (`ckeck` → `check`) * Fix typo (`seperator` → `separator`) * Fix typo (`subjects` → `subject`) * Fix typo (`need to` → `needs to`) --- .../javascripts/app/lib/app_post/utils.coffee | 10 +++++----- app/controllers/first_steps_controller.rb | 4 ++-- .../observer/ticket/article/fillup_from_email.rb | 4 ++-- db/seeds.rb | 16 ++++++++-------- lib/core_ext/string.rb | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/assets/javascripts/app/lib/app_post/utils.coffee b/app/assets/javascripts/app/lib/app_post/utils.coffee index e6cf40a36..5b3c1ace8 100644 --- a/app/assets/javascripts/app/lib/app_post/utils.coffee +++ b/app/assets/javascripts/app/lib/app_post/utils.coffee @@ -320,9 +320,9 @@ class App.Utils str = str.replace(/(.+?)(<|>|&).+?$/, "$1").trim() str - # search for signature seperator "--\n" + # search for signature separator "--\n" markers = [] - searchForSeperator = (textToSearchInLines, markers) -> + searchForSeparator = (textToSearchInLines, markers) -> lineCount = 0 for line in textToSearchInLines lineCount += 1 @@ -330,10 +330,10 @@ class App.Utils marker = line: line lineCount: lineCount - type: 'seperator' + type: 'separator' markers.push marker return - searchForSeperator(textToSearchInLines, markers) + searchForSeparator(textToSearchInLines, markers) # search for Thunderbird searchForThunderbird = (textToSearchInLines, markers) -> @@ -517,7 +517,7 @@ class App.Utils # get first marker markers = _.sortBy(markers, 'lineCount') - if markers[0].type is 'seperator' + if markers[0].type is 'separator' regex = new RegExp("\>(\s{0,10}#{quote(App.Utils.htmlEscape(markers[0].line))})\s{0,10}\<") message.replace(regex, ">#{markerTemplate}\$1<") else diff --git a/app/controllers/first_steps_controller.rb b/app/controllers/first_steps_controller.rb index acea99f72..155b87230 100644 --- a/app/controllers/first_steps_controller.rb +++ b/app/controllers/first_steps_controller.rb @@ -61,7 +61,7 @@ class FirstStepsController < ApplicationController location: '#channels/email', }, { - name: 'Invite Agents/Colleges to help working on Tickets', + name: 'Invite Agents/Colleagues to help working on Tickets', checked: invite_agents, location: '#', class: 'js-inviteAgent', @@ -106,7 +106,7 @@ class FirstStepsController < ApplicationController ], }, { - name: 'Additionals Channels', + name: 'Additional Channels', items: [ { name: 'Twitter', diff --git a/app/models/observer/ticket/article/fillup_from_email.rb b/app/models/observer/ticket/article/fillup_from_email.rb index 2770e9206..298f7a78e 100644 --- a/app/models/observer/ticket/article/fillup_from_email.rb +++ b/app/models/observer/ticket/article/fillup_from_email.rb @@ -47,9 +47,9 @@ class Observer::Ticket::Article::FillupFromEmail < ActiveRecord::Observer raise "No email address found for group '#{ticket.group.name}'" end if record.created_by_id != 1 && Setting.get('ticket_define_email_from') == 'AgentNameSystemAddressName' - seperator = Setting.get('ticket_define_email_from_seperator') + separator = Setting.get('ticket_define_email_from_separator') sender = User.find(record.created_by_id) - realname = "#{sender.firstname} #{sender.lastname} #{seperator} #{email_address.realname}" + realname = "#{sender.firstname} #{sender.lastname} #{separator} #{email_address.realname}" record.from = Channel::EmailBuild.recipient_line(realname, email_address.email) else record.from = Channel::EmailBuild.recipient_line(email_address.realname, email_address.email) diff --git a/db/seeds.rb b/db/seeds.rb index a8be32b18..239da5873 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1038,7 +1038,7 @@ Setting.create_if_not_exists( title: 'Minimal size', name: 'password_min_size', area: 'Security::Password', - description: 'Password need to have at least minimal size of characters.', + description: 'Password needs to have at least minimal size of characters.', options: { form: [ { @@ -1078,7 +1078,7 @@ Setting.create_if_not_exists( title: '2 lower and 2 upper characters', name: 'password_min_2_lower_2_upper_characters', area: 'Security::Password', - description: 'Password need to contain 2 lower and 2 upper characters.', + description: 'Password needs to contain 2 lower and 2 upper characters.', options: { form: [ { @@ -1103,7 +1103,7 @@ Setting.create_if_not_exists( title: 'Digit required', name: 'password_need_digit', area: 'Security::Password', - description: 'Password need to have at least one digit.', + description: 'Password needs to have at least one digit.', options: { form: [ { @@ -1439,7 +1439,7 @@ Setting.create_if_not_exists( title: 'Ticket Subject Size', name: 'ticket_subject_size', area: 'Email::Base', - description: 'Max size of the subjects in an email reply.', + description: 'Max size of the subject in an email reply.', options: { form: [ { @@ -1505,8 +1505,8 @@ Setting.create_if_not_exists( ) Setting.create_if_not_exists( - title: 'Sender Format Seperator', - name: 'ticket_define_email_from_seperator', + title: 'Sender Format Separator', + name: 'ticket_define_email_from_separator', area: 'Email::Base', description: 'Defines the separator between the agents real name and the given group email address.', options: { @@ -1514,7 +1514,7 @@ Setting.create_if_not_exists( { display: '', null: false, - name: 'ticket_define_email_from_seperator', + name: 'ticket_define_email_from_separator', tag: 'input', }, ], @@ -1580,7 +1580,7 @@ Setting.create_if_not_exists( title: 'Additional follow up detection', name: 'postmaster_follow_up_search_in', area: 'Email::Base', - description: '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 ckeck is executed.', + description: '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.', options: { form: [ { diff --git a/lib/core_ext/string.rb b/lib/core_ext/string.rb index 103597de6..c3512ceae 100644 --- a/lib/core_ext/string.rb +++ b/lib/core_ext/string.rb @@ -311,7 +311,7 @@ class String marker = '######SIGNATURE_MARKER######' - # search for signature seperator "--\n" + # search for signature separator "--\n" string.sub!(/^\s{0,2}--\s{0,2}$/) { |placeholder| placeholder = "#{marker}#{placeholder}" }