From c7e4798ce05e70bb214cae455af66318a2fb553c Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Tue, 8 Feb 2022 18:06:47 +0100
Subject: [PATCH] translate poll creation, buttons place in stepper :art:

---
 .../stepper/stepper.component.html            |  4 ++--
 .../stepper/stepper.component.scss            | 21 ++++++++++++-------
 .../language-selector.component.html          |  2 +-
 .../language-selector.component.ts            |  5 ++++-
 src/assets/i18n/en.json                       |  2 +-
 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/app/features/administration/stepper/stepper.component.html b/src/app/features/administration/stepper/stepper.component.html
index c95d89fb..ad156dfb 100644
--- a/src/app/features/administration/stepper/stepper.component.html
+++ b/src/app/features/administration/stepper/stepper.component.html
@@ -87,12 +87,12 @@
 			<div class="column has-text-right">
 				<app-language-selector class="nav-button"></app-language-selector>
 				<button
-					class="has-no-border nav-button cancel-button"
+					class="nav-button cancel-button"
 					(click)="showCancelDialog()"
 					id="display_cancel_popup_button"
 					aria-haspopup="dialog"
 				>
-					{{ 'nav.leave' | translate }} <i class="fa fa-times"></i>
+					{{ 'nav.leave' | translate }}
 				</button>
 			</div>
 		</div>
diff --git a/src/app/features/administration/stepper/stepper.component.scss b/src/app/features/administration/stepper/stepper.component.scss
index 4bd5fef1..3d0adb39 100644
--- a/src/app/features/administration/stepper/stepper.component.scss
+++ b/src/app/features/administration/stepper/stepper.component.scss
@@ -54,24 +54,29 @@
 
 	.nav-button {
 		margin-top: 0;
-		line-height: $stepper-nav-height;
-		height: $stepper-nav-height;
+		margin-right: 1em;
+		line-height: $stepper-nav-height / 2;
+		height: $stepper-nav-height / 2;
 		display: inline-block;
 		padding-left: 1em;
+		&:nth-last-of-type(1) {
+			margin-right: 0;
+		}
 		&app-language-selector {
 			padding-top: 1rem;
 		}
 	}
 	.cancel-button {
-		line-height: $stepper-nav-height;
-		height: $stepper-nav-height;
+		line-height: $stepper-nav-height / 2;
+		height: $stepper-nav-height / 2;
 		padding: 0 1rem;
-		color: $secondary_color;
+		margin-top: $stepper-nav-height / 4.5;
+		color: $primary_color;
+		border-color: $primary_color;
 
 		&:hover {
-			color: $font_color;
-			outline: black;
-			outline-style: solid;
+			color: $white;
+			background: $primary_color;
 		}
 	}
 	.cancel-button-reject-bottom {
diff --git a/src/app/shared/components/selectors/language-selector/language-selector.component.html b/src/app/shared/components/selectors/language-selector/language-selector.component.html
index 9f7639b9..d5b058e0 100644
--- a/src/app/shared/components/selectors/language-selector/language-selector.component.html
+++ b/src/app/shared/components/selectors/language-selector/language-selector.component.html
@@ -3,7 +3,7 @@
 		<i class="fa fa-language"></i>
 		{{ 'LANGUAGES_SHORT.' + currentLang.toUpperCase() | translate }}
 		<!--		<i class="fa fa-language lang-selector-icon clickable" ></i>-->
-		<i class="fa fa-chevron-down"></i>
+		<!--		<i class="fa fa-chevron-down"></i>-->
 	</button>
 	<p-dialog
 		[modal]="true"
diff --git a/src/app/shared/components/selectors/language-selector/language-selector.component.ts b/src/app/shared/components/selectors/language-selector/language-selector.component.ts
index bf173630..599340d4 100644
--- a/src/app/shared/components/selectors/language-selector/language-selector.component.ts
+++ b/src/app/shared/components/selectors/language-selector/language-selector.component.ts
@@ -25,10 +25,13 @@ export class LanguageSelectorComponent implements OnInit {
 
 	ngOnInit(): void {
 		this.availableLanguages = this.languageService.getAvailableLanguages();
-		this.currentLang = this.languageService.getLangage();
+
 		if (this.storageService.language && this.availableLanguages.indexOf(this.storageService.language) !== -1) {
 			this.languageService.setLanguage(this.storageService.language);
+			this.currentLang = this.storageService.language;
 		}
+		this.currentLang = this.languageService.getLangage();
+		this.language_to_apply = '' + this.currentLang;
 	}
 
 	setLang(newlang: string = 'fr'): void {
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index a6f67e04..dab1b44e 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -41,7 +41,7 @@
     },
     "creation": {
         "init": "Creation",
-        "title": "To begin with",
+        "title": "Poll creation",
         "want": "I want to create a poll",
         "dialog": "Leave poll creation?",
         "dialog_content": "Do you really want to leave the poll creation ? All data will be lost.",