Merge pull request #2660 from sap-labs-france/master-qa

Merge master-qa

README.md

@@ -434,7 +434,7 @@ Here are the default delivered locales:
     "supported": [
       "en_US",
       "fr_FR",
-      "es_MX",
+      "es_ES",
       "de_DE",
       "pt_PT",
       "it_IT",

docker/config-standalone.json

@@ -93,17 +93,6 @@
     "notifStopTransactionAndUnlockConnector": false,
     "maxLastSeenIntervalSecs": 540
   },
-  "Locales": {
-    "default": "en_US",
-    "supported": [
-      "en_US",
-      "fr_FR",
-      "es_MX",
-      "de_DE",
-      "pt_PT",
-      "it_IT"
-    ]
-  },
   "Migration": {
     "active": true
   },

docker/config.json

@@ -139,17 +139,6 @@
     "notifStopTransactionAndUnlockConnector": false,
     "maxLastSeenIntervalSecs": 540
   },
-  "Locales": {
-    "default": "en_US",
-    "supported": [
-      "en_US",
-      "fr_FR",
-      "es_MX",
-      "de_DE",
-      "pt_PT",
-      "it_IT"
-    ]
-  },
   "Migration": {
     "active": true
   },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ev-server",
-  "version": "2.4.75",
+  "version": "2.4.76",
   "engines": {
     "node": "14.x.x",
     "npm": "6.x.x"
@@ -61,36 +61,36 @@
     "autocannon": "autocannon",
     "mochatest": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/*Test.ts",
     "mochatest:parallel": "cross-env TS_NODE_FILES=true mocha --parallel test/**/*Test.ts",
-    "mochatest:nyc": "cross-env TS_NODE_FILES=true nyc mocha test/**/*Test.ts",
+    "mochatest:nyc": "cross-env TS_NODE_FILES=true nyc mocha --no-parallel test/**/*Test.ts",
     "mochatest:nyc:parallel": "cross-env TS_NODE_FILES=true nyc mocha --parallel test/**/*Test.ts",
-    "mochatest:chargingStation": "cross-env TS_NODE_FILES=true mocha test/**/OCPP*Test.ts",
-    "mochatest:ocpi": "cross-env TS_NODE_FILES=true mocha test/**/OCPI*Test.ts",
-    "mochatest:tenant": "cross-env TS_NODE_FILES=true mocha test/**/*TenantTest.ts",
-    "mochatest:org": "cross-env TS_NODE_FILES=true mocha test/**/*OrgTest.ts",
-    "mochatest:setting": "cross-env TS_NODE_FILES=true mocha test/**/*SettingTest.ts",
-    "mochatest:user": "cross-env TS_NODE_FILES=true mocha test/**/UserTest.ts",
-    "mochatest:siteorg": "cross-env TS_NODE_FILES=true mocha test/**/SiteOrgTest.ts",
-    "mochatest:siteareaorg": "cross-env TS_NODE_FILES=true mocha test/**/SiteAreaOrgTest.ts",
-    "mochatest:transaction": "cross-env TS_NODE_FILES=true mocha test/**/TransactionTest.ts",
-    "mochatest:stat": "cross-env TS_NODE_FILES=true mocha test/**/StatisticsTest.ts",
-    "mochatest:auth": "cross-env TS_NODE_FILES=true mocha test/**/AuthenticationTest.ts",
-    "mochatest:ocpp": "cross-env TS_NODE_FILES=true mocha test/**/OCPP*Test.ts",
-    "mochatest:authentication": "cross-env TS_NODE_FILES=true mocha test/**/AuthenticationTest.ts",
-    "mochatest:createContext": "cross-env TS_NODE_FILES=true mocha test/**/ContextBuilderRunner.ts",
-    "mochatest:crypto": "cross-env TS_NODE_FILES=true mocha test/**/EncryptionSettingTest.ts",
-    "mochatest:filter": "cross-env TS_NODE_FILES=true mocha test/**/FilterTest.ts",
-    "mochatest:tenantsetting": "cross-env TS_NODE_FILES=true mocha test/**/ComponentActivationTenantTest.ts",
-    "mochatest:billing": "cross-env TS_NODE_FILES=true mocha test/**/BillingTest.ts",
-    "mochatest:stripe": "cross-env TS_NODE_FILES=true mocha test/**/BillingStripeIntegrationTest.ts",
-    "mochatest:asset": "cross-env TS_NODE_FILES=true mocha test/**/AssetTest.ts",
-    "mochatest:car": "cross-env TS_NODE_FILES=true mocha test/**/CarTest.ts",
-    "mochatest:locking": "cross-env TS_NODE_FILES=true mocha test/**/LockingTest.ts",
-    "mochatest:firmwareUpdateStatus": "cross-env TS_NODE_FILES=true mocha test/**/FirmwareUpdateStatusTest.ts",
-    "mochatest:smartCharging": "cross-env TS_NODE_FILES=true mocha test/**/SmartChargingTest.ts",
-    "mochatest:security": "cross-env TS_NODE_FILES=true mocha test/**/SecurityTest.ts",
-    "mochatest:registrationToken": "cross-env TS_NODE_FILES=true mocha test/**/RegistrationTokenTest.ts",
-    "mochatest:company": "cross-env TS_NODE_FILES=true mocha test/**/CompanyOrgTest.ts",
-    "mochatest:create:utbilling": "cross-env TS_NODE_FILES=true TENANT_FILTER=utbilling mocha test/**/ContextBuilderRunner.ts",
+    "mochatest:chargingStation": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/OCPP*Test.ts",
+    "mochatest:ocpi": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/OCPI*Test.ts",
+    "mochatest:tenant": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/*TenantTest.ts",
+    "mochatest:org": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/*OrgTest.ts",
+    "mochatest:setting": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/*SettingTest.ts",
+    "mochatest:user": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/UserTest.ts",
+    "mochatest:siteorg": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/SiteOrgTest.ts",
+    "mochatest:siteareaorg": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/SiteAreaOrgTest.ts",
+    "mochatest:transaction": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/TransactionTest.ts",
+    "mochatest:stat": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/StatisticsTest.ts",
+    "mochatest:auth": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/AuthenticationTest.ts",
+    "mochatest:ocpp": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/OCPP*Test.ts",
+    "mochatest:authentication": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/AuthenticationTest.ts",
+    "mochatest:createContext": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/ContextBuilderRunner.ts",
+    "mochatest:crypto": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/EncryptionSettingTest.ts",
+    "mochatest:filter": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/FilterTest.ts",
+    "mochatest:tenantsetting": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/ComponentActivationTenantTest.ts",
+    "mochatest:billing": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/BillingTest.ts",
+    "mochatest:stripe": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/BillingStripeIntegrationTest.ts",
+    "mochatest:asset": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/AssetTest.ts",
+    "mochatest:car": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/CarTest.ts",
+    "mochatest:locking": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/LockingTest.ts",
+    "mochatest:firmwareUpdateStatus": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/FirmwareUpdateStatusTest.ts",
+    "mochatest:smartCharging": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/SmartChargingTest.ts",
+    "mochatest:security": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/SecurityTest.ts",
+    "mochatest:registrationToken": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/RegistrationTokenTest.ts",
+    "mochatest:company": "cross-env TS_NODE_FILES=true mocha --no-parallel test/**/CompanyOrgTest.ts",
+    "mochatest:create:utbilling": "cross-env TS_NODE_FILES=true TENANT_FILTER=utbilling mocha --no-parallel test/**/ContextBuilderRunner.ts",
     "coverage": "nyc report --reporter=lcov",
     "coverage:html": "nyc report --reporter=html",
     "clinic:clean": "clinic clean",

postman/EVSE.postman_collection.json

@@ -3103,21 +3103,6 @@
 							"value": null,
 							"disabled": true
 						},
