display questionnaire in the current locale

scify · Jan 23, 2025 · 6aaf184 · 6aaf184
1 parent 202a319
commit 6aaf184
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/resources/assets/js/vue-components/questionnaire/QuestionnaireDisplay.vue b/resources/assets/js/vue-components/questionnaire/QuestionnaireDisplay.vue
@@ -153,7 +153,6 @@ export default {
 			if (!this.userLoggedIn()) {
 				const response = await this.getAnonymousUserResponse();
 				this.userResponse = response.data.questionnaire_response ?? null;
-				console.log(this.userResponse);
 				this.displayLoginPrompt = !this.userResponse;
 			}
 			this.initQuestionnaireDisplay();
@@ -217,7 +216,10 @@ export default {
 			this.survey.onValueChanged.add(this.saveQuestionnaireResponseProgress);
 			this.survey.onComplete.add(this.saveQuestionnaireResponse);
 			this.survey.onUploadFiles.add(this.onUploadSurveyFile);
-			if (this.surveyLocales && this.surveyLocales.length) {
+			// if the current locale exists in the survey locales, set it as the default locale
+			if (this.surveyLocales.find((l) => l.code === this.locale)) {
+				this.survey.locale = this.locale;
+			} else if (this.surveyLocales && this.surveyLocales.length) {
 				this.survey.locale = this.surveyLocales[0].code;
 			}
 			this.survey.onAfterRenderSurvey.add(() => {
@@ -398,23 +400,21 @@ export default {
 			return window.route("login", this.locale) + `?redirectTo=${window.location.href}`;
 		},
 		getDefaultLocaleForQuestionnaire() {
-			const locales = this.survey.getUsedLocales();
-			const url = window.location.href;
-			const start = this.getPosition(url, "/", 3) + 1;
-			const end = this.getPosition(url, "/", 4);
-			const urlLang = url.substring(start, end);
-			if (locales.indexOf(urlLang) !== -1) {
-				return urlLang;
+			let locale = this.locale;
+			// fix for the greek language (el to gr)
+			if (locale === "el") {
+				locale = "gr";
 			}
-			// fix for the greek language (gr to el)
-			if (urlLang === "gr") {
-				return "el";
+			const locales = this.survey.getUsedLocales();
+			// if the current locale exists in the survey locales, set it as the default locale
+			if (locales && locales.length && locales.includes(locale)) {
+				this.defaultLangCode = locale;
+			} else if (locales && locales.length) {
+				this.defaultLangCode = locales[0];
 			}
+
 			return this.defaultLangCode;
 		},
-		getPosition(str, subString, occurrence) {
-			return str.split(subString, occurrence).join(subString).length;
-		},
 		trans(key) {
 			return window.trans(key);
 		},