From b5f7be0cd2261ceac0aea50b5227318e6b5b622e Mon Sep 17 00:00:00 2001 From: Muhsin Keloth Date: Tue, 15 Nov 2022 09:09:46 +0530 Subject: [PATCH 01/30] fix: Full name update when creating a conversation without an email id (#5832) Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com> Co-authored-by: Pranav Raj S --- .../api/v1/widget/base_controller.rb | 4 +++- .../widget/conversations_controller_spec.rb | 24 ++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/v1/widget/base_controller.rb b/app/controllers/api/v1/widget/base_controller.rb index 9ec702e6c..229cf27e9 100644 --- a/app/controllers/api/v1/widget/base_controller.rb +++ b/app/controllers/api/v1/widget/base_controller.rb @@ -50,7 +50,9 @@ class Api::V1::Widget::BaseController < ApplicationController end def contact_name - params[:contact][:name] || contact_email.split('@')[0] if contact_email.present? + return if @contact.email.present? || @contact.phone_number.present? || @contact.identifier.present? + + permitted_params.dig(:contact, :name) || (contact_email.split('@')[0] if contact_email.present?) end def contact_phone_number diff --git a/spec/controllers/api/v1/widget/conversations_controller_spec.rb b/spec/controllers/api/v1/widget/conversations_controller_spec.rb index cf386a65e..4cd594a12 100644 --- a/spec/controllers/api/v1/widget/conversations_controller_spec.rb +++ b/spec/controllers/api/v1/widget/conversations_controller_spec.rb @@ -74,8 +74,30 @@ RSpec.describe '/api/v1/widget/conversations/toggle_typing', type: :request do expect(json_response['messages'][0]['content']).to eq 'This is a test message' end + it 'create a conversation with a name and without an email' do + post '/api/v1/widget/conversations', + headers: { 'X-Auth-Token' => token }, + params: { + website_token: web_widget.website_token, + contact: { + name: 'alphy' + }, + message: { + content: 'This is a test message' + } + }, + as: :json + + expect(response).to have_http_status(:success) + json_response = JSON.parse(response.body) + expect(json_response['id']).not_to be_nil + expect(json_response['contact']['email']).to be_nil + expect(json_response['contact']['name']).to eq 'alphy' + expect(json_response['messages'][0]['content']).to eq 'This is a test message' + end + it 'does not update the name if the contact already exist' do - existing_contact = create(:contact, account: account) + existing_contact = create(:contact, account: account, email: 'contact-email@chatwoot.com') post '/api/v1/widget/conversations', headers: { 'X-Auth-Token' => token }, From 38ab3c36db979c7dc28dde166d23b9dab1fa7092 Mon Sep 17 00:00:00 2001 From: Tejaswini Chile Date: Tue, 15 Nov 2022 12:20:06 +0530 Subject: [PATCH 02/30] fix: send label list not object in event data presenter (#5853) --- app/presenters/conversations/event_data_presenter.rb | 4 ---- spec/listeners/action_cable_listener_spec.rb | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/presenters/conversations/event_data_presenter.rb b/app/presenters/conversations/event_data_presenter.rb index 151c0746d..d7e170bfa 100644 --- a/app/presenters/conversations/event_data_presenter.rb +++ b/app/presenters/conversations/event_data_presenter.rb @@ -24,10 +24,6 @@ class Conversations::EventDataPresenter < SimpleDelegator [messages.chat.last&.push_event_data].compact end - def label_list - labels.pluck(:id, :name) - end - def push_meta { sender: contact.push_event_data, diff --git a/spec/listeners/action_cable_listener_spec.rb b/spec/listeners/action_cable_listener_spec.rb index cadf39e65..ef3d104ad 100644 --- a/spec/listeners/action_cable_listener_spec.rb +++ b/spec/listeners/action_cable_listener_spec.rb @@ -149,7 +149,7 @@ describe ActionCableListener do end it 'broadcast event with label data' do - expect(conversation.reload.push_event_data[:labels]).to eq(conversation.labels.pluck(:id, :name)) + expect(conversation.reload.push_event_data[:labels]).to eq(conversation.labels.pluck(:name)) expect(ActionCableBroadcastJob).to receive(:perform_later).with( [agent.pubsub_token, admin.pubsub_token, conversation.contact_inbox.pubsub_token], From 826a735cdb51acda96b4fe8d7221b609b3a340ab Mon Sep 17 00:00:00 2001 From: Tejaswini Chile Date: Tue, 15 Nov 2022 13:15:27 +0530 Subject: [PATCH 03/30] fix: Assign agent action changes (#5827) --- .../dashboard/mixins/macrosMixin.js | 2 +- .../dashboard/mixins/specs/macros.spec.js | 2 +- .../conversation/Macros/MacroPreview.vue | 2 +- .../dashboard/settings/macros/constants.js | 2 +- app/models/automation_rule.rb | 2 +- app/models/macro.rb | 2 +- app/services/action_service.rb | 11 +++++++---- .../api/v1/accounts/macros_controller_spec.rb | 19 +++++++++++++++++-- spec/factories/automation_rules.rb | 2 +- .../automation_rule_listener_spec.rb | 4 +++- spec/models/automation_rule_spec.rb | 2 +- 11 files changed, 35 insertions(+), 15 deletions(-) diff --git a/app/javascript/dashboard/mixins/macrosMixin.js b/app/javascript/dashboard/mixins/macrosMixin.js index 085d1dfc6..add06b7e1 100644 --- a/app/javascript/dashboard/mixins/macrosMixin.js +++ b/app/javascript/dashboard/mixins/macrosMixin.js @@ -5,7 +5,7 @@ export default { case 'assign_team': case 'send_email_to_team': return this.teams; - case 'assign_best_agent': + case 'assign_agent': return this.agents; case 'add_label': return this.labels.map(i => { diff --git a/app/javascript/dashboard/mixins/specs/macros.spec.js b/app/javascript/dashboard/mixins/specs/macros.spec.js index 732da7192..b94fe9f89 100644 --- a/app/javascript/dashboard/mixins/specs/macros.spec.js +++ b/app/javascript/dashboard/mixins/specs/macros.spec.js @@ -36,7 +36,7 @@ describe('webhookMixin', () => { expect(wrapper.vm.getDropdownValues('assign_team')).toEqual(teams); expect(wrapper.vm.getDropdownValues('send_email_to_team')).toEqual(teams); expect(wrapper.vm.getDropdownValues('add_label')).toEqual(resolvedLabels); - expect(wrapper.vm.getDropdownValues('assign_best_agent')).toEqual(agents); + expect(wrapper.vm.getDropdownValues('assign_agent')).toEqual(agents); expect(wrapper.vm.getDropdownValues()).toEqual([]); }); }); diff --git a/app/javascript/dashboard/routes/dashboard/conversation/Macros/MacroPreview.vue b/app/javascript/dashboard/routes/dashboard/conversation/Macros/MacroPreview.vue index 6adbc6db4..081d18e1b 100644 --- a/app/javascript/dashboard/routes/dashboard/conversation/Macros/MacroPreview.vue +++ b/app/javascript/dashboard/routes/dashboard/conversation/Macros/MacroPreview.vue @@ -49,7 +49,7 @@ export default { const actionsMap = { assign_team: resolveTeamIds(this.teams, params), add_label: resolveLabels(this.labels, params), - assign_best_agent: resolveAgents(this.agents, params), + assign_agent: resolveAgents(this.agents, params), mute_conversation: null, snooze_conversation: null, resolve_conversation: null, diff --git a/app/javascript/dashboard/routes/dashboard/settings/macros/constants.js b/app/javascript/dashboard/routes/dashboard/settings/macros/constants.js index 212dfb052..b13a9bbd9 100644 --- a/app/javascript/dashboard/routes/dashboard/settings/macros/constants.js +++ b/app/javascript/dashboard/routes/dashboard/settings/macros/constants.js @@ -5,7 +5,7 @@ export const MACRO_ACTION_TYPES = [ inputType: 'search_select', }, { - key: 'assign_best_agent', + key: 'assign_agent', label: 'Assign an agent', inputType: 'search_select', }, diff --git a/app/models/automation_rule.rb b/app/models/automation_rule.rb index f90e20d0c..b72da9645 100644 --- a/app/models/automation_rule.rb +++ b/app/models/automation_rule.rb @@ -30,7 +30,7 @@ class AutomationRule < ApplicationRecord scope :active, -> { where(active: true) } CONDITIONS_ATTRS = %w[content email country_code status message_type browser_language assignee_id team_id referer city company inbox_id].freeze - ACTIONS_ATTRS = %w[send_message add_label send_email_to_team assign_team assign_best_agent send_webhook_event mute_conversation send_attachment + ACTIONS_ATTRS = %w[send_message add_label send_email_to_team assign_team assign_agent send_webhook_event mute_conversation send_attachment change_status resolve_conversation snooze_conversation send_email_transcript].freeze def file_base_data diff --git a/app/models/macro.rb b/app/models/macro.rb index 0eeb5b458..e6f3425ac 100644 --- a/app/models/macro.rb +++ b/app/models/macro.rb @@ -30,7 +30,7 @@ class Macro < ApplicationRecord validate :json_actions_format - ACTIONS_ATTRS = %w[send_message add_label assign_team assign_best_agent mute_conversation change_status + ACTIONS_ATTRS = %w[send_message add_label assign_team assign_agent mute_conversation change_status resolve_conversation snooze_conversation send_email_transcript send_attachment add_private_note].freeze def set_visibility(user, params) diff --git a/app/services/action_service.rb b/app/services/action_service.rb index c3757a8d0..ce57971cf 100644 --- a/app/services/action_service.rb +++ b/app/services/action_service.rb @@ -25,8 +25,8 @@ class ActionService @conversation.reload.add_labels(labels) end - def assign_best_agent(agent_ids = []) - return unless agent_belongs_to_account?(agent_ids) + def assign_agent(agent_ids = []) + return unless agent_belongs_to_inbox?(agent_ids) @agent = @account.users.find_by(id: agent_ids) @@ -47,8 +47,11 @@ class ActionService private - def agent_belongs_to_account?(agent_ids) - @account.agents.pluck(:id).include?(agent_ids[0]) + def agent_belongs_to_inbox?(agent_ids) + member_ids = @conversation.inbox.members.pluck(:user_id) + assignable_agent_ids = member_ids + @account.administrators.ids + + assignable_agent_ids.include?(agent_ids[0]) end def team_belongs_to_account?(team_ids) diff --git a/spec/controllers/api/v1/accounts/macros_controller_spec.rb b/spec/controllers/api/v1/accounts/macros_controller_spec.rb index 26bff7b60..3b791d002 100644 --- a/spec/controllers/api/v1/accounts/macros_controller_spec.rb +++ b/spec/controllers/api/v1/accounts/macros_controller_spec.rb @@ -263,12 +263,13 @@ RSpec.describe 'Api::V1::Accounts::MacrosController', type: :request do before do create(:team_member, user: user_1, team: team) create(:account_user, user: user_1, account: account) + create(:inbox_member, user: user_1, inbox: inbox) macro.update!(actions: [ { 'action_name' => 'assign_team', 'action_params' => [team.id] }, { 'action_name' => 'add_label', 'action_params' => %w[support priority_customer] }, { 'action_name' => 'snooze_conversation' }, - { 'action_name' => 'assign_best_agent', 'action_params' => [user_1.id] }, + { 'action_name' => 'assign_agent', 'action_params' => [user_1.id] }, { 'action_name' => 'send_message', 'action_params' => ['Send this message.'] }, { 'action_name' => 'add_private_note', 'action_params': ['We are sending greeting message to customer.'] } ]) @@ -297,7 +298,7 @@ RSpec.describe 'Api::V1::Accounts::MacrosController', type: :request do expect(conversation.messages.chat.last.sender).to eq(administrator) end - it 'Assign the agent' do + it 'Assign the agent when he is inbox member' do expect(conversation.assignee).to be_nil perform_enqueued_jobs do @@ -309,6 +310,20 @@ RSpec.describe 'Api::V1::Accounts::MacrosController', type: :request do expect(conversation.messages.activity.last.content).to eq("Assigned to #{user_1.name} by #{administrator.name}") end + it 'Assign the agent when he is not inbox member' do + InboxMember.last.destroy + + expect(conversation.assignee).to be_nil + + perform_enqueued_jobs do + post "/api/v1/accounts/#{account.id}/macros/#{macro.id}/execute", + params: { conversation_ids: [conversation.display_id] }, + headers: administrator.create_new_auth_token + end + + expect(conversation.messages.activity.last.content).not_to eq("Assigned to #{user_1.name} by #{administrator.name}") + end + it 'Assign the labels' do expect(conversation.labels).to be_empty diff --git a/spec/factories/automation_rules.rb b/spec/factories/automation_rules.rb index 9c7a80254..3a7aecd09 100644 --- a/spec/factories/automation_rules.rb +++ b/spec/factories/automation_rules.rb @@ -12,7 +12,7 @@ FactoryBot.define do }, { 'action_name' => 'assign_team', 'action_params' => [1] }, { 'action_name' => 'add_label', 'action_params' => %w[support priority_customer] }, - { 'action_name' => 'assign_best_agent', 'action_params' => [1, 2, 3, 4] } + { 'action_name' => 'assign_agent', 'action_params' => [1, 2, 3, 4] } ] end end diff --git a/spec/listeners/automation_rule_listener_spec.rb b/spec/listeners/automation_rule_listener_spec.rb index e53c242a9..51c352794 100644 --- a/spec/listeners/automation_rule_listener_spec.rb +++ b/spec/listeners/automation_rule_listener_spec.rb @@ -30,6 +30,8 @@ describe AutomationRuleListener do attribute_model: 'contact_attribute') create(:team_member, user: user_1, team: team) create(:team_member, user: user_2, team: team) + create(:inbox_member, user: user_1, inbox: inbox) + create(:inbox_member, user: user_2, inbox: inbox) create(:account_user, user: user_2, account: account) create(:account_user, user: user_1, account: account) @@ -45,7 +47,7 @@ describe AutomationRuleListener do { 'action_name' => 'assign_team', 'action_params' => [team.id] }, { 'action_name' => 'add_label', 'action_params' => %w[support priority_customer] }, { 'action_name' => 'send_webhook_event', 'action_params' => ['https://www.example.com'] }, - { 'action_name' => 'assign_best_agent', 'action_params' => [user_1.id] }, + { 'action_name' => 'assign_agent', 'action_params' => [user_1.id] }, { 'action_name' => 'send_email_transcript', 'action_params' => ['new_agent@example.com'] }, { 'action_name' => 'mute_conversation', 'action_params' => nil }, { 'action_name' => 'change_status', 'action_params' => ['snoozed'] }, diff --git a/spec/models/automation_rule_spec.rb b/spec/models/automation_rule_spec.rb index 7a68306d6..bf7729c5c 100644 --- a/spec/models/automation_rule_spec.rb +++ b/spec/models/automation_rule_spec.rb @@ -37,7 +37,7 @@ RSpec.describe AutomationRule, type: :model do action_params: %w[support priority_customer] }, { - action_name: :assign_best_agent, + action_name: :assign_agent, action_params: [1] } ] From e7f1a9ab4d006b21fad274fb06f4aa83f1c3e8bd Mon Sep 17 00:00:00 2001 From: Sojan Jose Date: Tue, 15 Nov 2022 16:33:09 -0800 Subject: [PATCH 04/30] chore: Enable Macros for all accounts (#5858) - migrations to enable macros for all accounts --- config/features.yml | 2 +- ...1116000514_enable_macros_for_all_accounts.rb | 17 +++++++++++++++++ db/schema.rb | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20221116000514_enable_macros_for_all_accounts.rb diff --git a/config/features.yml b/config/features.yml index 322315999..4a0cec325 100644 --- a/config/features.yml +++ b/config/features.yml @@ -18,7 +18,7 @@ - name: agent_bots enabled: false - name: macros - enabled: false + enabled: true - name: agent_management enabled: true - name: team_management diff --git a/db/migrate/20221116000514_enable_macros_for_all_accounts.rb b/db/migrate/20221116000514_enable_macros_for_all_accounts.rb new file mode 100644 index 000000000..76bc1a8b7 --- /dev/null +++ b/db/migrate/20221116000514_enable_macros_for_all_accounts.rb @@ -0,0 +1,17 @@ +class EnableMacrosForAllAccounts < ActiveRecord::Migration[6.1] + def change + current_config = InstallationConfig.where(name: 'ACCOUNT_LEVEL_FEATURE_DEFAULTS').last + current_config.value.each { |v| v['enabled'] = true if v['name'] == 'macros' } + current_config.save! + + ConfigLoader.new.process + + Account.find_in_batches do |account_batch| + account_batch.each do |account| + account.enable_features('macros') + account.enable_features('channel_email') + account.save! + end + end + end +end diff --git a/db/schema.rb b/db/schema.rb index b086ef781..ea56820ba 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2022_11_02_082737) do +ActiveRecord::Schema.define(version: 2022_11_16_000514) do # These are extensions that must be enabled in order to support this database enable_extension "pg_stat_statements" From 8e2da837d41166090e045397e8b96498834f2547 Mon Sep 17 00:00:00 2001 From: Sojan Jose Date: Tue, 15 Nov 2022 16:37:29 -0800 Subject: [PATCH 05/30] chore: Update translations from Crowdin --- app/javascript/dashboard/i18n/locale/ar/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/ar/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/bg/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/bg/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/ca/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/ca/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/cs/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/cs/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/da/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/da/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/de/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/de/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/el/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/el/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/es/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/es/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/fa/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/fa/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/fi/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/fi/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/fr/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/fr/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/he/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/he/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/hi/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/hi/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/hu/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/hu/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/id/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/id/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/is/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/is/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/it/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/it/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/ja/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/ja/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/ka/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/ka/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/ko/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/ko/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/lt/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/lt/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/lv/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/lv/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/ml/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/ml/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/ms/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/ms/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/ne/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/ne/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/nl/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/nl/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/no/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/no/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/pl/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/pl/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/pt/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/pt/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/pt_BR/automation.json | 4 +++- .../dashboard/i18n/locale/pt_BR/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/ro/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/ro/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/ru/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/ru/generalSettings.json | 5 +++-- app/javascript/dashboard/i18n/locale/sk/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/sk/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/sr/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/sr/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/sv/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/sv/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/ta/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/ta/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/th/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/th/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/tr/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/tr/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/uk/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/uk/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/ur/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/ur/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/ur_IN/automation.json | 4 +++- .../dashboard/i18n/locale/ur_IN/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/vi/automation.json | 4 +++- app/javascript/dashboard/i18n/locale/vi/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/zh_CN/automation.json | 4 +++- .../dashboard/i18n/locale/zh_CN/generalSettings.json | 3 ++- app/javascript/dashboard/i18n/locale/zh_TW/automation.json | 4 +++- .../dashboard/i18n/locale/zh_TW/generalSettings.json | 3 ++- 88 files changed, 221 insertions(+), 89 deletions(-) diff --git a/app/javascript/dashboard/i18n/locale/ar/automation.json b/app/javascript/dashboard/i18n/locale/ar/automation.json index 8ea2994d9..4fd813c13 100644 --- a/app/javascript/dashboard/i18n/locale/ar/automation.json +++ b/app/javascript/dashboard/i18n/locale/ar/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "تغيير نوع الحدث سوف يعيد تعيين الشروط والأحداث التي أضفتها أدناه" }, "CONDITION": { - "DELETE_MESSAGE": "يجب أن يكون لديك على الأقل شرط واحد للحفظ" + "DELETE_MESSAGE": "يجب أن يكون لديك على الأقل شرط واحد للحفظ", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "يجب أن يكون لديك على الأقل شرط واحد للحفظ", diff --git a/app/javascript/dashboard/i18n/locale/ar/generalSettings.json b/app/javascript/dashboard/i18n/locale/ar/generalSettings.json index f70fb685d..7c786f84c 100644 --- a/app/javascript/dashboard/i18n/locale/ar/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/ar/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "اضغط على زر الإدخال للاختيار", "ENTER_TO_REMOVE": "اضغط على زر الإدخال للحذف", - "SELECT_ONE": "اختر واحدا" + "SELECT_ONE": "اختر واحدا", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/bg/automation.json b/app/javascript/dashboard/i18n/locale/bg/automation.json index a4e30a771..b6c377401 100644 --- a/app/javascript/dashboard/i18n/locale/bg/automation.json +++ b/app/javascript/dashboard/i18n/locale/bg/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below" }, "CONDITION": { - "DELETE_MESSAGE": "You need to have atleast one condition to save" + "DELETE_MESSAGE": "You need to have atleast one condition to save", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "You need to have atleast one action to save", diff --git a/app/javascript/dashboard/i18n/locale/bg/generalSettings.json b/app/javascript/dashboard/i18n/locale/bg/generalSettings.json index 9f63dffd5..ce64efa7c 100644 --- a/app/javascript/dashboard/i18n/locale/bg/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/bg/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Press enter to select", "ENTER_TO_REMOVE": "Press enter to remove", - "SELECT_ONE": "Select one" + "SELECT_ONE": "Select one", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/ca/automation.json b/app/javascript/dashboard/i18n/locale/ca/automation.json index 958a9c934..9f3429c8b 100644 --- a/app/javascript/dashboard/i18n/locale/ca/automation.json +++ b/app/javascript/dashboard/i18n/locale/ca/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below" }, "CONDITION": { - "DELETE_MESSAGE": "You need to have atleast one condition to save" + "DELETE_MESSAGE": "You need to have atleast one condition to save", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "You need to have atleast one action to save", diff --git a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json index 7180ef837..58046749b 100644 --- a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Presiona retorn (tecla enter) per seleccionar", "ENTER_TO_REMOVE": "Presiona retorn (tecla enter) per eliminar", - "SELECT_ONE": "Selecciona un" + "SELECT_ONE": "Selecciona un", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/cs/automation.json b/app/javascript/dashboard/i18n/locale/cs/automation.json index 59b5e9246..064200a54 100644 --- a/app/javascript/dashboard/i18n/locale/cs/automation.json +++ b/app/javascript/dashboard/i18n/locale/cs/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below" }, "CONDITION": { - "DELETE_MESSAGE": "You need to have atleast one condition to save" + "DELETE_MESSAGE": "You need to have atleast one condition to save", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "You need to have atleast one action to save", diff --git a/app/javascript/dashboard/i18n/locale/cs/generalSettings.json b/app/javascript/dashboard/i18n/locale/cs/generalSettings.json index 0d804d611..5abf37237 100644 --- a/app/javascript/dashboard/i18n/locale/cs/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/cs/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Stiskněte Enter pro vybrání", "ENTER_TO_REMOVE": "Stiskněte Enter pro odebrání", - "SELECT_ONE": "Vyberte jeden" + "SELECT_ONE": "Vyberte jeden", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/da/automation.json b/app/javascript/dashboard/i18n/locale/da/automation.json index dfe616e20..97fd5095e 100644 --- a/app/javascript/dashboard/i18n/locale/da/automation.json +++ b/app/javascript/dashboard/i18n/locale/da/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Ændring af begivenhedstype vil nulstille de betingelser og begivenheder, du har tilføjet nedenfor" }, "CONDITION": { - "DELETE_MESSAGE": "Du skal have mindst én betingelse for at gemme" + "DELETE_MESSAGE": "Du skal have mindst én betingelse for at gemme", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "Du skal have mindst én handling for at gemme", diff --git a/app/javascript/dashboard/i18n/locale/da/generalSettings.json b/app/javascript/dashboard/i18n/locale/da/generalSettings.json index 9169e4dd7..1a6a60207 100644 --- a/app/javascript/dashboard/i18n/locale/da/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/da/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Tryk enter for at vælge", "ENTER_TO_REMOVE": "Tryk enter for at fjerne", - "SELECT_ONE": "Vælg en" + "SELECT_ONE": "Vælg en", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/de/automation.json b/app/javascript/dashboard/i18n/locale/de/automation.json index 4c7b3bfb2..09f9e42a7 100644 --- a/app/javascript/dashboard/i18n/locale/de/automation.json +++ b/app/javascript/dashboard/i18n/locale/de/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Durch das Ändern des Ereignistyps werden die unten hinzugefügten Bedingungen und Ereignisse zurückgesetzt" }, "CONDITION": { - "DELETE_MESSAGE": "Du musst mindestens eine Bedingung zum Speichern haben" + "DELETE_MESSAGE": "Du musst mindestens eine Bedingung zum Speichern haben", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "Zum Speichern ist mindestens eine Aktion erforderlich", diff --git a/app/javascript/dashboard/i18n/locale/de/generalSettings.json b/app/javascript/dashboard/i18n/locale/de/generalSettings.json index 8381c6036..7ab5eb36b 100644 --- a/app/javascript/dashboard/i18n/locale/de/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/de/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Drücken Sie zur Auswahl die Eingabetaste", "ENTER_TO_REMOVE": "Drücken Sie zum Entfernen die Eingabetaste", - "SELECT_ONE": "Eines wählen" + "SELECT_ONE": "Eines wählen", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/el/automation.json b/app/javascript/dashboard/i18n/locale/el/automation.json index 5db9eb67a..035b7e561 100644 --- a/app/javascript/dashboard/i18n/locale/el/automation.json +++ b/app/javascript/dashboard/i18n/locale/el/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Η αλλαγή τύπου συμβάντος θα επαναφέρει τις συνθήκες και τα συμβάντα που έχετε προσθέσει παρακάτω" }, "CONDITION": { - "DELETE_MESSAGE": "Πρέπει να έχετε τουλάχιστον μία συνθήκη για να αποθηκεύσετε" + "DELETE_MESSAGE": "Πρέπει να έχετε τουλάχιστον μία συνθήκη για να αποθηκεύσετε", + "CONTACT_CUSTOM_ATTR_LABEL": "Προσαρμοσμένες Ιδιότητες Επαφής", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Προσαρμοσμένες Ιδιότητες Συνομιλίας" }, "ACTION": { "DELETE_MESSAGE": "Πρέπει να έχετε τουλάχιστον μία ενέργεια για να αποθηκεύσετε", diff --git a/app/javascript/dashboard/i18n/locale/el/generalSettings.json b/app/javascript/dashboard/i18n/locale/el/generalSettings.json index 45369c9e9..637e9af4f 100644 --- a/app/javascript/dashboard/i18n/locale/el/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/el/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Πάτησε enter για επιλογή", "ENTER_TO_REMOVE": "Πάτησε enter για αφαίρεση", - "SELECT_ONE": "Επιλέξτε ένα" + "SELECT_ONE": "Επιλέξτε ένα", + "SELECT": "Επιλογή" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/es/automation.json b/app/javascript/dashboard/i18n/locale/es/automation.json index ae24fcb1a..1c4b2834f 100644 --- a/app/javascript/dashboard/i18n/locale/es/automation.json +++ b/app/javascript/dashboard/i18n/locale/es/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "El cambio de tipo de evento restablecerá las condiciones y eventos que has añadido abajo" }, "CONDITION": { - "DELETE_MESSAGE": "Necesitas tener al menos una condición para guardar" + "DELETE_MESSAGE": "Necesitas tener al menos una condición para guardar", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "Necesitas tener al menos una acción para guardar", diff --git a/app/javascript/dashboard/i18n/locale/es/generalSettings.json b/app/javascript/dashboard/i18n/locale/es/generalSettings.json index 3f89dab05..cdfb65e1f 100644 --- a/app/javascript/dashboard/i18n/locale/es/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/es/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Pulse Enter para seleccionar", "ENTER_TO_REMOVE": "Presione Enter para eliminar", - "SELECT_ONE": "Seleccione uno" + "SELECT_ONE": "Seleccione uno", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/fa/automation.json b/app/javascript/dashboard/i18n/locale/fa/automation.json index 32c47bb71..a06342c6d 100644 --- a/app/javascript/dashboard/i18n/locale/fa/automation.json +++ b/app/javascript/dashboard/i18n/locale/fa/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "با تغییر نوع رویداد، شرایط و رویدادهایی که در زیر اضافه کرده‌اید بازنشانی می‌شود" }, "CONDITION": { - "DELETE_MESSAGE": "شما باید حداقل یک شرط برای ذخیره داشته باشید" + "DELETE_MESSAGE": "شما باید حداقل یک شرط برای ذخیره داشته باشید", + "CONTACT_CUSTOM_ATTR_LABEL": "ویژگی‌های سفارشی تماس", + "CONVERSATION_CUSTOM_ATTR_LABEL": "ویژگی‌های سفارشی گفتگو" }, "ACTION": { "DELETE_MESSAGE": "برای ذخیره باید حداقل یک اکشن داشته باشید", diff --git a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json index 5b8100d88..a9776ffaa 100644 --- a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "برای انتخاب Enter را فشار دهید", "ENTER_TO_REMOVE": "برای حذف دکمه enter را فشار دهید", - "SELECT_ONE": "یکی را انتخاب کن" + "SELECT_ONE": "یکی را انتخاب کن", + "SELECT": "انتخاب کنید" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/fi/automation.json b/app/javascript/dashboard/i18n/locale/fi/automation.json index d492e37e2..a60377e9b 100644 --- a/app/javascript/dashboard/i18n/locale/fi/automation.json +++ b/app/javascript/dashboard/i18n/locale/fi/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below" }, "CONDITION": { - "DELETE_MESSAGE": "You need to have atleast one condition to save" + "DELETE_MESSAGE": "You need to have atleast one condition to save", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "You need to have atleast one action to save", diff --git a/app/javascript/dashboard/i18n/locale/fi/generalSettings.json b/app/javascript/dashboard/i18n/locale/fi/generalSettings.json index 9a071e47d..fec1db0c4 100644 --- a/app/javascript/dashboard/i18n/locale/fi/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/fi/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Paina enter valitaksesi", "ENTER_TO_REMOVE": "Paina enter poistaaksesi", - "SELECT_ONE": "Valitse yksi" + "SELECT_ONE": "Valitse yksi", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/fr/automation.json b/app/javascript/dashboard/i18n/locale/fr/automation.json index 4cf3dd50d..6f1042af6 100644 --- a/app/javascript/dashboard/i18n/locale/fr/automation.json +++ b/app/javascript/dashboard/i18n/locale/fr/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changer le type d'événement réinitialisera les conditions et les événements que vous avez ajoutés ci-dessous" }, "CONDITION": { - "DELETE_MESSAGE": "Vous devez avoir au moins une condition pour enregistrer" + "DELETE_MESSAGE": "Vous devez avoir au moins une condition pour enregistrer", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "Vous devez avoir au moins une action pour enregistrer", diff --git a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json index ed4f0b337..02d94f4c3 100644 --- a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Appuyer sur Entrée pour sélectionner", "ENTER_TO_REMOVE": "Appuyer sur Entrée pour supprimer", - "SELECT_ONE": "Sélectionnez un" + "SELECT_ONE": "Sélectionnez un", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/he/automation.json b/app/javascript/dashboard/i18n/locale/he/automation.json index 97ccb6ba6..3c5ebdfc7 100644 --- a/app/javascript/dashboard/i18n/locale/he/automation.json +++ b/app/javascript/dashboard/i18n/locale/he/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below" }, "CONDITION": { - "DELETE_MESSAGE": "You need to have atleast one condition to save" + "DELETE_MESSAGE": "You need to have atleast one condition to save", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "You need to have atleast one action to save", diff --git a/app/javascript/dashboard/i18n/locale/he/generalSettings.json b/app/javascript/dashboard/i18n/locale/he/generalSettings.json index 19cf8d627..9dc7b2b45 100644 --- a/app/javascript/dashboard/i18n/locale/he/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/he/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "הקש אנטר כדי לבחור", "ENTER_TO_REMOVE": "הקש אנטר כדי להסיר", - "SELECT_ONE": "תבחר אחד" + "SELECT_ONE": "תבחר אחד", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/hi/automation.json b/app/javascript/dashboard/i18n/locale/hi/automation.json index e05ecd9ec..469df1c24 100644 --- a/app/javascript/dashboard/i18n/locale/hi/automation.json +++ b/app/javascript/dashboard/i18n/locale/hi/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below" }, "CONDITION": { - "DELETE_MESSAGE": "You need to have atleast one condition to save" + "DELETE_MESSAGE": "You need to have atleast one condition to save", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "You need to have atleast one action to save", diff --git a/app/javascript/dashboard/i18n/locale/hi/generalSettings.json b/app/javascript/dashboard/i18n/locale/hi/generalSettings.json index 164a6b94e..f9e763808 100644 --- a/app/javascript/dashboard/i18n/locale/hi/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/hi/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Press enter to select", "ENTER_TO_REMOVE": "Press enter to remove", - "SELECT_ONE": "Select one" + "SELECT_ONE": "Select one", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/hu/automation.json b/app/javascript/dashboard/i18n/locale/hu/automation.json index fc5667277..8c8fd00d7 100644 --- a/app/javascript/dashboard/i18n/locale/hu/automation.json +++ b/app/javascript/dashboard/i18n/locale/hu/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below" }, "CONDITION": { - "DELETE_MESSAGE": "You need to have atleast one condition to save" + "DELETE_MESSAGE": "You need to have atleast one condition to save", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "You need to have atleast one action to save", diff --git a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json index b520ae92f..d70b37d58 100644 --- a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Enter-rel válaszd ki", "ENTER_TO_REMOVE": "Enter-rel távolítsd el", - "SELECT_ONE": "Válassz egyet" + "SELECT_ONE": "Válassz egyet", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/id/automation.json b/app/javascript/dashboard/i18n/locale/id/automation.json index 62b4d9f64..1e1331e35 100644 --- a/app/javascript/dashboard/i18n/locale/id/automation.json +++ b/app/javascript/dashboard/i18n/locale/id/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below" }, "CONDITION": { - "DELETE_MESSAGE": "You need to have atleast one condition to save" + "DELETE_MESSAGE": "You need to have atleast one condition to save", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "You need to have atleast one action to save", diff --git a/app/javascript/dashboard/i18n/locale/id/generalSettings.json b/app/javascript/dashboard/i18n/locale/id/generalSettings.json index fb21426b2..a783d4d0b 100644 --- a/app/javascript/dashboard/i18n/locale/id/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/id/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Tekan enter untuk memilih", "ENTER_TO_REMOVE": "Tekan enter untuk menghapus", - "SELECT_ONE": "Pilih satu" + "SELECT_ONE": "Pilih satu", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/is/automation.json b/app/javascript/dashboard/i18n/locale/is/automation.json index 6abbaf938..9676fd033 100644 --- a/app/javascript/dashboard/i18n/locale/is/automation.json +++ b/app/javascript/dashboard/i18n/locale/is/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Að breyta gerð viðburðar mun endurstilla skilyrðin og viðburðina sem þú hefur bætt við hér að neðan" }, "CONDITION": { - "DELETE_MESSAGE": "Þú þarft að hafa að minnsta kosti eitt skilyrði til að vista" + "DELETE_MESSAGE": "Þú þarft að hafa að minnsta kosti eitt skilyrði til að vista", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "Þú þarft að hafa að minnsta kosti eina aðgerð til að vista", diff --git a/app/javascript/dashboard/i18n/locale/is/generalSettings.json b/app/javascript/dashboard/i18n/locale/is/generalSettings.json index 292cc9589..23b84ede5 100644 --- a/app/javascript/dashboard/i18n/locale/is/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/is/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Press enter to select", "ENTER_TO_REMOVE": "Press enter to remove", - "SELECT_ONE": "Select one" + "SELECT_ONE": "Select one", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/it/automation.json b/app/javascript/dashboard/i18n/locale/it/automation.json index db9053e02..222089f44 100644 --- a/app/javascript/dashboard/i18n/locale/it/automation.json +++ b/app/javascript/dashboard/i18n/locale/it/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Cambiare il tipo di evento resetterà le condizioni e gli eventi che hai aggiunto di seguito" }, "CONDITION": { - "DELETE_MESSAGE": "È necessario avere almeno una condizione per salvare" + "DELETE_MESSAGE": "È necessario avere almeno una condizione per salvare", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "È necessario avere almeno una azione da salvare", diff --git a/app/javascript/dashboard/i18n/locale/it/generalSettings.json b/app/javascript/dashboard/i18n/locale/it/generalSettings.json index 1a7ea20f6..a163be7fb 100644 --- a/app/javascript/dashboard/i18n/locale/it/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/it/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Premi Invio per selezionare", "ENTER_TO_REMOVE": "Premi Invio per rimuovere", - "SELECT_ONE": "Selezionane uno" + "SELECT_ONE": "Selezionane uno", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/ja/automation.json b/app/javascript/dashboard/i18n/locale/ja/automation.json index 3faf86361..29fe5dad2 100644 --- a/app/javascript/dashboard/i18n/locale/ja/automation.json +++ b/app/javascript/dashboard/i18n/locale/ja/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below" }, "CONDITION": { - "DELETE_MESSAGE": "You need to have atleast one condition to save" + "DELETE_MESSAGE": "You need to have atleast one condition to save", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "You need to have atleast one action to save", diff --git a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json index 0692febb5..46c8b5567 100644 --- a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Press enter to select", "ENTER_TO_REMOVE": "Press enter to remove", - "SELECT_ONE": "Select one" + "SELECT_ONE": "Select one", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/ka/automation.json b/app/javascript/dashboard/i18n/locale/ka/automation.json index e05ecd9ec..469df1c24 100644 --- a/app/javascript/dashboard/i18n/locale/ka/automation.json +++ b/app/javascript/dashboard/i18n/locale/ka/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below" }, "CONDITION": { - "DELETE_MESSAGE": "You need to have atleast one condition to save" + "DELETE_MESSAGE": "You need to have atleast one condition to save", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "You need to have atleast one action to save", diff --git a/app/javascript/dashboard/i18n/locale/ka/generalSettings.json b/app/javascript/dashboard/i18n/locale/ka/generalSettings.json index 164a6b94e..f9e763808 100644 --- a/app/javascript/dashboard/i18n/locale/ka/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/ka/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Press enter to select", "ENTER_TO_REMOVE": "Press enter to remove", - "SELECT_ONE": "Select one" + "SELECT_ONE": "Select one", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/ko/automation.json b/app/javascript/dashboard/i18n/locale/ko/automation.json index 6959a6909..cf7b67d20 100644 --- a/app/javascript/dashboard/i18n/locale/ko/automation.json +++ b/app/javascript/dashboard/i18n/locale/ko/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below" }, "CONDITION": { - "DELETE_MESSAGE": "You need to have atleast one condition to save" + "DELETE_MESSAGE": "You need to have atleast one condition to save", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "You need to have atleast one action to save", diff --git a/app/javascript/dashboard/i18n/locale/ko/generalSettings.json b/app/javascript/dashboard/i18n/locale/ko/generalSettings.json index 80f0d00fa..ff2cadd45 100644 --- a/app/javascript/dashboard/i18n/locale/ko/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/ko/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "선택하려면 Enter 키를 누르십시오.", "ENTER_TO_REMOVE": "제거하려면 Enter 키를 누르십시오.", - "SELECT_ONE": "하나 선택" + "SELECT_ONE": "하나 선택", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/lt/automation.json b/app/javascript/dashboard/i18n/locale/lt/automation.json index e05ecd9ec..469df1c24 100644 --- a/app/javascript/dashboard/i18n/locale/lt/automation.json +++ b/app/javascript/dashboard/i18n/locale/lt/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below" }, "CONDITION": { - "DELETE_MESSAGE": "You need to have atleast one condition to save" + "DELETE_MESSAGE": "You need to have atleast one condition to save", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "You need to have atleast one action to save", diff --git a/app/javascript/dashboard/i18n/locale/lt/generalSettings.json b/app/javascript/dashboard/i18n/locale/lt/generalSettings.json index 164a6b94e..f9e763808 100644 --- a/app/javascript/dashboard/i18n/locale/lt/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/lt/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Press enter to select", "ENTER_TO_REMOVE": "Press enter to remove", - "SELECT_ONE": "Select one" + "SELECT_ONE": "Select one", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/lv/automation.json b/app/javascript/dashboard/i18n/locale/lv/automation.json index dd3aedbf7..6483d8e99 100644 --- a/app/javascript/dashboard/i18n/locale/lv/automation.json +++ b/app/javascript/dashboard/i18n/locale/lv/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Mainot notikuma tipu tiks atiestatīti tālāk pievienotie nosacījumi un notikumi" }, "CONDITION": { - "DELETE_MESSAGE": "Lai saglabātu, Jums ir nepieciešams vismaz viens nosacījums" + "DELETE_MESSAGE": "Lai saglabātu, Jums ir nepieciešams vismaz viens nosacījums", + "CONTACT_CUSTOM_ATTR_LABEL": "Kontaktpersonu Pielāgotās Īpašības", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Sarunu Pielāgotās Īpašības" }, "ACTION": { "DELETE_MESSAGE": "Lai saglabātu, ir nepieciešama vismaz viena darbība", diff --git a/app/javascript/dashboard/i18n/locale/lv/generalSettings.json b/app/javascript/dashboard/i18n/locale/lv/generalSettings.json index a395b7cfb..cf1118045 100644 --- a/app/javascript/dashboard/i18n/locale/lv/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/lv/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Nospiediet enter, lai izvēlētos", "ENTER_TO_REMOVE": "Nospiediet enter, lai noņemtu", - "SELECT_ONE": "Izvēlieties vienu" + "SELECT_ONE": "Izvēlieties vienu", + "SELECT": "Izvēlieties" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/ml/automation.json b/app/javascript/dashboard/i18n/locale/ml/automation.json index ec1093368..832c26aa2 100644 --- a/app/javascript/dashboard/i18n/locale/ml/automation.json +++ b/app/javascript/dashboard/i18n/locale/ml/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below" }, "CONDITION": { - "DELETE_MESSAGE": "You need to have atleast one condition to save" + "DELETE_MESSAGE": "You need to have atleast one condition to save", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "You need to have atleast one action to save", diff --git a/app/javascript/dashboard/i18n/locale/ml/generalSettings.json b/app/javascript/dashboard/i18n/locale/ml/generalSettings.json index 4afea4fcd..715cfcab7 100644 --- a/app/javascript/dashboard/i18n/locale/ml/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/ml/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Press enter to select", "ENTER_TO_REMOVE": "Press enter to remove", - "SELECT_ONE": "Select one" + "SELECT_ONE": "Select one", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/ms/automation.json b/app/javascript/dashboard/i18n/locale/ms/automation.json index 6a0713788..a006eaed5 100644 --- a/app/javascript/dashboard/i18n/locale/ms/automation.json +++ b/app/javascript/dashboard/i18n/locale/ms/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below" }, "CONDITION": { - "DELETE_MESSAGE": "You need to have atleast one condition to save" + "DELETE_MESSAGE": "You need to have atleast one condition to save", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "You need to have atleast one action to save", diff --git a/app/javascript/dashboard/i18n/locale/ms/generalSettings.json b/app/javascript/dashboard/i18n/locale/ms/generalSettings.json index 51325e4b7..34302f622 100644 --- a/app/javascript/dashboard/i18n/locale/ms/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/ms/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Press enter to select", "ENTER_TO_REMOVE": "Press enter to remove", - "SELECT_ONE": "Select one" + "SELECT_ONE": "Select one", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/ne/automation.json b/app/javascript/dashboard/i18n/locale/ne/automation.json index 3f91177a9..8d211d0c5 100644 --- a/app/javascript/dashboard/i18n/locale/ne/automation.json +++ b/app/javascript/dashboard/i18n/locale/ne/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below" }, "CONDITION": { - "DELETE_MESSAGE": "You need to have atleast one condition to save" + "DELETE_MESSAGE": "You need to have atleast one condition to save", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "You need to have atleast one action to save", diff --git a/app/javascript/dashboard/i18n/locale/ne/generalSettings.json b/app/javascript/dashboard/i18n/locale/ne/generalSettings.json index 164a6b94e..f9e763808 100644 --- a/app/javascript/dashboard/i18n/locale/ne/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/ne/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Press enter to select", "ENTER_TO_REMOVE": "Press enter to remove", - "SELECT_ONE": "Select one" + "SELECT_ONE": "Select one", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/nl/automation.json b/app/javascript/dashboard/i18n/locale/nl/automation.json index 3faea4f32..b011c930b 100644 --- a/app/javascript/dashboard/i18n/locale/nl/automation.json +++ b/app/javascript/dashboard/i18n/locale/nl/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below" }, "CONDITION": { - "DELETE_MESSAGE": "You need to have atleast one condition to save" + "DELETE_MESSAGE": "You need to have atleast one condition to save", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "You need to have atleast one action to save", diff --git a/app/javascript/dashboard/i18n/locale/nl/generalSettings.json b/app/javascript/dashboard/i18n/locale/nl/generalSettings.json index 80f76738c..e71ba2f3c 100644 --- a/app/javascript/dashboard/i18n/locale/nl/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/nl/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Press enter to select", "ENTER_TO_REMOVE": "Press enter to remove", - "SELECT_ONE": "Select one" + "SELECT_ONE": "Select one", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/no/automation.json b/app/javascript/dashboard/i18n/locale/no/automation.json index 125ea4071..7f7d4be8c 100644 --- a/app/javascript/dashboard/i18n/locale/no/automation.json +++ b/app/javascript/dashboard/i18n/locale/no/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below" }, "CONDITION": { - "DELETE_MESSAGE": "You need to have atleast one condition to save" + "DELETE_MESSAGE": "You need to have atleast one condition to save", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "You need to have atleast one action to save", diff --git a/app/javascript/dashboard/i18n/locale/no/generalSettings.json b/app/javascript/dashboard/i18n/locale/no/generalSettings.json index 18b5f6d4d..998798d6e 100644 --- a/app/javascript/dashboard/i18n/locale/no/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/no/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Trykk enter for å velge", "ENTER_TO_REMOVE": "Trykk enter for å fjerne", - "SELECT_ONE": "Velg en" + "SELECT_ONE": "Velg en", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/pl/automation.json b/app/javascript/dashboard/i18n/locale/pl/automation.json index 5955c3402..b34a72ab1 100644 --- a/app/javascript/dashboard/i18n/locale/pl/automation.json +++ b/app/javascript/dashboard/i18n/locale/pl/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below" }, "CONDITION": { - "DELETE_MESSAGE": "You need to have atleast one condition to save" + "DELETE_MESSAGE": "You need to have atleast one condition to save", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "You need to have atleast one action to save", diff --git a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json index 509e9deb2..821536dae 100644 --- a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Naciśnij Enter, aby wybrać", "ENTER_TO_REMOVE": "Naciśnij Enter, aby usunąć", - "SELECT_ONE": "Wybierz jeden" + "SELECT_ONE": "Wybierz jeden", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/pt/automation.json b/app/javascript/dashboard/i18n/locale/pt/automation.json index f49a5eb1a..da2cbf619 100644 --- a/app/javascript/dashboard/i18n/locale/pt/automation.json +++ b/app/javascript/dashboard/i18n/locale/pt/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below" }, "CONDITION": { - "DELETE_MESSAGE": "É necessário ter pelo menos uma condição para salvar" + "DELETE_MESSAGE": "É necessário ter pelo menos uma condição para salvar", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "É necessário ter pelo menos uma ação para salvar", diff --git a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json index f383f7c0a..f72e352d5 100644 --- a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Pressione Enter para escolher", "ENTER_TO_REMOVE": "Pressione Enter para eliminar", - "SELECT_ONE": "Selecionar um" + "SELECT_ONE": "Selecionar um", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/automation.json b/app/javascript/dashboard/i18n/locale/pt_BR/automation.json index 4bd1f730b..390785ef2 100644 --- a/app/javascript/dashboard/i18n/locale/pt_BR/automation.json +++ b/app/javascript/dashboard/i18n/locale/pt_BR/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Alterar o tipo de evento irá redefinir as condições e eventos que você adicionou abaixo" }, "CONDITION": { - "DELETE_MESSAGE": "Você precisa ter pelo menos uma condição para salvar" + "DELETE_MESSAGE": "Você precisa ter pelo menos uma condição para salvar", + "CONTACT_CUSTOM_ATTR_LABEL": "Atributos personalizados do contato", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Atributos personalizados da conversa" }, "ACTION": { "DELETE_MESSAGE": "Você precisa ter pelo menos uma ação para salvar", diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json index a872d15d7..827336dae 100644 --- a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Digite enter para selecionar", "ENTER_TO_REMOVE": "Digite enter para remover", - "SELECT_ONE": "Selecione um" + "SELECT_ONE": "Selecione um", + "SELECT": "Selecionar" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/ro/automation.json b/app/javascript/dashboard/i18n/locale/ro/automation.json index cbe67d4de..643ebfb83 100644 --- a/app/javascript/dashboard/i18n/locale/ro/automation.json +++ b/app/javascript/dashboard/i18n/locale/ro/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Modificarea tipului de eveniment va reseta condițiile și evenimentele pe care le-ați adăugat mai jos" }, "CONDITION": { - "DELETE_MESSAGE": "Trebuie să aveți atleast o condiție pentru a salva" + "DELETE_MESSAGE": "Trebuie să aveți atleast o condiție pentru a salva", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "Trebuie să aveți atleast o acțiune pentru a salva", diff --git a/app/javascript/dashboard/i18n/locale/ro/generalSettings.json b/app/javascript/dashboard/i18n/locale/ro/generalSettings.json index de9188fde..42334138a 100644 --- a/app/javascript/dashboard/i18n/locale/ro/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/ro/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Apăsați enter pentru a selecta", "ENTER_TO_REMOVE": "Introduceți numele complet al persoanei de contact", - "SELECT_ONE": "Alege una" + "SELECT_ONE": "Alege una", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/ru/automation.json b/app/javascript/dashboard/i18n/locale/ru/automation.json index 33982a38a..dc4d8b9fb 100644 --- a/app/javascript/dashboard/i18n/locale/ru/automation.json +++ b/app/javascript/dashboard/i18n/locale/ru/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Изменение типа события сбросит условия и события, добавленные вами ниже" }, "CONDITION": { - "DELETE_MESSAGE": "Вам нужно иметь по крайней мере одно условие для сохранения" + "DELETE_MESSAGE": "Вам нужно иметь по крайней мере одно условие для сохранения", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "Вам нужно иметь по крайней мере одно условие для сохранения", diff --git a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json index e3817d468..9a5eb0dcb 100644 --- a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Нажмите Enter для выбора", "ENTER_TO_REMOVE": "Нажмите Enter для удаления", - "SELECT_ONE": "Выберите один" + "SELECT_ONE": "Выберите один", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { @@ -138,6 +139,6 @@ } }, "DASHBOARD_APPS": { - "LOADING_MESSAGE": "Loading Dashboard App..." + "LOADING_MESSAGE": "Загрузка приложения панели управления..." } } diff --git a/app/javascript/dashboard/i18n/locale/sk/automation.json b/app/javascript/dashboard/i18n/locale/sk/automation.json index 53293b4f2..3047c3b4f 100644 --- a/app/javascript/dashboard/i18n/locale/sk/automation.json +++ b/app/javascript/dashboard/i18n/locale/sk/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below" }, "CONDITION": { - "DELETE_MESSAGE": "You need to have atleast one condition to save" + "DELETE_MESSAGE": "You need to have atleast one condition to save", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "You need to have atleast one action to save", diff --git a/app/javascript/dashboard/i18n/locale/sk/generalSettings.json b/app/javascript/dashboard/i18n/locale/sk/generalSettings.json index 911167880..44c61771f 100644 --- a/app/javascript/dashboard/i18n/locale/sk/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/sk/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Stlačením tlačidla enter vyberte", "ENTER_TO_REMOVE": "Stlačením tlačidla enter vymažte", - "SELECT_ONE": "Vyberte jeden" + "SELECT_ONE": "Vyberte jeden", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/sr/automation.json b/app/javascript/dashboard/i18n/locale/sr/automation.json index 285e77ff6..1c054b77d 100644 --- a/app/javascript/dashboard/i18n/locale/sr/automation.json +++ b/app/javascript/dashboard/i18n/locale/sr/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Promena tipa događaja će resetovati uslove i događaje koje ste dodali ispod" }, "CONDITION": { - "DELETE_MESSAGE": "Morate imati barem jedan uslov da bi ste mogli da sačuvate" + "DELETE_MESSAGE": "Morate imati barem jedan uslov da bi ste mogli da sačuvate", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "Morate imati barem jednu akciju da bi ste mogli da sačuvate", diff --git a/app/javascript/dashboard/i18n/locale/sr/generalSettings.json b/app/javascript/dashboard/i18n/locale/sr/generalSettings.json index 0502c5b74..423352111 100644 --- a/app/javascript/dashboard/i18n/locale/sr/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/sr/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Pritisnite enter da bi ste izabrali", "ENTER_TO_REMOVE": "Pritisnite enter da bi ste uklonili", - "SELECT_ONE": "Izaberite jedno" + "SELECT_ONE": "Izaberite jedno", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/sv/automation.json b/app/javascript/dashboard/i18n/locale/sv/automation.json index 76b3431c5..af3b2f822 100644 --- a/app/javascript/dashboard/i18n/locale/sv/automation.json +++ b/app/javascript/dashboard/i18n/locale/sv/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below" }, "CONDITION": { - "DELETE_MESSAGE": "You need to have atleast one condition to save" + "DELETE_MESSAGE": "You need to have atleast one condition to save", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "You need to have atleast one action to save", diff --git a/app/javascript/dashboard/i18n/locale/sv/generalSettings.json b/app/javascript/dashboard/i18n/locale/sv/generalSettings.json index e930e8bf4..4ec6bf367 100644 --- a/app/javascript/dashboard/i18n/locale/sv/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/sv/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Tryck Enter för att välja", "ENTER_TO_REMOVE": "Tryck Enter för att ta bort", - "SELECT_ONE": "Markera en/ett" + "SELECT_ONE": "Markera en/ett", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/ta/automation.json b/app/javascript/dashboard/i18n/locale/ta/automation.json index fab0932e6..458627daf 100644 --- a/app/javascript/dashboard/i18n/locale/ta/automation.json +++ b/app/javascript/dashboard/i18n/locale/ta/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below" }, "CONDITION": { - "DELETE_MESSAGE": "You need to have atleast one condition to save" + "DELETE_MESSAGE": "You need to have atleast one condition to save", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "You need to have atleast one action to save", diff --git a/app/javascript/dashboard/i18n/locale/ta/generalSettings.json b/app/javascript/dashboard/i18n/locale/ta/generalSettings.json index ca5343d4a..a87ed5020 100644 --- a/app/javascript/dashboard/i18n/locale/ta/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/ta/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Press enter to select", "ENTER_TO_REMOVE": "Press enter to remove", - "SELECT_ONE": "Select one" + "SELECT_ONE": "Select one", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/th/automation.json b/app/javascript/dashboard/i18n/locale/th/automation.json index 9c1ad74c1..ec6578b73 100644 --- a/app/javascript/dashboard/i18n/locale/th/automation.json +++ b/app/javascript/dashboard/i18n/locale/th/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "การเปลี่ยนประเภทเหตุการณ์ จะรีเช็ทเงื่อนไขและเหตุการณ์ที่คุณเพิ่มไว้ด้านล่าง" }, "CONDITION": { - "DELETE_MESSAGE": "คุณต้องมีอย่างน้อย 1 เงื่อนไขเพื่อบันทึก" + "DELETE_MESSAGE": "คุณต้องมีอย่างน้อย 1 เงื่อนไขเพื่อบันทึก", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "คุณต้องมีเงื่อนไขอย่างน้อย 1 การกระทำเพื่อบันทึก", diff --git a/app/javascript/dashboard/i18n/locale/th/generalSettings.json b/app/javascript/dashboard/i18n/locale/th/generalSettings.json index 03edecf3a..e871284bd 100644 --- a/app/javascript/dashboard/i18n/locale/th/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/th/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "กด enter เพื่อเลือก", "ENTER_TO_REMOVE": "กด enter เพื่อลบ", - "SELECT_ONE": "เลือก" + "SELECT_ONE": "เลือก", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/tr/automation.json b/app/javascript/dashboard/i18n/locale/tr/automation.json index b6437db91..b8c37267e 100644 --- a/app/javascript/dashboard/i18n/locale/tr/automation.json +++ b/app/javascript/dashboard/i18n/locale/tr/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Olay seçimini değiştirmek tüm koşulları ve aşağıda eklenmiş etkinlikleri değiştirecektir" }, "CONDITION": { - "DELETE_MESSAGE": "Kaydetmek için en az bir koşul eklemelisiniz" + "DELETE_MESSAGE": "Kaydetmek için en az bir koşul eklemelisiniz", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "Kaydetmek için en az bir olay seçmelisiniz", diff --git a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json index ef8d27255..4d19e2d87 100644 --- a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Seçmek için enter tuşuna basın", "ENTER_TO_REMOVE": "Kaldırmak için enter tuşuna basın", - "SELECT_ONE": "Birini seç" + "SELECT_ONE": "Birini seç", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/uk/automation.json b/app/javascript/dashboard/i18n/locale/uk/automation.json index ffe8d75cf..787ed73a3 100644 --- a/app/javascript/dashboard/i18n/locale/uk/automation.json +++ b/app/javascript/dashboard/i18n/locale/uk/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Зміна типу події скине умови та події, які ви додали нижче" }, "CONDITION": { - "DELETE_MESSAGE": "Ви повинні мати принаймні одну умову для збереження" + "DELETE_MESSAGE": "Ви повинні мати принаймні одну умову для збереження", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "Ви повинні мати принаймні одну дію для збереження", diff --git a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json index 9aed3e94e..2e32bf880 100644 --- a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Натисніть Enter, щоб обрати", "ENTER_TO_REMOVE": "Натисніть Enter, щоб видалити", - "SELECT_ONE": "Виберіть" + "SELECT_ONE": "Виберіть", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/ur/automation.json b/app/javascript/dashboard/i18n/locale/ur/automation.json index a297d31a0..4d5fd94b2 100644 --- a/app/javascript/dashboard/i18n/locale/ur/automation.json +++ b/app/javascript/dashboard/i18n/locale/ur/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below" }, "CONDITION": { - "DELETE_MESSAGE": "You need to have atleast one condition to save" + "DELETE_MESSAGE": "You need to have atleast one condition to save", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "You need to have atleast one action to save", diff --git a/app/javascript/dashboard/i18n/locale/ur/generalSettings.json b/app/javascript/dashboard/i18n/locale/ur/generalSettings.json index 112272a46..b97db9e2e 100644 --- a/app/javascript/dashboard/i18n/locale/ur/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/ur/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Press enter to select", "ENTER_TO_REMOVE": "Press enter to remove", - "SELECT_ONE": "Select one" + "SELECT_ONE": "Select one", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/automation.json b/app/javascript/dashboard/i18n/locale/ur_IN/automation.json index e05ecd9ec..469df1c24 100644 --- a/app/javascript/dashboard/i18n/locale/ur_IN/automation.json +++ b/app/javascript/dashboard/i18n/locale/ur_IN/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below" }, "CONDITION": { - "DELETE_MESSAGE": "You need to have atleast one condition to save" + "DELETE_MESSAGE": "You need to have atleast one condition to save", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "You need to have atleast one action to save", diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json b/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json index 164a6b94e..f9e763808 100644 --- a/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Press enter to select", "ENTER_TO_REMOVE": "Press enter to remove", - "SELECT_ONE": "Select one" + "SELECT_ONE": "Select one", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/vi/automation.json b/app/javascript/dashboard/i18n/locale/vi/automation.json index 4ce396a33..0574c5bb8 100644 --- a/app/javascript/dashboard/i18n/locale/vi/automation.json +++ b/app/javascript/dashboard/i18n/locale/vi/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Thay đổi loại sự kiện sẽ đặt lại điều kiện và sự kiện mà bạn đã thêm bên dưới" }, "CONDITION": { - "DELETE_MESSAGE": "Bạn cần có ít nhất một điều kiện để lưu" + "DELETE_MESSAGE": "Bạn cần có ít nhất một điều kiện để lưu", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "Bạn cần có ít nhất một hành động để lưu", diff --git a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json index 03a4b62c2..2f10cbfd5 100644 --- a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "Bấm enter để chọn", "ENTER_TO_REMOVE": "Bấm enter để xoá", - "SELECT_ONE": "Chọn một" + "SELECT_ONE": "Chọn một", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/automation.json b/app/javascript/dashboard/i18n/locale/zh_CN/automation.json index 94da44694..e6f46619c 100644 --- a/app/javascript/dashboard/i18n/locale/zh_CN/automation.json +++ b/app/javascript/dashboard/i18n/locale/zh_CN/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below" }, "CONDITION": { - "DELETE_MESSAGE": "You need to have atleast one condition to save" + "DELETE_MESSAGE": "You need to have atleast one condition to save", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "You need to have atleast one action to save", diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json index 9d4a9d299..effe638cd 100644 --- a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "按回车键选择", "ENTER_TO_REMOVE": "按回车键删除", - "SELECT_ONE": "请选择一个" + "SELECT_ONE": "请选择一个", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/automation.json b/app/javascript/dashboard/i18n/locale/zh_TW/automation.json index 5daa7b95e..8e0db210e 100644 --- a/app/javascript/dashboard/i18n/locale/zh_TW/automation.json +++ b/app/javascript/dashboard/i18n/locale/zh_TW/automation.json @@ -86,7 +86,9 @@ "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below" }, "CONDITION": { - "DELETE_MESSAGE": "You need to have atleast one condition to save" + "DELETE_MESSAGE": "You need to have atleast one condition to save", + "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes", + "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes" }, "ACTION": { "DELETE_MESSAGE": "You need to have atleast one action to save", diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json index f54a36daa..1c7907908 100644 --- a/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json +++ b/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json @@ -54,7 +54,8 @@ "MULTISELECT": { "ENTER_TO_SELECT": "按下 enter 以選擇", "ENTER_TO_REMOVE": "按下 enter 以移除", - "SELECT_ONE": "選擇其中一項" + "SELECT_ONE": "選擇其中一項", + "SELECT": "Select" } }, "NOTIFICATIONS_PAGE": { From f0ef497005051c9f83ee095a6c450828ef750fac Mon Sep 17 00:00:00 2001 From: Sojan Date: Wed, 16 Nov 2022 00:40:38 +0000 Subject: [PATCH 06/30] Bump version to 2.11.0 --- config/app.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/app.yml b/config/app.yml index 518c981ac..0c77e8b68 100644 --- a/config/app.yml +++ b/config/app.yml @@ -1,5 +1,5 @@ shared: &shared - version: '2.10.0' + version: '2.11.0' development: <<: *shared diff --git a/package.json b/package.json index d3476875b..8a087d486 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@chatwoot/chatwoot", - "version": "2.10.0", + "version": "2.11.0", "license": "MIT", "scripts": { "eslint": "eslint app/**/*.{js,vue}", From 42b466bda2cf03a09b47ae8bf21aaa0dd16858ad Mon Sep 17 00:00:00 2001 From: Pranav Raj S Date: Tue, 15 Nov 2022 18:56:24 -0800 Subject: [PATCH 07/30] chore: Cleanup the design in widget builder (#5852) --- .../widget-preview/components/Widget.vue | 37 +++++++++++++------ .../widget-preview/components/WidgetBody.vue | 16 +++++--- .../widget-preview/components/WidgetHead.vue | 26 +++++++------ .../settings/inbox/WidgetBuilder.vue | 4 +- 4 files changed, 55 insertions(+), 28 deletions(-) diff --git a/app/javascript/dashboard/modules/widget-preview/components/Widget.vue b/app/javascript/dashboard/modules/widget-preview/components/Widget.vue index 8ec864042..0b441632b 100644 --- a/app/javascript/dashboard/modules/widget-preview/components/Widget.vue +++ b/app/javascript/dashboard/modules/widget-preview/components/Widget.vue @@ -15,7 +15,14 @@
- {{ $t('INBOX_MGMT.WIDGET_BUILDER.BRANDING_TEXT') }} + + {{ + useInstallationName( + $t('INBOX_MGMT.WIDGET_BUILDER.BRANDING_TEXT'), + globalConfig.installationName + ) + }} +
@@ -45,8 +52,8 @@ import WidgetHead from './WidgetHead'; import WidgetBody from './WidgetBody'; import WidgetFooter from './WidgetFooter'; import InputRadioGroup from 'dashboard/routes/dashboard/settings/inbox/components/InputRadioGroup'; - -const { LOGO_THUMBNAIL: logoThumbnail } = window.globalConfig || {}; +import globalConfigMixin from 'shared/mixins/globalConfigMixin'; +import { mapGetters } from 'vuex'; export default { name: 'Widget', @@ -56,6 +63,7 @@ export default { WidgetFooter, InputRadioGroup, }, + mixins: [globalConfigMixin], props: { welcomeHeading: { type: String, @@ -115,12 +123,10 @@ export default { ], isDefaultScreen: true, isWidgetVisible: true, - globalConfig: { - logoThumbnail, - }, }; }, computed: { + ...mapGetters({ globalConfig: 'globalConfig/get' }), getWidgetHeadConfig() { return { welcomeHeading: this.welcomeHeading, @@ -198,6 +204,7 @@ export default { flex-direction: column; align-items: center; } + .widget-wrapper { display: flex; flex-direction: column; @@ -215,13 +222,14 @@ export default { justify-content: center; .branding-link { - display: flex; - flex-direction: row; align-items: center; color: var(--b-500); cursor: pointer; + display: flex; filter: grayscale(1); + flex-direction: row; font-size: var(--font-size-micro); + line-height: 1.5; opacity: 0.9; text-decoration: none; @@ -248,7 +256,7 @@ export default { .bubble { display: flex; align-items: center; - border-radius: calc(var(--border-radius-small) * 10); + border-radius: calc(var(--border-radius-large) * 10); height: calc(var(--space-large) * 2); width: calc(var(--space-large) * 2); position: relative; @@ -256,15 +264,22 @@ export default { cursor: pointer; img { - height: var(--space-two); - width: var(--space-two); + height: var(--space-medium); margin: var(--space-one) var(--space-one) var(--space-one) var(--space-two); + width: var(--space-medium); } div { padding-right: var(--space-two); } + + .bubble-expanded { + img { + height: var(--space-large); + width: var(--space-large); + } + } } .bubble-close::before, diff --git a/app/javascript/dashboard/modules/widget-preview/components/WidgetBody.vue b/app/javascript/dashboard/modules/widget-preview/components/WidgetBody.vue index 1b4ab08a6..d1bddeb6f 100644 --- a/app/javascript/dashboard/modules/widget-preview/components/WidgetBody.vue +++ b/app/javascript/dashboard/modules/widget-preview/components/WidgetBody.vue @@ -9,7 +9,7 @@ {{ config.replyTime }} - +
@@ -88,18 +88,20 @@ export default { diff --git a/app/javascript/dashboard/routes/dashboard/settings/agentBots/components/AgentBotRow.vue b/app/javascript/dashboard/routes/dashboard/settings/agentBots/components/AgentBotRow.vue new file mode 100644 index 000000000..97e845fa4 --- /dev/null +++ b/app/javascript/dashboard/routes/dashboard/settings/agentBots/components/AgentBotRow.vue @@ -0,0 +1,89 @@ + + + diff --git a/app/javascript/dashboard/routes/dashboard/settings/agentBots/components/AgentBotType.vue b/app/javascript/dashboard/routes/dashboard/settings/agentBots/components/AgentBotType.vue new file mode 100644 index 000000000..f24c659f0 --- /dev/null +++ b/app/javascript/dashboard/routes/dashboard/settings/agentBots/components/AgentBotType.vue @@ -0,0 +1,41 @@ + + + diff --git a/app/javascript/dashboard/routes/dashboard/settings/agentBots/components/CSMLBotEditor.vue b/app/javascript/dashboard/routes/dashboard/settings/agentBots/components/CSMLBotEditor.vue new file mode 100644 index 000000000..838a599f6 --- /dev/null +++ b/app/javascript/dashboard/routes/dashboard/settings/agentBots/components/CSMLBotEditor.vue @@ -0,0 +1,121 @@ +