-						{
-							"key": "ExcludeSiteID",
-							"value": null,
-							"disabled": true
-						},
-						{
-							"key": "ExcludeUserIDs",
-							"value": null,
-							"disabled": true
-						},
-						{
-							"key": "IncludeCarUserIDs",
-							"value": null,
-							"disabled": true
-						},
 						{
 							"key": "Skip",
 							"value": null,
@@ -3304,21 +3289,6 @@
 							"value": null,
 							"disabled": true
 						},
-						{
-							"key": "ExcludeSiteID",
-							"value": null,
-							"disabled": true
-						},
-						{
-							"key": "ExcludeUserIDs",
-							"value": null,
-							"disabled": true
-						},
-						{
-							"key": "IncludeCarUserIDs",
-							"value": null,
-							"disabled": true
-						},
 						{
 							"key": "Skip",
 							"value": null,

src/assets/config-template-http.json

@@ -152,17 +152,6 @@
     "notifStopTransactionAndUnlockConnector": false,
     "maxLastSeenIntervalSecs": 540
   },
-  "Locales": {
-    "default": "en_US",
-    "supported": [
-      "en_US",
-      "fr_FR",
-      "es_MX",
-      "de_DE",
-      "pt_PT",
-      "it_IT"
-    ]
-  },
   "Migration": {
     "active": true
   },

