move export 104 translations and references to avoid overwriting

Signed-off-by: Nora Blomaard <[email protected]>

Author: noraeb

packages/compas-open-scd/src/translations/de.ts

@@ -1,25 +1,6 @@
 import { Translations } from './loader.js';
 
 export const de: Translations = {
-  protocol104: {
-    export: {
-      noSignalsFound: 'Export 104 hat keine Signale gefunden',
-      invalidSignalWarning: 'Export 104 hat ein ungültiges Signal gefunden',
-      errors: {
-        tiOrIoaInvalid:
-          'ti or ioa fehlen oder ioa hat weniger als 4 Zeichen, ti: "{{ ti }}", ioa: "{{ ioa }}"',
-        unknownSignalType:
-          'Unbekannter Signaltyp für ti: "{{ ti }}", ioa: "{{ ioa }}"',
-        noDoi: 'Es wurde kein Eltern DOI Element gefunden für ioa: "{{ ioa }}"',
-        noBay:
-          'Es wurde kein Bay Element mit dem Namen "{{ bayName }}" für ioa: "{{ ioa }}" gefunden',
-        noVoltageLevel:
-          'Es wurde kein VoltageLevel Element für Bay "{{ bayName }}" gefunden für ioa "{{ ioa }}"',
-        noSubstation:
-          'Es wurde kein Substation Element gefunden für VoltageLevel "{{ voltageLevelName }}" für ioa "{{ ioa }}"',
-      },
-    },
-  },
   userinfo: {
     loggedInAs: '???',
   },
@@ -156,6 +137,23 @@ export const de: Translations = {
       bayAmount: '???',
       substationGen: '???',
     },
+    export104: {
+      noSignalsFound: 'Export 104 hat keine Signale gefunden',
+      invalidSignalWarning: 'Export 104 hat ein ungültiges Signal gefunden',
+      errors: {
+        tiOrIoaInvalid:
+          'ti or ioa fehlen oder ioa hat weniger als 4 Zeichen, ti: "{{ ti }}", ioa: "{{ ioa }}"',
+        unknownSignalType:
+          'Unbekannter Signaltyp für ti: "{{ ti }}", ioa: "{{ ioa }}"',
+        noDoi: 'Es wurde kein Eltern DOI Element gefunden für ioa: "{{ ioa }}"',
+        noBay:
+          'Es wurde kein Bay Element mit dem Namen "{{ bayName }}" für ioa: "{{ ioa }}" gefunden',
+        noVoltageLevel:
+          'Es wurde kein VoltageLevel Element für Bay "{{ bayName }}" gefunden für ioa "{{ ioa }}"',
+        noSubstation:
+          'Es wurde kein Substation Element gefunden für VoltageLevel "{{ voltageLevelName }}" für ioa "{{ ioa }}"',
+      },
+    },
   },
   locamation: {
     vmu: {

packages/compas-open-scd/src/translations/en.ts

@@ -1,23 +1,4 @@
 export const en = {
-  protocol104: {
-    export: {
-      noSignalsFound: 'Export 104 found no signals',
-      invalidSignalWarning: 'Export 104 found invalid signal',
-      errors: {
-        tiOrIoaInvalid:
-          'ti or ioa are missing or ioa is less than 4 digits, ti: "{{ ti }}", ioa: "{{ ioa }}"',
-        unknownSignalType:
-          'Unknown signal type for ti: "{{ ti }}", ioa: "{{ ioa }}"',
-        noDoi: 'No parent DOI found for address with ioa: "{{ ioa }}"',
-        noBay:
-          'No Bay found bayname: "{{ bayName }}" for address with ioa: "{{ ioa }}"',
-        noVoltageLevel:
-          'No parent voltage level found for bay "{{ bayName }}" for ioa "{{ ioa }}"',
-        noSubstation:
-          'No parent substation found for voltage level "{{ voltageLevelName }}" for ioa "{{ ioa }}"',
-      },
-    },
-  },
   userinfo: {
     loggedInAs: 'Logged in as {{name}}',
   },
@@ -165,6 +146,23 @@ export const en = {
       bayAmount: `Generating {{amount}} Bay Element(s) for {{voltagelevelname}} Voltage Level!`,
       substationGen: `Generated {{substationname}} substation with content!`,
     },
+    export104: {
+      noSignalsFound: 'Export 104 found no signals',
+      invalidSignalWarning: 'Export 104 found invalid signal',
+      errors: {
+        tiOrIoaInvalid:
+          'ti or ioa are missing or ioa is less than 4 digits, ti: "{{ ti }}", ioa: "{{ ioa }}"',
+        unknownSignalType:
+          'Unknown signal type for ti: "{{ ti }}", ioa: "{{ ioa }}"',
+        noDoi: 'No parent DOI found for address with ioa: "{{ ioa }}"',
+        noBay:
+          'No Bay found bayname: "{{ bayName }}" for address with ioa: "{{ ioa }}"',
+        noVoltageLevel:
+          'No parent voltage level found for bay "{{ bayName }}" for ioa "{{ ioa }}"',
+        noSubstation:
+          'No parent substation found for voltage level "{{ voltageLevelName }}" for ioa "{{ ioa }}"',
+      },
+    },
   },
   locamation: {
     vmu: {

packages/plugins/src/menu/Export104.ts

@@ -27,7 +27,7 @@ export default class Export104 extends LitElement {
     if (signals.length === 0) {
       this.dispatchEvent(newLogEvent({
         kind: 'info',
-        title: get('protocol104.export.noSignalsFound'),
+        title: get('compas.export104.noSignalsFound'),
       }));
       return;
     }
@@ -48,7 +48,7 @@ export default class Export104 extends LitElement {
   private logWarning(errorMessage: string): void {
     this.dispatchEvent(newLogEvent({
       kind: 'warning',
-      title: get('protocol104.export.invalidSignalWarning'),
+      title: get('compas.export104.invalidSignalWarning'),
       message: errorMessage,
     }));
   }

packages/plugins/src/menu/export104/foundation.ts

@@ -47,21 +47,21 @@ function extractSignal104Data(addressElement: Element, doc: XMLDocument): Extrac
 
   // By convention the last four digits of the ioa are the signalnumber, see https://github.com/com-pas/compas-open-scd/issues/334
   if (ti === null || ioa === null || ioa.length < 4) {
-    return { signal: null, error: get('protocol104.export.errors.tiOrIoaInvalid', { ti: ti ?? '', ioa: ioa ?? '' }) };
+    return { signal: null, error: get('compas.export104.errors.tiOrIoaInvalid', { ti: ti ?? '', ioa: ioa ?? '' }) };
   }
   const { signalNumber, bayName } = splitIoa(ioa);
 
   const signalType = getSignalType(ti);
   if (signalType === SignalType.Unknown) {
-    return { signal: null, error: get('protocol104.export.errors.unknownSignalType', { ti: ti ?? '', ioa: ioa ?? '' }) };
+    return { signal: null, error: get('compas.export104.errors.unknownSignalType', { ti: ti ?? '', ioa: ioa ?? '' }) };
   }
   const isMonitorSignal = signalType === SignalType.Monitor;
 
   addressElement.parentElement;
   const parentDOI = addressElement.closest('DOI');
 
   if (!parentDOI) {
-    return { signal: null, error: get('protocol104.export.errors.noDoi', { ioa: ioa ?? '' }) };
+    return { signal: null, error: get('compas.export104.errors.noDoi', { ioa: ioa ?? '' }) };
   }
 
   const doiDesc = parentDOI.getAttribute('desc');
@@ -70,20 +70,20 @@ function extractSignal104Data(addressElement: Element, doc: XMLDocument): Extrac
   const parentBay = doc.querySelector(parentBayQuery);
 
   if (!parentBay) {
-    return { signal: null, error: get('protocol104.export.errors.noBay', { bayName, ioa: ioa ?? '' }) };
+    return { signal: null, error: get('compas.export104.errors.noBay', { bayName, ioa: ioa ?? '' }) };
   }
 
   const parentVoltageLevel = parentBay.closest('VoltageLevel');
 
   if (!parentVoltageLevel) {
-    return { signal: null, error: get('protocol104.export.errors.noVoltageLevel', { bayName, ioa: ioa ?? '' }) };
+    return { signal: null, error: get('compas.export104.errors.noVoltageLevel', { bayName, ioa: ioa ?? '' }) };
   }
 
   const voltageLevelName = parentVoltageLevel.getAttribute('name');
   const parentSubstation = parentVoltageLevel.closest('Substation');
 
   if (!parentSubstation) {
-    return { signal: null, error: get('protocol104.export.errors.noSubstation', { voltageLevelName: voltageLevelName ?? '', ioa: ioa ?? '' }) };
+    return { signal: null, error: get('compas.export104.errors.noSubstation', { voltageLevelName: voltageLevelName ?? '', ioa: ioa ?? '' }) };
   }
 
   const substationName = parentSubstation.getAttribute('name');

packages/plugins/test/unit/menu/104Export/foundation.test.ts

@@ -53,8 +53,8 @@ describe('Export104 foundation', () => {
     ];
 
     const expectedErrors = [
-      '[protocol104.export.errors.unknownSignalType]',
-      '[protocol104.export.errors.tiOrIoaInvalid]',
+      '[compas.export104.errors.unknownSignalType]',
+      '[compas.export104.errors.tiOrIoaInvalid]',
     ];
 
     expect(errors).to.deep.equal(expectedErrors);