From 26bdc0c665fa50db298d03ded9e3b6d3b9d46d0b Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Wed, 9 Mar 2016 08:04:56 +0100 Subject: [PATCH] Improved wording. --- .../javascripts/app/controllers/_channel/email.coffee | 2 +- .../app/controllers/_ui_element/time_range.coffee | 10 +++++----- .../controllers/_ui_element/user_autocompletion.coffee | 2 +- .../_ui_element/user_autocompletion_search.coffee | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_channel/email.coffee b/app/assets/javascripts/app/controllers/_channel/email.coffee index ec1f3c2bd..81d605303 100644 --- a/app/assets/javascripts/app/controllers/_channel/email.coffee +++ b/app/assets/javascripts/app/controllers/_channel/email.coffee @@ -496,7 +496,7 @@ class App.ChannelEmailAccountWizard extends App.WizardModal # base configureAttributesBase = [ { name: 'realname', display: 'Department Name', tag: 'input', type: 'text', limit: 160, null: false, placeholder: 'Organization Support', autocomplete: 'off' }, - { name: 'email', display: 'User', tag: 'input', type: 'email', limit: 120, null: false, placeholder: 'support@example.com', autocapitalize: false, autocomplete: 'off', }, + { name: 'email', display: 'Email', tag: 'input', type: 'email', limit: 120, null: false, placeholder: 'support@example.com', autocapitalize: false, autocomplete: 'off' }, { name: 'password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: false, autocapitalize: false, autocomplete: 'new-password', single: true }, { name: 'group_id', display: 'Destination Group', tag: 'select', null: false, relation: 'Group', nulloption: true }, ] diff --git a/app/assets/javascripts/app/controllers/_ui_element/time_range.coffee b/app/assets/javascripts/app/controllers/_ui_element/time_range.coffee index e5d6f7341..f0321ac92 100644 --- a/app/assets/javascripts/app/controllers/_ui_element/time_range.coffee +++ b/app/assets/javascripts/app/controllers/_ui_element/time_range.coffee @@ -2,11 +2,11 @@ class App.UiElement.time_range @render: (attribute) -> ranges = - minute: 'minute(s)' - hour: 'hour(s)' - day: 'day(s)' - month: 'month(s)' - year: 'year(s)' + minute: 'Minute(s)' + hour: 'Hour(s)' + day: 'Day(s)' + month: 'Month(s)' + year: 'Year(s)' for key, value of ranges ranges[key] = App.i18n.translateInline(value) diff --git a/app/assets/javascripts/app/controllers/_ui_element/user_autocompletion.coffee b/app/assets/javascripts/app/controllers/_ui_element/user_autocompletion.coffee index b69d140f2..1c88294d2 100644 --- a/app/assets/javascripts/app/controllers/_ui_element/user_autocompletion.coffee +++ b/app/assets/javascripts/app/controllers/_ui_element/user_autocompletion.coffee @@ -1,4 +1,4 @@ # coffeelint: disable=camel_case_classes class App.UiElement.user_autocompletion @render: (attribute) -> - new App.UserOrganizationAutocompletion( attribute: attribute ).element() + new App.UserOrganizationAutocompletion(attribute: attribute).element() diff --git a/app/assets/javascripts/app/controllers/_ui_element/user_autocompletion_search.coffee b/app/assets/javascripts/app/controllers/_ui_element/user_autocompletion_search.coffee index 308742b74..c6c2bc4db 100644 --- a/app/assets/javascripts/app/controllers/_ui_element/user_autocompletion_search.coffee +++ b/app/assets/javascripts/app/controllers/_ui_element/user_autocompletion_search.coffee @@ -3,4 +3,4 @@ class App.UiElement.user_autocompletion_search @render: (attributeOrig) -> attribute = _.clone(attributeOrig) attribute.disableCreateUser = true - new App.UserOrganizationAutocompletion( attribute: attribute ).element() + new App.UserOrganizationAutocompletion(attribute: attribute).element()