@ -13,9 +13,9 @@
< span
< span
v - if = "groupSourceset"
v - if = "groupSourceset"
>
>
{ { $t ( ' pages.newCallForward.conditionBtnLabelPrefix ') } }
{ { $t ( ' and ') } }
< span class = "csc-cf-from-link" >
< span class = "csc-cf-from-link" >
{ { $t ( ' pages.newCallForward.fromLabelShort ') + '"' + groupSourceset + '"' } }
{ { $t ( ' call from ') + '"' + groupSourceset + '"' } }
< q -menu
< q -menu
ref = "sourcesListEditMenu"
ref = "sourcesListEditMenu"
>
>
@ -34,9 +34,9 @@
< span
< span
v - if = "groupTimeset && !isRange"
v - if = "groupTimeset && !isRange"
>
>
{ { $t ( ' pages.newCallForward.conditionBtnLabelPrefix ') } }
{ { $t ( ' and ') } }
< span class = "csc-cf-from-link" >
< span class = "csc-cf-from-link" >
{ { $t ( ' pages.newCallForward.dateIsShort ') + groupTimeset } }
{ { $t ( ' date is ') + groupTimeset } }
< / span >
< / span >
< q -menu
< q -menu
ref = "dayWidget"
ref = "dayWidget"
@ -53,7 +53,7 @@
color = "primary"
color = "primary"
icon = "clear"
icon = "clear"
>
>
{ { $t ( ' buttons.c lose') } }
{ { $t ( ' C lose') } }
< / q - b t n >
< / q - b t n >
< q -btn
< q -btn
v - close - popup
v - close - popup
@ -62,7 +62,7 @@
icon = "delete"
icon = "delete"
@ click = "showConfirmDeleteTimesetDialog"
@ click = "showConfirmDeleteTimesetDialog"
>
>
{ { $t ( ' buttons.r emove') } }
{ { $t ( ' R emove') } }
< / q - b t n >
< / q - b t n >
< / div >
< / div >
< / q - d a t e >
< / q - d a t e >
@ -70,8 +70,8 @@
< csc -confirm -dialog
< csc -confirm -dialog
ref = "confirmDeleteTimesetDialog"
ref = "confirmDeleteTimesetDialog"
title - icon = "delete"
title - icon = "delete"
: title = "$t(' pages.newCallForward.cancelTimesetDialogTitle ', {name: groupTimeset})"
: title = "$t(' Delete {name} timeset ', {name: groupTimeset})"
: message = "$t(' pages.newCallForward.cancelTimesetTex t', {name: groupTimeset})"
: message = "$t(' You are about to delete {name} timese t', {name: groupTimeset})"
@ confirm = "deleteTimeset"
@ confirm = "deleteTimeset"
/ >
/ >
@ -79,12 +79,12 @@
< span
< span
v - if = "groupTimeset && isRange"
v - if = "groupTimeset && isRange"
>
>
{ { $t ( ' pages.newCallForward.conditionBtnLabelPrefix ') } }
{ { $t ( ' and ') } }
< span
< span
ref = "isRangeLink"
ref = "isRangeLink"
class = "csc-cf-from-link"
class = "csc-cf-from-link"
>
>
{ { $t ( ' pages.newCallForward.dateRangeShort ') + groupTimeRange } }
{ { $t ( ' date range is ') + groupTimeRange } }
< q -menu
< q -menu
ref = "editDateRangeMenu"
ref = "editDateRangeMenu"
@ hide = "resetAction()"
@ hide = "resetAction()"
@ -101,8 +101,8 @@
< csc -confirm -dialog
< csc -confirm -dialog
ref = "confirmDeleteTimesetDialog"
ref = "confirmDeleteTimesetDialog"
title - icon = "delete"
title - icon = "delete"
: title = "$t(' pages.newCallForward.cancelTimesetDialogTitle ', {name: groupTimeRange})"
: title = "$t(' Delete {name} timeset ', {name: groupTimeRange})"
: message = "$t(' pages.newCallForward.cancelTimesetTex t', {name: groupTimeRange})"
: message = "$t(' You are about to delete {name} timese t', {name: groupTimeRange})"
@ confirm = "deleteTimeset"
@ confirm = "deleteTimeset"
/ >
/ >
< / q - m e n u >
< / q - m e n u >
@ -111,7 +111,7 @@
< span
< span
v - if = "isWeekdays && !isOfficeHours"
v - if = "isWeekdays && !isOfficeHours"
>
>
{ { $t ( ' pages.newCallForward.conditionBtnLabelPrefix ') } }
{ { $t ( ' and ') } }
< span
< span
ref = "isWeekdayLink"
ref = "isWeekdayLink"
class = "csc-cf-from-link"
class = "csc-cf-from-link"
@ -135,7 +135,7 @@
< span
< span
v - if = "isOfficeHours"
v - if = "isOfficeHours"
>
>
{ { $t ( ' pages.newCallForward.conditionBtnLabelPrefix ') } }
{ { $t ( ' and ') } }
< span
< span
ref = "isOfficeHoursLink"
ref = "isOfficeHoursLink"
class = "csc-cf-from-link"
class = "csc-cf-from-link"
@ -162,9 +162,9 @@
v - if = "isTempGroup || !(groupSourceset && groupTimeset || groupSourceset && isWeekdays || groupTimeset && isWeekdays )"
v - if = "isTempGroup || !(groupSourceset && groupTimeset || groupSourceset && isWeekdays || groupTimeset && isWeekdays )"
class = "csc-cf-destination-add-condition"
class = "csc-cf-destination-add-condition"
>
>
{ { $t ( ' pages.newCallForward.conditionBtnLabelPrefix ') } }
{ { $t ( ' and ') } }
< span class = "csc-cf-from-link" >
< span class = "csc-cf-from-link" >
{ { $t ( ' pages.newCallForward.conditionBtnLabel ') } }
{ { $t ( ' condition ') } }
< / span >
< / span >
< q -menu
< q -menu
ref = "conditions"
ref = "conditions"
@ -179,7 +179,7 @@
clickable
clickable
@ click = "()=>{action = 'addFromCondition'}"
@ click = "()=>{action = 'addFromCondition'}"
>
>
< q -item -section > { { $t ( ' pages.newCallForward.fromLabel ') } } < / q - i t e m - s e c t i o n >
< q -item -section > { { $t ( ' If call from ... ') } } < / q - i t e m - s e c t i o n >
< / q - i t e m >
< / q - i t e m >
< q -item
< q -item
v - if = "isTempGroup || !hasTimeset"
v - if = "isTempGroup || !hasTimeset"
@ -187,7 +187,7 @@
clickable
clickable
@ click = "()=>{action = 'addDateIsCondition'}"
@ click = "()=>{action = 'addDateIsCondition'}"
>
>
< q -item -section > { { $t ( ' pages.newCallForward.dateIsLabel ') } } < / q - i t e m - s e c t i o n >
< q -item -section > { { $t ( ' If date is ... ') } } < / q - i t e m - s e c t i o n >
< / q - i t e m >
< / q - i t e m >
< q -item
< q -item
v - if = "isTempGroup || !hasTimeset"
v - if = "isTempGroup || !hasTimeset"
@ -195,7 +195,7 @@
clickable
clickable
@ click = "()=>{action = 'addDateRangeCondition'}"
@ click = "()=>{action = 'addDateRangeCondition'}"
>
>
< q -item -section > { { $t ( ' pages.newCallForward.dateRangeLabel ') } } < / q - i t e m - s e c t i o n >
< q -item -section > { { $t ( ' If date range is ... ') } } < / q - i t e m - s e c t i o n >
< / q - i t e m >
< / q - i t e m >
< q -item
< q -item
v - if = "isTempGroup || !hasTimeset"
v - if = "isTempGroup || !hasTimeset"
@ -203,7 +203,7 @@
clickable
clickable
@ click = "()=>{action = 'addWeekdayCondition'}"
@ click = "()=>{action = 'addWeekdayCondition'}"
>
>
< q -item -section > { { $t ( ' pages.newCallForward.weekdaysLabel ') } } < / q - i t e m - s e c t i o n >
< q -item -section > { { $t ( ' If weekdays are ... ') } } < / q - i t e m - s e c t i o n >
< / q - i t e m >
< / q - i t e m >
< q -item
< q -item
v - if = "isTempGroup || !hasTimeset"
v - if = "isTempGroup || !hasTimeset"
@ -211,7 +211,7 @@
clickable
clickable
@ click = "()=>{action = 'addOfficeHoursCondition'}"
@ click = "()=>{action = 'addOfficeHoursCondition'}"
>
>
< q -item -section > { { $t ( ' pages.newCallForward.officeHoursLabel ') } } < / q - i t e m - s e c t i o n >
< q -item -section > { { $t ( ' If office hours are ... ') } } < / q - i t e m - s e c t i o n >
< / q - i t e m >
< / q - i t e m >
< / q - l i s t >
< / q - l i s t >
< / q - m e n u >
< / q - m e n u >
@ -246,7 +246,7 @@
color = "primary"
color = "primary"
icon = "clear"
icon = "clear"
>
>
{ { $t ( ' buttons.c lose') } }
{ { $t ( ' C lose') } }
< / q - b t n >
< / q - b t n >
< q -btn
< q -btn
v - close - popup
v - close - popup
@ -255,7 +255,7 @@
icon = "delete"
icon = "delete"
@ click = "showConfirmDeleteTimesetDialog"
@ click = "showConfirmDeleteTimesetDialog"
>
>
{ { $t ( ' buttons.r emove') } }
{ { $t ( ' R emove') } }
< / q - b t n >
< / q - b t n >
< / div >
< / div >
< / q - d a t e >
< / q - d a t e >
@ -322,8 +322,8 @@
< csc -confirm -dialog
< csc -confirm -dialog
ref = "confirmDialog"
ref = "confirmDialog"
title - icon = "delete"
title - icon = "delete"
: title = "$t(' pages.newCallForward.cancelGroupDialogTitle ', {groupName: group.name})"
: title = "$t(' Delete {groupName} forwarding group ', {groupName: group.name})"
: message = "$t(' pages.newCallForward.cancelGroupDialogText ', {groupName: group.name})"
: message = "$t(' You are about to delete {groupName} call forwarding group ', {groupName: group.name})"
@ confirm = "confirmDeleteGroup"
@ confirm = "confirmDeleteGroup"
/ >
/ >
< q -spinner -dots
< q -spinner -dots
@ -391,7 +391,7 @@
color = "primary"
color = "primary"
size = "24px"
size = "24px"
/ >
/ >
{ { $t ( ' pages.newCallForward.addDestinationLabel ') } }
{ { $t ( ' Add destination ') } }
< q -menu
< q -menu
ref = "destTypeMenu"
ref = "destTypeMenu"
: auto - close = "true"
: auto - close = "true"
@ -432,6 +432,7 @@ import {
import { import {
date
date
} from 'quasar' } from 'quasar'
import { WeekdayTranslationMap } from 'src/filters/date'
import CscConfirmDialog from '../../CscConfirmationDialog' import CscConfirmDialog from '../../CscConfirmationDialog'
import CscNewCallForwardDestination from './CscNewCallForwardDestination' import CscNewCallForwardDestination from './CscNewCallForwardDestination'
import CscNewCallForwardAddDestinationForm from './CscNewCallForwardAddDestinationForm' import CscNewCallForwardAddDestinationForm from './CscNewCallForwardAddDestinationForm'
@ -511,17 +512,17 @@ export default {
switch ( this . group . name ) {
switch ( this . group . name ) {
case 'csc-unconditional' :
case 'csc-unconditional' :
case 'csc-timeout' :
case 'csc-timeout' :
title = ` ${ this . $t ( ' pages.newCallForward.titles.timeoutGroup ') } `
title = ` ${ this . $t ( ' If available ') } `
break
break
case 'csc-unconditional-from' :
case 'csc-unconditional-from' :
case 'csc-timeout-from' :
case 'csc-timeout-from' :
title = ` ${ this . $t ( ' pages.newCallForward.titles.timeoutGroupFromPre ') } `
title = ` ${ this . $t ( ' If available and ') } `
break
break
case 'csc-offline' :
case 'csc-offline' :
title = ` ${ this . $t ( ' pages.newCallForward.titles.offlineGroup ') } `
title = ` ${ this . $t ( ' If not available ') } `
break
break
case 'csc-busy' :
case 'csc-busy' :
title = ` ${ this . $t ( ' pages.newCallForward.titles.busyGroup ') } `
title = ` ${ this . $t ( ' If busy ') } `
break
break
}
}
return title
return title
@ -583,11 +584,11 @@ export default {
} ,
} ,
weekdaysLabelShort ( ) {
weekdaysLabelShort ( ) {
return this . timeSet . times . length > 1
return this . timeSet . times . length > 1
? ` ${ this . $t ( ' pages.newCallForward.weekdaysLabelShort ') } `
? ` ${ this . $t ( ' weekdays are ') } `
: ` ${ this . $t ( ' pages.newCallForward.weekdayLabelShort ') } `
: ` ${ this . $t ( ' weekday is ') } `
} ,
} ,
officeHoursLabelShort ( ) {
officeHoursLabelShort ( ) {
return this . $tc ( ' pages.newCallForward.officeHoursLabelShort ', this . timeSet . times . length )
return this . $tc ( ' office hour is | office hours are ', this . timeSet . times . length )
} ,
} ,
groupWeekdays ( ) {
groupWeekdays ( ) {
let times = _ . cloneDeep ( _ . get ( this . timeSet , 'times' , [ ] ) )
let times = _ . cloneDeep ( _ . get ( this . timeSet , 'times' , [ ] ) )
@ -635,7 +636,7 @@ export default {
return this . groupTimeset || this . isRange || this . isWeekdays
return this . groupTimeset || this . isRange || this . isWeekdays
} ,
} ,
toggleLabel ( ) {
toggleLabel ( ) {
return this . toggleDefaultNumber ? ` ${ this . $t ( ' pages.newCallForward.primarNumberEnabled ') } ` : ` ${ this . $t ( ' pages.newCallForward.primarNumberDisabled ') } `
return this . toggleDefaultNumber ? ` ${ this . $t ( ' All calls go to the primary number ') } ` : ` ${ this . $t ( ' No call goes to primary number ') } `
} ,
} ,
isTimeoutOrUnconditional ( ) {
isTimeoutOrUnconditional ( ) {
return this . group . name . includes ( 'unconditional' ) || this . group . name . includes ( 'timeout' )
return this . group . name . includes ( 'unconditional' ) || this . group . name . includes ( 'timeout' )
@ -860,7 +861,7 @@ export default {
parseWeekDays ( times ) {
parseWeekDays ( times ) {
const weekDays = [ 'sunday' , 'monday' , 'tuesday' , 'wednesday' , 'thursday' , 'friday' , 'saturday' ]
const weekDays = [ 'sunday' , 'monday' , 'tuesday' , 'wednesday' , 'thursday' , 'friday' , 'saturday' ]
return times
return times
. map ( time => this . $t ( 'pages.callForward.times.' + weekDays [ Number ( time . wday ) - 1 ] ) )
. map ( time => WeekdayTranslationMap [ weekDays [ Number ( time . wday ) - 1 ] ] )
. join ( ', ' )
. join ( ', ' )
} ,
} ,
checkOfficeHoursForAllDays ( times ) {
checkOfficeHoursForAllDays ( times ) {
Sergii Leonenko
4 years ago