src/assets/config-template-https.json

@@ -162,17 +162,6 @@
     "notifStopTransactionAndUnlockConnector": false,
     "maxLastSeenIntervalSecs": 540
   },
-  "Locales": {
-    "default": "en_US",
-    "supported": [
-      "en_US",
-      "fr_FR",
-      "es_MX",
-      "de_DE",
-      "pt_PT",
-      "it_IT"
-    ]
-  },
   "Migration": {
     "active": true
   },

src/assets/server/notification/email/es_MX/billing-user-synchronization-failed.json → src/assets/server/notification/email/es/billing-user-synchronization-failed.json

@@ -19,7 +19,7 @@
     "beforeActionLines": [
       "Estimado administrador,",
       "",
-      "No se pueden sincronizar <% - nbrUsersInError%> usuarios con el sistema de facturación."
+      "No se pueden sincronizar <%- nbrUsersInError%> usuarios con el sistema de facturación."
     ],
     "actions": [{
       "title": "Ver configuración",

src/assets/server/notification/email/es_MX/car-synchronization-failed.json → src/assets/server/notification/email/es/car-synchronization-failed.json

@@ -19,7 +19,7 @@
     "beforeActionLines": [
       "Estimado administrador,",
       "",
-      "No se pueden sincronizar <% - nbrCarsInError%> vehículos con el proveedor de datos del vehículo eléctrico.",
+      "No se pueden sincronizar <%- nbrCarsInError%> vehículos con el proveedor de datos del vehículo eléctrico.",
       ""
     ],
     "actions": [{

src/assets/server/notification/email/es_MX/charging-station-registered.json → src/assets/server/notification/email/es/charging-station-registered.json

@@ -1,5 +1,5 @@
 {
-  "subject": "'<% - chargeBoxID%> 'se acaba de conectar",
+  "subject": "'<%- chargeBoxID %>' se acaba de conectar",
   "tenant": "",
   "baseURL": "<%- evseDashboardURL %>",
   "body": {
@@ -19,7 +19,7 @@
     "beforeActionLines": [
       "Estimado administrador,",
       "",
-      "La terminal <strong> <% - chargeBoxID%> </strong> acaba de conectarse al servidor central."
+      "La terminal <strong>'<%- chargeBoxID %>'</strong> acaba de conectarse al servidor central."
     ],
     "actions": [{
       "title": "Ver <%- chargeBoxID %>",

src/assets/server/notification/email/es_MX/charging-station-status-error.json → src/assets/server/notification/email/es/charging-station-status-error.json

@@ -19,7 +19,7 @@
     "beforeActionLines": [
       "Estimado administrador,",
       "",
-      "Se produjo un error en <strong> '<% - chargeBoxID%>' </strong>, conector <strong> '<% - connectorId%>' </strong>: <strong> <% - error%> </ b>. "
+      "Se produjo un error en <strong> '<%- chargeBoxID%>' </strong>, conector <strong> '<%- connectorId%>' </strong>: <strong> <%- error%> </ b>. "
     ],
     "actions": [{
         "title": "Ver Error",

src/assets/server/notification/email/es_MX/end-of-charge.json → src/assets/server/notification/email/es/end-of-charge.json

@@ -17,9 +17,9 @@
       }
     },
     "beforeActionLines": [
-      "Hola <% - (user.firstName? User.firstName: user.name)%>, ",
+      "Hola <%- (user.firstName? User.firstName: user.name)%>, ",
       "",
-      "Su vehículo eléctrico, que está conectado a la terminal <strong> '<% - chargeBoxID%>' </strong>, conector <strong> '<% - connectorId%>' </strong>, ha completado su carga."
+      "Su vehículo eléctrico, que está conectado a la terminal <strong> '<%- chargeBoxID%>' </strong>, conector <strong> '<%- connectorId%>' </strong>, ha completado su carga."
     ],
     "stats": [
       { "label": "Consumo", "value": "<%- totalConsumption %> kW.h" },

src/assets/server/notification/email/es_MX/end-of-session.json → src/assets/server/notification/email/es/end-of-session.json

@@ -19,7 +19,7 @@
     "beforeActionLines": [
       "Hola <%- (user.firstName?user.firstName:user.name) %>,",
       "",
-      "Su sesión en la terminal <strong> '<% - chargeBoxID%>' </strong>, conector <strong> '<% - connectorId%>' </strong> ha finalizado."
+      "Su sesión en la terminal <strong> '<%- chargeBoxID%>' </strong>, conector <strong> '<%- connectorId%>' </strong> ha finalizado."
     ],
     "stats": [
       { "label": "Consumo", "value": "<%- totalConsumption %> kW.h" },

src/assets/server/notification/email/es_MX/ocpi-patch-status-error.json → src/assets/server/notification/email/es/ocpi-patch-status-error.json

@@ -19,7 +19,7 @@
     "beforeActionLines": [
       "Estimado administrador,",
       "",
-      "La actualización del estatus de la terminal falló en el sitio <strong> '<% - location%>' </strong> ",
+      "La actualización del estatus de la terminal falló en el sitio <strong> '<%- location%>' </strong> ",
       "",
       "Por favor revise el registro",
       ""

src/assets/server/notification/email/es_MX/offline-charging-station.json → src/assets/server/notification/email/es/offline-charging-station.json

@@ -19,7 +19,7 @@
     "beforeActionLines": [
       "Estimado administrador,",
       "",
-      "Las siguientes terminales en su organización están fuera de línea:  <strong> <% - chargeBoxIDs%> </strong> ",
+      "Las siguientes terminales en su organización están fuera de línea:  <strong> <%- chargeBoxIDs%> </strong> ",
       ""
     ],
     "actions": [{

src/assets/server/notification/email/es_MX/optimal-charge-reached.json → src/assets/server/notification/email/es/optimal-charge-reached.json

@@ -19,7 +19,7 @@
     "beforeActionLines": [
       "Hola <%- (user.firstName?user.firstName:user.name) %>,",
       "",
-      "Su vehículo eléctrico, que está conectado a <strong> '<% - chargeBoxID%>' </strong>, conector <strong> '<% - connectorId%>' </strong>, ha alcanzado su carga óptima."
+      "Su vehículo eléctrico, que está conectado a <strong> '<%- chargeBoxID%>' </strong>, conector <strong> '<%- connectorId%>' </strong>, ha alcanzado su carga óptima."
     ],
     "stats": [
       { "label": "Nivel de batería", "value": "<%- stateOfCharge %> %" }

src/assets/server/notification/email/es_MX/session-not-started-after-authorize.json → src/assets/server/notification/email/es/session-not-started-after-authorize.json

@@ -19,7 +19,7 @@
     "beforeActionLines": [
       "Hola <%- (user.firstName?user.firstName:user.name) %>,",
       "",
-      "Insignó en la estación de carga <strong> '<% - chargeBoxID%>' </strong> pero no inició ninguna sesión.",
+      "Insignó en la estación de carga <strong> '<%- chargeBoxID%>' </strong> pero no inició ninguna sesión.",
       ""
     ],
     "actions": [{

src/assets/server/notification/email/es_MX/session-not-started.json → src/assets/server/notification/email/es/session-not-started.json

@@ -19,7 +19,7 @@
     "beforeActionLines": [
       "Hola <%- (user.firstName?user.firstName:user.name) %>,",
       "",
-      "No ha comenzado la sesión en la estación de carga <strong> '<% - chargeBoxID%>' </strong>, conector <strong> '<% - connectorId%>' </strong>.",
+      "No ha comenzado la sesión en la estación de carga <strong> '<%- chargeBoxID%>' </strong>, conector <strong> '<%- connectorId%>' </strong>.",
       ""
     ],
     "actions": [{

src/assets/server/notification/email/es_MX/session-started.json → src/assets/server/notification/email/es/session-started.json

@@ -19,7 +19,7 @@
     "beforeActionLines": [
       "Hola <%- (user.firstName?user.firstName:user.name) %>,",
       "",
-      "Su vehículo eléctrico está conectado correctamente a la terminal <strong> '<% - chargeBoxID%>' </strong>, conector <strong> '<% - connectorId%>' </strong>."
+      "Su vehículo eléctrico está conectado correctamente a la terminal <strong> '<%- chargeBoxID%>' </strong>, conector <strong> '<%- connectorId%>' </strong>."
     ],
     "actions": [{
       "title": "Ver sesion",

src/assets/server/notification/email/es_MX/unknown-user-badged.json → src/assets/server/notification/email/es/unknown-user-badged.json

@@ -19,7 +19,7 @@
     "beforeActionLines": [
       "Estimado administrador,",
       "",
-      "Un usuario desconocido acaba de conectarse a <strong> '<% - chargeBoxID%>' </strong> con el ID de la insignia <strong> '<% - badgeID%>' </strong>."
+      "Un usuario desconocido acaba de conectarse a <strong> '<%- chargeBoxID%>' </strong> con el ID de la insignia <strong> '<%- badgeID%>' </strong>."
     ],
     "actions": [{
       "title": "Editar Insignia",

src/assets/server/notification/email/es_MX/user-account-inactivity.json → src/assets/server/notification/email/es/user-account-inactivity.json

@@ -19,7 +19,7 @@
     "beforeActionLines": [
       "Hola <%- (user.firstName?user.firstName:user.name) %>,",
       "",
-      "No ha iniciado sesión en la aplicación e-Mobility desde <% - lastLogin%>.",
+      "No ha iniciado sesión en la aplicación e-Mobility desde <%- lastLogin%>.",
       "",
       "Para cumplir con las leyes europeas sobre protección general de datos, un administrador puede desactivar su cuenta y posiblemente eliminarla.",
       "",

src/assets/server/notification/email/es_MX/verification-email.json → src/assets/server/notification/email/es/verification-email.json

@@ -17,7 +17,7 @@
       }
     },
     "beforeActionLines": [
-      "Hola <% - (user.firstName? User.firstName: user.name)%>,",
+      "Hola <%- (user.firstName? User.firstName: user.name)%>,",
       "",
       "Ha iniciado una solicitud para activar su cuenta",
       "",

src/assets/server/notification/email/pt_PT/end-of-charge.json → src/assets/server/notification/email/pt/end-of-charge.json

@@ -19,7 +19,7 @@
     "beforeActionLines": [
       "Olá <%- (user.firstName?user.firstName:user.name) %>,",
       "",
-      "Seu veículo elétrico, que está conectado à estação de carregamento <b> '<%- chargeBoxID %>' </b>, conector <b> '<% -connectorId %>' </b>, terminou."
+      "Seu veículo elétrico, que está conectado à estação de carregamento <b> '<%- chargeBoxID %>' </b>, conector <b> '<%-connectorId %>' </b>, terminou."
     ],
     "stats": [
       { "label": "Consumo", "value": "<%- totalConsumption %> kW.h" },

src/assets/server/notification/email/pt_PT/session-not-started.json → src/assets/server/notification/email/pt/session-not-started.json

@@ -19,7 +19,7 @@
     "beforeActionLines": [
       "Olá <%- (user.firstName?user.firstName:user.name) %>,",
       "",
-      "Você não iniciou a sessão na estação de carregamento <b> '<%- chargeBoxID %>' </b>, conector <b> '<% -connectorId %>' </b>.",
+      "Você não iniciou a sessão na estação de carregamento <b> '<%- chargeBoxID %>' </b>, conector <b> '<%-connectorId %>' </b>.",
       ""
     ],
     "actions": [{