diff --git a/src/components/pages/CallForward/CscDestination.vue b/src/components/pages/CallForward/CscDestination.vue index 4886fbb8..827b564c 100644 --- a/src/components/pages/CallForward/CscDestination.vue +++ b/src/components/pages/CallForward/CscDestination.vue @@ -12,7 +12,7 @@ {{ destination.destination | destinationFormat }} - + {{ $t('pages.callForward.for') }} @@ -154,14 +154,12 @@ prevId: this.prevDestId }); }, - isNumber(destination) { + isNonTerminating(destination) { let dest = destination.split(/:|@/); - if (dest[2] === 'fax2mail.local') { - return false; - } - else { - return !isNaN(dest[1]); - } + let host = dest[2]; + let type = host.split('.')[0]; + let isLocal = host.split('.')[1] === 'local' ? true : false; + return type !== 'fax2mail' && type !== 'voicebox' && !isLocal; }, deleteDestination(index) { let clonedDestinations = _.cloneDeep(this.destinations); diff --git a/src/filters/number-format.js b/src/filters/number-format.js index 88232b5e..1ba5aaaa 100644 --- a/src/filters/number-format.js +++ b/src/filters/number-format.js @@ -12,6 +12,7 @@ const DestinationHosts = { VoiceBox: 'voicebox.local', Fax2Mail: 'fax2mail.local', ManagerSecretary: 'managersecretary.local', + Conference: 'conference.local', App: 'app.local' }; @@ -92,11 +93,14 @@ export function normalizeDestination(destination) { else if (authParts[0] === 'custom-hours') { return 'Custom Announcement'; } + else if (host === DestinationHosts.Conference) { + return 'Conference'; + } else if (host === DestinationHosts.App) { return _.capitalize(authParts[0]); } else if (!isNumber) { - return _.capitalize(host.split('.')[0]); + return authParts[0]; } else { return normalizedNumber; diff --git a/src/locales/en.json b/src/locales/en.json index 98c347f6..bc597371 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -167,7 +167,7 @@ "addInputError": "Input a valid number or subscriber name", "timeout": "Timeout", "destination": "Destination", - "terminatedTooltip": "This destination precedes a terminating destinations, and is therefore inactive.", + "terminatedTooltip": "This destination comes after a terminating destinations, and is therefore inactive.", "times": { "removeDialogTitle": "Remove call forward time", "removeDialogText": "You are about to remove the time entry for {day}",