Merge branch 'master' of github.com:chamilo/chamilo-lms into portfolio

Author: AngelFQC

assets/vue/AppInstaller.vue

@@ -248,7 +248,7 @@
 
 <script setup>
 import { useI18n } from "vue-i18n"
-import { onMounted, provide, ref } from "vue"
+import { onMounted, provide, ref, watch } from "vue"
 
 import BaseAppLink from "./components/basecomponents/BaseAppLink.vue"
 import BaseButton from "./components/basecomponents/BaseButton.vue"
@@ -260,8 +260,8 @@ import Step5 from "./components/installer/Step5"
 import Step6 from "./components/installer/Step6"
 import Step7 from "./components/installer/Step7"
 
-const { t } = useI18n()
-const installerData = ref(window.installerData)
+const { t, locale } = useI18n()
+const installerData = ref(window.installerData || {})
 
 if (!installerData.value.stepData) {
   installerData.value.stepData = {
@@ -304,15 +304,63 @@ const steps = ref([
   },
 ])
 
+function refreshStepTitles() {
+  steps.value = [
+    { step: 1, stepTitle: t("Installation language") },
+    { step: 2, stepTitle: t("Requirements") },
+    { step: 3, stepTitle: t("License") },
+    { step: 4, stepTitle: t("Database settings") },
+    { step: 5, stepTitle: t("Config settings") },
+    { step: 6, stepTitle: t("Show Overview") },
+    { step: 7, stepTitle: t("Install") },
+  ]
+}
+
+function normalizeLocale(iso) {
+  if (!iso) return "en_US"
+  const low = String(iso).toLowerCase()
+  if (low === "es" || low.startsWith("es_")) return "es"
+  if (low === "en" || low.startsWith("en_")) return "en_US"
+  return iso
+}
+
 onMounted(() => {
-  const txtIsExecutable = document.getElementById("is_executable")
+  const initial = normalizeLocale(
+    installerData.value.langIso || installerData.value.languageForm
+  )
+
+  installerData.value.langIso = initial
 
-  if (!txtIsExecutable) {
-    return
+  if (initial && locale.value !== initial) {
+    locale.value = initial
+    refreshStepTitles()
   }
 
-  document
-    .querySelectorAll("button")
-    .forEach((button) => button.addEventListener("click", () => (txtIsExecutable.value = button.name)))
+  const txtIsExecutable = document.getElementById("is_executable")
+  if (!txtIsExecutable) return
+
+  const form = document.getElementById("install_form")
+  if (form) {
+    form
+      .querySelectorAll("button")
+      .forEach((button) =>
+        button.addEventListener("click", () => (txtIsExecutable.value = button.name))
+      )
+  }
 })
+
+watch(
+  () => installerData.value?.langIso,
+  (iso) => {
+    const next = normalizeLocale(iso)
+    if (next && next !== iso) {
+      installerData.value.langIso = next
+      return
+    }
+    if (next && locale.value !== next) {
+      locale.value = next
+      refreshStepTitles()
+    }
+  }
+)
 </script>

assets/vue/components/basecomponents/BaseTable.vue

@@ -98,10 +98,10 @@ function parseRowList(val) {
   return [5, 10, 20, 50]
 }
 
-const rowListRaw = computed(() => getSetting("platform.table_row_list", [5, 10, 20, 50]))
+const rowListRaw = computed(() => getSetting("display.table_row_list", [5, 10, 20, 50]))
 
 const defaultRowSetting = computed(() => {
-  const raw = getSetting("platform.table_default_row", DEFAULT_FALLBACK_ROWS)
+  const raw = getSetting("display.table_default_row", DEFAULT_FALLBACK_ROWS)
   const n = Number(raw)
   if (!Number.isFinite(n) || n <= 0) return DEFAULT_FALLBACK_ROWS
   return n

assets/vue/components/course/CourseTool.vue

@@ -30,7 +30,7 @@
           isAllowedToEdit &&
           !isSorting &&
           !isCustomizing &&
-          (session?.id ? 'true' === getSetting('course.allow_edit_tool_visibility_in_session') : true)
+          (session?.id ? 'true' === getSetting('session.allow_edit_tool_visibility_in_session') : true)
         "
         @click="changeVisibility(tool)"
       >

assets/vue/components/installer/Step1.vue

@@ -74,7 +74,7 @@
 </template>
 
 <script setup>
-import { inject } from "vue"
+import { inject, computed } from "vue"
 import { useI18n } from "vue-i18n"
 
 import Message from "primevue/message"
@@ -84,9 +84,28 @@ import SectionHeader from "../layout/SectionHeader.vue"
 
 import languages from "../../utils/languages"
 
-const availableLanguages = languages.filter((language) => ["en_US", "fr_FR", "es", "de", "nl", "ar"].includes(language.isocode))
-
 const { t } = useI18n()
-
 const installerData = inject("installerData")
+
+const ALLOWED = ["ar", "de", "en_US", "es", "fr_FR", "he_IL", "it", "nl", "pt_BR", "sl_SI"]
+
+const availableLanguages = computed(() => {
+  const allow = new Set(ALLOWED.map((x) => x.toLowerCase()))
+  const list = languages
+    .filter((l) => allow.has(l.isocode.toLowerCase()))
+    .map((l) => ({
+      isocode: l.isocode,
+      original_name: l.original_name || l.english_name || l.isocode,
+    }))
+  const iso = installerData?.value?.langIso
+  if (iso && !list.some((l) => l.isocode.toLowerCase() === String(iso).toLowerCase())) {
+    const found = languages.find((l) => l.isocode.toLowerCase() === String(iso).toLowerCase())
+    list.unshift({
+      isocode: iso,
+      original_name: found?.original_name || found?.english_name || iso,
+    })
+  }
+
+  return list
+})
 </script>

assets/vue/components/layout/TopbarLoggedIn.vue

@@ -5,7 +5,7 @@
     </div>
     <div class="app-topbar__items">
       <BaseAppLink
-        v-if="!isAnonymous && 'false' !== platformConfigStore.getSetting('display.show_link_ticket_notification')"
+        v-if="!isAnonymous && 'false' !== platformConfigStore.getSetting('ticket.show_link_ticket_notification')"
         :url="ticketUrl"
         class="item-button"
       >
@@ -121,7 +121,7 @@ const userSubmenuItems = computed(() => {
     },
   ]
 
-  const tabs = platformConfigStore.getSetting("platform.show_tabs") || ""
+  const tabs = platformConfigStore.getSetting("display.show_tabs") || ""
   if (tabs.indexOf("topbar_certificate") > -1) {
     items[0].items.push({
       label: t("My General Certificate"),

assets/vue/composables/sidebarMenu.js

@@ -17,14 +17,14 @@ export function useSidebarMenu() {
   const allowSocialTool = computed(() => platformConfigStore.getSetting("social.allow_social_tool") !== "false")
 
   const showTabs = computed(() => {
-    const defaultTabs = platformConfigStore.getSetting("platform.show_tabs") || []
-    const tabsPerRoleJson = platformConfigStore.getSetting("platform.show_tabs_per_role") || ""
+    const defaultTabs = platformConfigStore.getSetting("display.show_tabs") || []
+    const tabsPerRoleJson = platformConfigStore.getSetting("display.show_tabs_per_role") || ""
 
     let tabsPerRole = {}
     try {
       tabsPerRole = JSON.parse(tabsPerRoleJson)
     } catch (e) {
-      console.warn("[Sidebar] Invalid JSON in platform.show_tabs_per_role", e)
+      console.warn("[Sidebar] Invalid JSON in display.show_tabs_per_role", e)
     }
 
     const roleMap = {

assets/vue/pages/Home.vue

@@ -51,7 +51,7 @@ import * as userRelCourseVoteService from "../services/userRelCourseVoteService"
 
 const router = useRouter()
 const platformConfigStore = usePlatformConfig()
-const redirectValue = platformConfigStore.getSetting("platform.redirect_index_to_url_for_logged_users")
+const redirectValue = platformConfigStore.getSetting("workflows.redirect_index_to_url_for_logged_users")
 
 if (typeof redirectValue === "string" && redirectValue.trim() !== "") {
   router.replace(`/${redirectValue}`)

assets/vue/router/dropbox.js

@@ -6,7 +6,11 @@ export default {
   },
   name: "dropbox",
   component: () => import("../components/dropbox/DropboxLayout.vue"),
-  redirect: { name: "DropboxListSent" },
+  redirect: (to) => ({
+    name: "DropboxListSent",
+    params: to.params,
+    query: to.query,
+  }),
   children: [
     {
       name: "DropboxListSent",
@@ -40,4 +44,4 @@ export default {
       meta: { breadcrumb: "Edit folder" },
     },
   ],
-};
+}

assets/vue/utils/languages.js

@@ -401,7 +401,6 @@ export default [
     english_name: "spanish",
     isocode: "es",
     available: 1,
-
     format: "title last_name first_name",
     sort_by: "last_name",
   },

assets/vue/views/course/CourseHome.vue

@@ -455,6 +455,6 @@ const onStudentViewChanged = async () => {
 const allowEditToolVisibilityInSession = computed(() => {
   const isInASession = session.value?.id
 
-  return isInASession ? "true" === getSetting.value("course.allow_edit_tool_visibility_in_session") : true
+  return isInASession ? "true" === getSetting.value("session.allow_edit_tool_visibility_in_session") : true
 })
 </script>