From 5206c3ab09e4d87170266348e579cc0ca7185d2b Mon Sep 17 00:00:00 2001
From: Thiemann96 <e_thie10@uni-muenster.de>
Date: Sat, 28 Mar 2020 14:15:47 +0100
Subject: [PATCH] updated translation and slides

---
 src/assets/i18n/de.json              | 2 +-
 src/assets/i18n/en.json              | 2 +-
 src/pages/ota-wizard/ota-wizard.html | 2 +-
 src/pages/ota-wizard/ota-wizard.ts   | 5 -----
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
index 33adcd7..32cfa15 100644
--- a/src/assets/i18n/de.json
+++ b/src/assets/i18n/de.json
@@ -83,7 +83,7 @@
       "AUTOMATIC":{
         "STEP1":"Laden den Over-the-Air Sketch der openSenseMap auf die senseBox",
         "STEP2":"Verbinde dich mit gleichen Netzwekr in dem die senseBox eingewählt ist",
-        "STEP3":"Klicke auf OTA Modus aktivieren!"
+        "STEP3":"Klicke auf 'Weiter'!"
       }
     },
     "OTAMODESELECTION":{
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index c3458e3..2e7c311 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -77,7 +77,7 @@
       "AUTOMATIC":{
         "STEP1":"Upload the Over-the-Air Sketch from the OpenSenseMap to the senseBox",
         "STEP2":"Connect this device to the same network the senseBox is connected with",
-        "STEP3":"Click Enable OTA Mode!"
+        "STEP3":"Click Continue!"
       }
     },
     "OTAMODESELECTION":{
diff --git a/src/pages/ota-wizard/ota-wizard.html b/src/pages/ota-wizard/ota-wizard.html
index 68a46f6..e7830d4 100644
--- a/src/pages/ota-wizard/ota-wizard.html
+++ b/src/pages/ota-wizard/ota-wizard.html
@@ -136,7 +136,7 @@
       </ng-container>
     </ion-slide>
     <!-- wifi selection -->
-    <ion-slide id="wifi-slide" *ngIf="!slideIsHidden(slideWifi)">
+    <ion-slide id="wifi-slide" *ngIf="!wifiSlideHidden">
       <ion-grid>
         <div id="wifi-manual" *ngIf="state.wifiSelection == 'manual'">
           <ion-row align-items-center>
diff --git a/src/pages/ota-wizard/ota-wizard.ts b/src/pages/ota-wizard/ota-wizard.ts
index ae3a5fe..339750e 100644
--- a/src/pages/ota-wizard/ota-wizard.ts
+++ b/src/pages/ota-wizard/ota-wizard.ts
@@ -135,7 +135,6 @@ export class OtaWizardPage implements OnInit, OnDestroy {
     }
   }
   showAutomatic() {
-    this.slides.lockSwipeToNext(false);
     this.wifiSlideHidden = true;
     this.automatic = true;
     this.manual = false;
@@ -143,7 +142,6 @@ export class OtaWizardPage implements OnInit, OnDestroy {
   }
 
   showManual() {
-    this.slides.lockSwipeToNext(false);
     this.wifiSlideHidden = false;
     this.manual = true;
     this.automatic = false;
@@ -166,9 +164,7 @@ export class OtaWizardPage implements OnInit, OnDestroy {
     console.log(this.currentSlide)
     switch (this.currentSlide) {
       case OtaSlides.Intro:
-        this.slides.lockSwipeToNext(false);
       case OtaSlides.Intro2:
-        this.slides.lockSwipeToNext(true);
         break
       case OtaSlides.Intro3:
         break  
@@ -177,7 +173,6 @@ export class OtaWizardPage implements OnInit, OnDestroy {
         break
 
       case OtaSlides.WifiSelection:
-        if(this.automatic) this.slides.slideNext()
         this.handleWifiSelection()
         break