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

Author: ywarnier

assets/vue/components/course/Form.vue

@@ -46,18 +46,6 @@
         option-label="name"
         option-value="id"
       />
-      <BaseCheckbox
-        id="demo-content"
-        v-model="fillDemoContent"
-        :label="t('Fill with demo content')"
-        name=""
-      />
-      <!--BaseAutocomplete
-        id="template"
-        v-model="courseTemplate"
-        :label="t('Course template')"
-        :search="searchTemplates"
-      /-->
     </div>
     <!-- Form Footer -->
     <div class="form-footer">
@@ -83,20 +71,32 @@ import { onMounted, ref, nextTick } from "vue"
 import BaseInputText from "../basecomponents/BaseInputText.vue"
 import BaseAdvancedSettingsButton from "../basecomponents/BaseAdvancedSettingsButton.vue"
 import BaseSelect from "../basecomponents/BaseSelect.vue"
-import BaseCheckbox from "../basecomponents/BaseCheckbox.vue"
 import BaseButton from "../basecomponents/BaseButton.vue"
 import { useRouter } from "vue-router"
 import courseService from "../../services/courseService"
 import languageService from "../../services/languageService"
 import BaseMultiSelect from "../basecomponents/BaseMultiSelect.vue"
 import { useI18n } from "vue-i18n"
 
-const { t } = useI18n()
+const props = defineProps({
+  values: {
+    type: Object,
+    default: () => ({}),
+  },
+  errors: {
+    type: [Array, Object, null],
+    default: null,
+  },
+})
+
+const emit = defineEmits(["submit"])
+
+const { t, locale } = useI18n()
+
 const courseName = ref("")
 const courseCategory = ref([])
 const courseCode = ref("")
 const courseLanguage = ref(null)
-const fillDemoContent = ref(false)
 const courseTemplate = ref(null)
 const showAdvancedSettings = ref(false)
 const router = useRouter()
@@ -111,7 +111,38 @@ const isCourseNameInvalid = ref(false)
 
 const formSubmitted = ref(false)
 
-const emit = defineEmits(["submit"])
+function normalizeLocale(value) {
+  return String(value || "")
+    .trim()
+    .replace("-", "_")
+    .toLowerCase()
+}
+
+function resolveDefaultLanguageId(options, desiredLocale) {
+  // Options are { name, id } where id is language.isocode (e.g. "en", "fr", "es")
+  const desired = normalizeLocale(desiredLocale)
+  const base = desired.split("_")[0] // e.g. "en_US" -> "en"
+
+  const byExact = options.find((opt) => normalizeLocale(opt.id) === desired)
+  if (byExact) return byExact.id
+
+  const byBase = options.find((opt) => normalizeLocale(opt.id) === base)
+  if (byBase) return byBase.id
+
+  return null
+}
+
+function applyDefaultLanguageIfEmpty() {
+  if (courseLanguage.value) return
+  if (!languageOptions.value || languageOptions.value.length === 0) return
+
+  const desired = props.values?.language || locale.value
+  const resolvedId = resolveDefaultLanguageId(languageOptions.value, desired)
+
+  if (resolvedId) {
+    courseLanguage.value = resolvedId
+  }
+}
 
 const validateCourseCode = () => {
   const pattern = /^[a-zA-Z0-9]*$/
@@ -147,7 +178,7 @@ const submitForm = () => {
     code: courseCode.value,
     language: courseLanguage.value,
     template: courseTemplate.value ? courseTemplate.value.value : null,
-    fillDemoContent: fillDemoContent.value,
+    fillDemoContent: false,
   })
 }
 
@@ -188,19 +219,13 @@ onMounted(async () => {
       name: language.originalName,
       id: language.isocode,
     }))
+    // Apply default language after options are loaded
+    applyDefaultLanguageIfEmpty()
   } catch (error) {
     // Keep messages in English
     console.error("Failed to load dropdown data", error)
   }
 })
-
-const searchTemplates = async (query) => {
-  if (query && query.length >= 3) {
-    return courseService.searchTemplates(query)
-  }
-  return []
-}
-
 const goBack = () => {
   router.go(-1)
 }