Install: Fix language selection flow, i18n sync, and labels

Author: christianbeeznest

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/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/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",
   },

public/main/install/index.php

@@ -70,13 +70,13 @@
 Container::$session = new HttpSession();
 
 require_once 'install.lib.php';
-$installationLanguage = 'en_US';
-
 $httpRequest = Request::createFromGlobals();
+$installationLanguage = 'en_US';
 
-if ($httpRequest->request->get('language_list')) {
+$langParam = $httpRequest->get('language_list');
+if ($langParam !== null && $langParam !== '') {
     $search = ['../', '\\0'];
-    $installationLanguage = str_replace($search, '', urldecode($httpRequest->request->get('language_list')));
+    $installationLanguage = str_replace($search, '', urldecode($langParam));
     ChamiloSession::write('install_language', $installationLanguage);
 } elseif (ChamiloSession::has('install_language')) {
     $installationLanguage = ChamiloSession::read('install_language');
@@ -654,7 +654,7 @@
 
     'upgradeFromVersion' => $upgradeFromVersion,
 
-    'langIso' => api_get_language_isocode(),
+    'langIso' => $installationLanguage,
 
     'formAction' => api_get_self().'?'.http_build_query([
             'running' => 1,

src/CoreBundle/Migrations/Schema/V200/Version20250926142500.php

@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+/* For licensing terms, see /license.txt */
+
+namespace Chamilo\CoreBundle\Migrations\Schema\V200;
+
+use Chamilo\CoreBundle\Migrations\AbstractMigrationChamilo;
+use Doctrine\DBAL\Schema\Schema;
+
+final class Version20250926142500 extends AbstractMigrationChamilo
+{
+    public function getDescription(): string
+    {
+        return "Fix mis-labeled 'Português do Brasil': change isocode from pt_PT to pt_BR only when pt_PT appears twice and pt_BR doesn't exist.";
+    }
+
+    public function up(Schema $schema): void
+    {
+        // Convert the Brazilian row from pt_PT -> pt_BR
+        // Only do it when there are at least 2 rows with isocode 'pt_PT' and there's no existing 'pt_BR'
+        $this->addSql("
+            UPDATE language l
+            JOIN (
+                SELECT id
+                FROM language
+                WHERE isocode = 'pt_PT'
+                  AND (
+                        original_name = 'Português do Brasil'
+                        OR english_name LIKE '%Brazil%'
+                        OR english_name LIKE '%brazilian%'
+                      )
+                LIMIT 1
+            ) b ON b.id = l.id
+            SET l.isocode = 'pt_BR'
+            WHERE
+                (SELECT COUNT(*) FROM language WHERE isocode = 'pt_PT') > 1
+                AND (SELECT COUNT(*) FROM language WHERE isocode = 'pt_BR') = 0
+        ");
+
+        // Normalize english_name for Brazilian row (optional, harmless if already set)
+        $this->addSql("
+            UPDATE language
+            SET english_name = 'brazilian portuguese'
+            WHERE isocode = 'pt_BR'
+              AND (english_name IS NULL OR english_name = '' OR english_name LIKE '%brazil%')
+        ");
+    }
+
+    public function down(Schema $schema): void
+    {
+        // Revert only if it looks like we performed the change (avoid clobbering a valid dataset).
+        $this->addSql("
+            UPDATE language l
+            JOIN (
+                SELECT id
+                FROM language
+                WHERE isocode = 'pt_BR'
+                  AND (
+                        original_name = 'Português do Brasil'
+                        OR english_name LIKE '%brazil%'
+                      )
+                LIMIT 1
+            ) b ON b.id = l.id
+            SET l.isocode = 'pt_PT'
+            WHERE (SELECT COUNT(*) FROM language WHERE isocode = 'pt_PT') = 1
+        ");
+    }
+}