Skip to content

Commit

Permalink
Merge branch 'master' into refactor/delete-popup
Browse files Browse the repository at this point in the history
  • Loading branch information
lizacoma committed Oct 30, 2023
2 parents 5cd97fe + 44c3247 commit a578134
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 25 deletions.
11 changes: 7 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"file-saver": "^2.0.2",
"jszip": "^3.2.2",
"jszip-utils": "^0.1.0",
"monaco-editor": "^0.21.3",
"monaco-editor": "^0.44.0",
"path": "^0.12.7",
"query-string": "^7.1.1",
"sortablejs": "^1.10.2",
Expand Down
8 changes: 4 additions & 4 deletions src/app/locale/en/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -673,12 +673,12 @@ export default {
teams: 'Team | Teams',
allTeams: 'All teams',
strategy: 'Strategy',
timing: 'Timing',
maxNoAnswer: 'Max no answer',
callTimeout: 'Call timeout',
parameters: 'Parameters',
maxNoAnswer: 'Max count of missed activities',
callTimeout: 'Call accept timeout',
inviteChatTimeout: 'Chat accept timeout',
wrapUpTime: 'Wrap up time',
noAnswerDelayTime: 'No answer delay time',
noAnswerDelayTime: 'Delay time after missed activity',
strategies: {
random: 'Random',
fewestCalls: 'Agent with fewest calls',
Expand Down
10 changes: 5 additions & 5 deletions src/app/locale/ru/ru.js
Original file line number Diff line number Diff line change
Expand Up @@ -671,12 +671,12 @@ export default {
teams: 'Команда| Команды',
allTeams: 'Все команды',
strategy: 'Стратегия',
timing: 'Параметры дозвона',
maxNoAnswer: 'Максимальное количество звонков без ответа',
callTimeout: 'Длительность вызова',
inviteChatTimeout: 'Время принятия чата',
parameters: 'Параметры',
maxNoAnswer: 'Максимальное количество пропущенных активностей',
callTimeout: 'Время на принятие звонка',
inviteChatTimeout: 'Время на принятие чата',
wrapUpTime: 'Длительность паузы между звонками',
noAnswerDelayTime: 'Время ожидания при отсутствии ответа оператора',
noAnswerDelayTime: 'Время задержки после пропущенной активности',
strategies: {
random: 'Случайно',
fewestCalls: 'Агент с наименьшим количеством звонков',
Expand Down
10 changes: 5 additions & 5 deletions src/app/locale/ua/ua.js
Original file line number Diff line number Diff line change
Expand Up @@ -673,12 +673,12 @@ export default {
teams: 'Команда| Команди',
allTeams: 'Всі команди',
strategy: 'Стратегія',
timing: 'Параметри додзвону',
maxNoAnswer: 'Максимальна кількість дзвінків без відповіді',
callTimeout: 'Тривалість виклику',
inviteChatTimeout: 'Час прийняття чату',
parameters: 'Параметри',
maxNoAnswer: 'Максимальна кількість пропущених активностей',
callTimeout: 'Час на прийняття дзвінка',
inviteChatTimeout: 'Час на прийняття чату',
wrapUpTime: 'Тривалість паузи між дзвінками',
noAnswerDelayTime: 'Час очікування при відсутності відповіді оператора',
noAnswerDelayTime: 'Час затримки після пропущеної активності',
strategies: {
random: 'Випадково',
fewestCalls: 'Оператор з найменшою кількістю дзвінків',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<section>
<header class="content-header">
<h3 class="content-title">
{{ $t('objects.ccenter.teams.timing') }}
{{ $t('objects.ccenter.teams.parameters') }}
</h3>
</header>
<div class="object-input-grid">
Expand Down Expand Up @@ -60,7 +60,7 @@ import openedTabComponentMixin
from '../../../../../app/mixins/objectPagesMixins/openedObjectTabMixin/openedTabComponentMixin';
export default {
name: 'OpenedTeamTiming',
name: 'OpenedTeamParameters',
mixins: [openedTabComponentMixin],
};
</script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ import openedObjectMixin from '../../../../../app/mixins/objectPagesMixins/opene
import Agents from '../modules/agents/components/opened-team-agents.vue';
import Supervisors from '../modules/supervisors/components/opened-team-supervisors.vue';
import General from './opened-team-general.vue';
import Timing from './opened-team-timing.vue';
import Parameters from './opened-team-parameters.vue';
export default {
name: 'OpenedTeam',
components: {
General,
Supervisors,
Agents,
Timing,
Parameters,
},
mixins: [openedObjectMixin],
Expand Down Expand Up @@ -78,8 +78,8 @@ export default {
text: this.$t('objects.general'),
value: 'general',
}, {
text: this.$t('objects.ccenter.teams.timing'),
value: 'timing',
text: this.$t('objects.ccenter.teams.parameters'),
value: 'parameters',
}, {
text: this.$tc('objects.ccenter.agents.supervisors', 2),
value: 'supervisors',
Expand Down

0 comments on commit a578134

Please sign in to comment.