nvsukhanov · nvsukhanov · Mar 7, 2024 · Mar 7, 2024
diff --git a/modules/bindings/src/lib/gearbox/gearbox-binding-l10n.service.ts b/modules/bindings/src/lib/gearbox/gearbox-binding-l10n.service.ts
@@ -2,7 +2,7 @@ import { Observable } from 'rxjs';
 import { TranslocoService } from '@ngneat/transloco';
 import { Injectable } from '@angular/core';
 import { ControlSchemeBindingType } from '@app/shared-misc';
-import { ControlSchemeBindingInputs, ControlSchemeGearboxBinding, ControlSchemeInput, GearboxBindingInputAction, PortCommandTask } from '@app/store';
+import { ControlSchemeInput, GearboxBindingInputAction, PortCommandTask } from '@app/store';
 
 import { IBindingL10n } from '../i-binding-l10n';
 import { DirectionAwareControllerInputNameService } from '../common';
@@ -27,7 +27,7 @@ export class GearboxBindingL10nService implements IBindingL10n<ControlSchemeBind
     }
 
     public getBindingInputName(
-        actionType: keyof ControlSchemeGearboxBinding['inputs']
+        actionType: GearboxBindingInputAction
     ): Observable<string> {
         switch (actionType) {
             case GearboxBindingInputAction.NextGear:
@@ -40,7 +40,7 @@ export class GearboxBindingL10nService implements IBindingL10n<ControlSchemeBind
     }
 
     public getControllerInputName(
-        actionType: keyof ControlSchemeBindingInputs<ControlSchemeBindingType.Gearbox>,
+        actionType: GearboxBindingInputAction,
         inputConfig: ControlSchemeInput
     ): Observable<string> {
         switch (actionType) {

diff --git a/modules/bindings/src/lib/servo/servo-binding-l10n.service.ts b/modules/bindings/src/lib/servo/servo-binding-l10n.service.ts
@@ -3,14 +3,7 @@ import { Observable, filter, switchMap } from 'rxjs';
 import { TranslocoService } from '@ngneat/transloco';
 import { Store } from '@ngrx/store';
 import { ControlSchemeBindingType } from '@app/shared-misc';
-import {
-    ATTACHED_IO_PROPS_SELECTORS,
-    AttachedIoPropsModel,
-    ControlSchemeBindingInputs,
-    ControlSchemeInput,
-    PortCommandTask,
-    ServoBindingInputAction
-} from '@app/store';
+import { ATTACHED_IO_PROPS_SELECTORS, AttachedIoPropsModel, ControlSchemeInput, PortCommandTask, ServoBindingInputAction } from '@app/store';
 
 import { IBindingL10n } from '../i-binding-l10n';
 import { DirectionAwareControllerInputNameService } from '../common';
@@ -39,7 +32,7 @@ export class ServoBindingL10nService implements IBindingL10n<ControlSchemeBindin
     }
 
     public getBindingInputName(
-        actionType: keyof ControlSchemeBindingInputs<ControlSchemeBindingType.Servo>,
+        actionType: ServoBindingInputAction,
     ): Observable<string> {
         switch (actionType) {
             case ServoBindingInputAction.Cw:
@@ -50,7 +43,7 @@ export class ServoBindingL10nService implements IBindingL10n<ControlSchemeBindin
     }
 
     public getControllerInputName(
-        actionType: keyof ControlSchemeBindingInputs<ControlSchemeBindingType.Servo>,
+        actionType: ServoBindingInputAction,
         inputConfig: ControlSchemeInput
     ): Observable<string> {
         switch (actionType) {

diff --git a/modules/bindings/src/lib/set-angle/set-angle-binding-l10n.service.ts b/modules/bindings/src/lib/set-angle/set-angle-binding-l10n.service.ts
@@ -5,7 +5,6 @@ import { Store } from '@ngrx/store';
 import {
     ATTACHED_IO_PROPS_SELECTORS,
     AttachedIoPropsModel,
-    ControlSchemeBindingInputs,
     ControlSchemeInput,
     ControlSchemeSetAngleBinding,
     PortCommandTask,
@@ -41,14 +40,14 @@ export class SetAngleBindingL10nService implements IBindingL10n<ControlSchemeBin
     }
 
     public getBindingInputName(
-        actionType: keyof ControlSchemeBindingInputs<ControlSchemeBindingType.SetAngle>,
+        actionType: SetAngleBindingInputAction,
         binding: ControlSchemeSetAngleBinding
     ): Observable<string> {
         return this.transloco.selectTranslate('controlScheme.setAngleBinding.inputAction', binding);
     }
 
     public getBasicInputName(
-        actionType: keyof ControlSchemeBindingInputs<ControlSchemeBindingType.SetAngle>
+        actionType: SetAngleBindingInputAction
     ): Observable<string> {
         switch (actionType) {
             case SetAngleBindingInputAction.SetAngle:
@@ -57,7 +56,7 @@ export class SetAngleBindingL10nService implements IBindingL10n<ControlSchemeBin
     }
 
     public getControllerInputName(
-        actionType: keyof ControlSchemeBindingInputs<ControlSchemeBindingType.SetAngle>,
+        actionType: SetAngleBindingInputAction,
         inputConfig: ControlSchemeInput
     ): Observable<string> {
         switch (actionType) {

diff --git a/modules/bindings/src/lib/speed/speed-binding-l10n.service.ts b/modules/bindings/src/lib/speed/speed-binding-l10n.service.ts
@@ -2,7 +2,7 @@ import { Observable } from 'rxjs';
 import { TranslocoService } from '@ngneat/transloco';
 import { Injectable } from '@angular/core';
 import { ControlSchemeBindingType, calculateSpeedPower } from '@app/shared-misc';
-import { ControlSchemeBindingInputs, ControlSchemeInput, PortCommandTask, SpeedBindingInputAction } from '@app/store';
+import { ControlSchemeInput, PortCommandTask, SpeedBindingInputAction } from '@app/store';
 
 import { IBindingL10n } from '../i-binding-l10n';
 import { DirectionAwareControllerInputNameService } from '../common';
@@ -28,7 +28,7 @@ export class SpeedBindingL10nService implements IBindingL10n<ControlSchemeBindin
     }
 
     public getBindingInputName(
-        actionType: keyof ControlSchemeBindingInputs<ControlSchemeBindingType.Speed>
+        actionType: SpeedBindingInputAction
     ): Observable<string> {
         switch (actionType) {
             case SpeedBindingInputAction.Forwards:
@@ -41,7 +41,7 @@ export class SpeedBindingL10nService implements IBindingL10n<ControlSchemeBindin
     }
 
     public getControllerInputName(
-        actionType: keyof ControlSchemeBindingInputs<ControlSchemeBindingType.Speed>,
+        actionType: SpeedBindingInputAction,
         inputConfig: ControlSchemeInput
     ): Observable<string> {
         switch (actionType) {

diff --git a/modules/bindings/src/lib/stepper/stepper-binding-l10n.service.ts b/modules/bindings/src/lib/stepper/stepper-binding-l10n.service.ts
@@ -2,7 +2,7 @@ import { Observable } from 'rxjs';
 import { TranslocoService } from '@ngneat/transloco';
 import { Injectable } from '@angular/core';
 import { ControlSchemeBindingType } from '@app/shared-misc';
-import { ControlSchemeBinding, ControlSchemeBindingInputs, ControlSchemeInput, PortCommandTask, StepperBindingInputAction } from '@app/store';
+import { ControlSchemeInput, ControlSchemeStepperBinding, PortCommandTask, StepperBindingInputAction } from '@app/store';
 
 import { IBindingL10n } from '../i-binding-l10n';
 import { DirectionAwareControllerInputNameService } from '../common';
@@ -28,8 +28,8 @@ export class StepperBindingL10nService implements IBindingL10n<ControlSchemeBind
     }
 
     public getBindingInputName(
-        actionType: keyof ControlSchemeBindingInputs<ControlSchemeBindingType.Stepper>,
-        binding: ControlSchemeBinding & { bindingType: ControlSchemeBindingType.Stepper }
+        actionType: StepperBindingInputAction,
+        binding: ControlSchemeStepperBinding
     ): Observable<string> {
         switch (actionType) {
             case StepperBindingInputAction.Cw:
@@ -40,7 +40,7 @@ export class StepperBindingL10nService implements IBindingL10n<ControlSchemeBind
     }
 
     public getBasicInputName(
-        actionType: keyof ControlSchemeBindingInputs<ControlSchemeBindingType.Stepper>
+        actionType: StepperBindingInputAction
     ): Observable<string> {
         switch (actionType) {
             case StepperBindingInputAction.Cw:
@@ -51,7 +51,7 @@ export class StepperBindingL10nService implements IBindingL10n<ControlSchemeBind
     }
 
     public getControllerInputName(
-        actionType: keyof ControlSchemeBindingInputs<ControlSchemeBindingType.Stepper>,
+        actionType: StepperBindingInputAction,
         inputConfig: ControlSchemeInput
     ): Observable<string> {
         switch (actionType) {

diff --git a/modules/bindings/src/lib/train/train-binding-l10n.service.ts b/modules/bindings/src/lib/train/train-binding-l10n.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { TranslocoService } from '@ngneat/transloco';
 import { MOTOR_LIMITS } from 'rxpoweredup';
-import { ControlSchemeBindingInputs, ControlSchemeInput, PortCommandTask, TrainBindingInputAction } from '@app/store';
+import { ControlSchemeInput, PortCommandTask, TrainBindingInputAction } from '@app/store';
 import { ControlSchemeBindingType } from '@app/shared-misc';
 
 import { IBindingL10n } from '../i-binding-l10n';
@@ -28,20 +28,20 @@ export class TrainBindingL10nService implements IBindingL10n<ControlSchemeBindin
     }
 
     public getBindingInputName(
-        actionType: keyof ControlSchemeBindingInputs<ControlSchemeBindingType.Train>,
+        actionType: TrainBindingInputAction,
     ): Observable<string> {
         switch (actionType) {
             case TrainBindingInputAction.NextSpeed:
-                return this.translocoService.selectTranslate('controlScheme.trainBinding.prevLevel');
+                return this.translocoService.selectTranslate('controlScheme.trainBinding.nextSpeed');
             case TrainBindingInputAction.PrevSpeed:
-                return this.translocoService.selectTranslate('controlScheme.trainBinding.nextLevel');
+                return this.translocoService.selectTranslate('controlScheme.trainBinding.prevSpeed');
             case TrainBindingInputAction.Reset:
                 return this.translocoService.selectTranslate('controlScheme.trainBinding.reset');
         }
     }
 
     public getControllerInputName(
-        actionType: keyof ControlSchemeBindingInputs<ControlSchemeBindingType.Train>,
+        actionType: TrainBindingInputAction,
         inputConfig: ControlSchemeInput
     ): Observable<string> {
         switch (actionType) {

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -306,8 +306,8 @@
       "outputLevelAdd": "Add speed",
       "outputLevelRemove": "Remove speed",
       "taskSummary": "Train, speed #{level} ({speedPercent}%){ isLooping, select, true { (mirror)} other {}}",
-      "nextLevel": "Next speed",
-      "prevLevel": "Prev speed",
+      "nextSpeed": "Next speed",
+      "prevSpeed": "Prev speed",
       "reset": "Set speed #0"
     },
     "gearboxBinding": {

diff --git a/src/assets/i18n/ru.json b/src/assets/i18n/ru.json
@@ -306,8 +306,8 @@
       "outputLevelAdd": "Добавить скорость",
       "outputLevelRemove": "Удалить скорость",
       "taskSummary": "Поезд, скорость №{level} ({speedPercent}%){ isLooping, select, true { (инв.)} other {}}",
-      "nextLevel": "Следующая скорость",
-      "prevLevel": "Предыдущая скорость",
+      "nextSpeed": "Следующая скорость",
+      "prevSpeed": "Предыдущая скорость",
       "reset": "Скорость №0"
     },
     "gearboxBinding": {