Merge branch 'main' of github.com:devforth/adminforth into main

Author: ivictbor

adminforth/modules/restApi.ts

@@ -294,7 +294,7 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
           loginBackgroundPosition: this.adminforth.config.auth.loginBackgroundPosition,
           title: this.adminforth.config.customization?.title,
           demoCredentials: this.adminforth.config.auth.demoCredentials,
-          loginPromptHTML: this.adminforth.config.auth.loginPromptHTML,
+          loginPromptHTML: await tr(this.adminforth.config.auth.loginPromptHTML, 'system.loginPromptHTML'),
           loginPageInjections: this.adminforth.config.customization.loginPageInjections,
           rememberMeDays: this.adminforth.config.auth.rememberMeDays,
         }

adminforth/plugins/i18n/custom/LanguageUnderLogin.vue

@@ -32,6 +32,7 @@
 import Select from '@/afcl/Select.vue';
 import 'flag-icon-css/css/flag-icons.min.css';
 import { setLang, getCountryCodeFromLangCode, getLocalLang } from './langCommon';
+import { useCoreStore } from '@/stores/core';
 
 import { computed, ref, onMounted, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
@@ -42,9 +43,11 @@ const { setLocaleMessage, locale } = useI18n();
 const props = defineProps(['meta', 'resource']);
 
 const selectedLanguage = ref('');
+const coreStore = useCoreStore();
 
-watch(() => selectedLanguage.value, (newVal) => {
-  setLang({ setLocaleMessage, locale }, props.meta.pluginInstanceId, newVal);
+watch(() => selectedLanguage.value, async (newVal) => {
+  await setLang({ setLocaleMessage, locale }, props.meta.pluginInstanceId, newVal);
+  coreStore.getPublicConfig();
 });