diff --git a/packages/manager/apps/dedicated/client/app/components/dedicated-cloud/translations/Messages_fr_FR.json b/packages/manager/apps/dedicated/client/app/components/dedicated-cloud/translations/Messages_fr_FR.json index 9da4e0b74513..acfa69dac712 100644 --- a/packages/manager/apps/dedicated/client/app/components/dedicated-cloud/translations/Messages_fr_FR.json +++ b/packages/manager/apps/dedicated/client/app/components/dedicated-cloud/translations/Messages_fr_FR.json @@ -188,7 +188,6 @@ "ip_servicetype_ipLoadbalancing": "IP Load Balancing", "ip_servicetype_cloudProject": "Projet Cloud", "ip_servicetype_vRack": "VRACK", - "ip_servicetype__PARK": "Parking", "ip_order_quota_full": "Le quota maximal d'IPs a été atteint pour ce serveur.", "ip_order_noservices": "Vous n'avez aucun service disponible à la commande.", "ip_order_step1_question": "Sélectionnez le service pour lequel vous désirez acheter des ", diff --git a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ipv4/ipv4.constant.js b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ipv4/ipv4.constant.js index 5eb781b9e030..59eaded98642 100644 --- a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ipv4/ipv4.constant.js +++ b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ipv4/ipv4.constant.js @@ -7,6 +7,8 @@ import { export const FETCH_PRICE_MAX_TRIES = 5; +export const IP_SERVICETYPE__PARK = 'IP Parking'; + export const PRODUCT_TYPES = { dedicatedServer: { apiTypeName: 'SERVER', @@ -124,6 +126,7 @@ export const IP_LOCATION_GROUPS_BASED_ON_DATACENTER = [ export default { FETCH_PRICE_MAX_TRIES, IP_LOCATION_GROUPS, + IP_SERVICETYPE__PARK, PRODUCT_TYPES, TRACKING_PREFIX, VPS_MAX_QUANTITY, diff --git a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ipv4/ipv4.controller.js b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ipv4/ipv4.controller.js index 89d64e0e815f..502c2ab5dca8 100644 --- a/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ipv4/ipv4.controller.js +++ b/packages/manager/apps/dedicated/client/app/components/ip/agoraOrder/ipv4/ipv4.controller.js @@ -17,6 +17,7 @@ import { import { IP_LOCATION_GROUPS, + IP_SERVICETYPE__PARK, PRODUCT_TYPES, TRACKING_PREFIX, VPS_MAX_QUANTITY, @@ -118,16 +119,19 @@ export default class AgoraIpV4OrderController { }) .then((results) => { results.services.push({ - displayName: this.$translate.instant('ip_servicetype__PARK'), + displayName: IP_SERVICETYPE__PARK, serviceName: 'parking', type: 'parking', }); this.user = results.user; this.services = results.services.map((service) => ({ ...service, - translatedType: this.$translate.instant( - `ip_filter_services_title_${service.type}`, - ), + translatedType: + service.type === 'parking' + ? IP_SERVICETYPE__PARK + : this.$translate.instant( + `ip_filter_services_title_${service.type}`, + ), })); this.ipFailoverPrice = this.getIpFailoverPrice(); diff --git a/packages/manager/apps/dedicated/client/app/ip/components/list/block/ip-ip-block.constant.js b/packages/manager/apps/dedicated/client/app/ip/components/list/block/ip-ip-block.constant.js index 5eba8e246753..d3162eeaf0b4 100644 --- a/packages/manager/apps/dedicated/client/app/ip/components/list/block/ip-ip-block.constant.js +++ b/packages/manager/apps/dedicated/client/app/ip/components/list/block/ip-ip-block.constant.js @@ -1,7 +1,9 @@ export const ADDITIONAL_IP = 'Additional IP'; export const DELETE_TRACKING_PREFIX = 'dedicated::ip::delete-additional-ip'; +export const IP_SERVICETYPE__PARK = 'IP Parking'; export default { ADDITIONAL_IP, DELETE_TRACKING_PREFIX, + IP_SERVICETYPE__PARK, }; diff --git a/packages/manager/apps/dedicated/client/app/ip/components/list/block/move/ip-ip-block-move.controller.js b/packages/manager/apps/dedicated/client/app/ip/components/list/block/move/ip-ip-block-move.controller.js index 9083463d4e8b..013a0d616571 100644 --- a/packages/manager/apps/dedicated/client/app/ip/components/list/block/move/ip-ip-block-move.controller.js +++ b/packages/manager/apps/dedicated/client/app/ip/components/list/block/move/ip-ip-block-move.controller.js @@ -1,4 +1,4 @@ -import { ADDITIONAL_IP } from '../ip-ip-block.constant'; +import { ADDITIONAL_IP, IP_SERVICETYPE__PARK } from '../ip-ip-block.constant'; export default /* @ngInject */ ( $scope, @@ -14,6 +14,7 @@ export default /* @ngInject */ ( $scope.ipCanBeMovedTo = false; $scope.ipCanBeMovedToError = ''; $scope.ADDITIONAL_IP = ADDITIONAL_IP; + $scope.IP_SERVICETYPE__PARK = IP_SERVICETYPE__PARK; $scope.loading = { init: true, @@ -38,7 +39,7 @@ export default /* @ngInject */ ( Ip.getIpMove($scope.data.ipBlock.ipBlock).then((result) => { $scope.ipDestinations = result; $scope.ipDestinations.push({ - service: $translate.instant('ip_servicetype__PARK'), + service: IP_SERVICETYPE__PARK, serviceType: '_PARK', nexthop: [], }); diff --git a/packages/manager/apps/dedicated/client/app/ip/components/list/block/move/ip-ip-block-move.html b/packages/manager/apps/dedicated/client/app/ip/components/list/block/move/ip-ip-block-move.html index 21a189716e4d..ceda67b5254f 100644 --- a/packages/manager/apps/dedicated/client/app/ip/components/list/block/move/ip-ip-block-move.html +++ b/packages/manager/apps/dedicated/client/app/ip/components/list/block/move/ip-ip-block-move.html @@ -49,7 +49,7 @@ class="form-control" data-ng-model="model.serviceName" data-ng-change="model.nexthop = null" - data-ng-options="service as service.service group by (('ip_servicetype_' + service.serviceType) | ducTranslateAlt: service.serviceType) for service in ipDestinations" + data-ng-options="service as service.service group by (('ip_servicetype_' + service.serviceType) | ducTranslateAlt: (service.serviceType === '_PARK' ? IP_SERVICETYPE__PARK : service.serviceType)) for service in ipDestinations" > diff --git a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_fr_FR.json b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_fr_FR.json index 16c738d0780d..107c311c72a9 100644 --- a/packages/manager/apps/dedicated/client/app/ip/translations/Messages_fr_FR.json +++ b/packages/manager/apps/dedicated/client/app/ip/translations/Messages_fr_FR.json @@ -111,7 +111,6 @@ "ip_filter_services_title_MAIL": "Serveurs de Mails", "ip_filter_services_title_CLOUD": "Public Cloud", "ip_filter_services_title_IP_LOAD_BALANCING": "OVHcloud Load Balancer", - "ip_filter_services_title_parking": "Parking", "ip_filter_services_CDN": "Uniquement les CDN", "ip_filter_services_DEDICATED": "Uniquement les Serveurs Dédiés", "ip_filter_services_HOSTED_SSL": "Uniquement les Hosted SSL", @@ -519,7 +518,7 @@ "ip_servicetype_ipLoadbalancing": "IP Load Balancing", "ip_servicetype_cloudProject": "Projet Cloud", "ip_servicetype_vRack": "VRACK", - "ip_servicetype__PARK": "Parking", + "ip_order_quota_full": "Le quota maximal d'IPs a été atteint pour ce serveur.", "ip_order_noservices": "Vous n'avez aucun service disponible à la commande.", "ip_order_step1_question": "Sélectionnez le service pour lequel vous désirez acheter des ",