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

Author: AngelFQC

assets/locales/en.json

@@ -1198,5 +1198,60 @@
     "Admin Incomplete Courses": "Admin Incomplete Courses",
     "Admin Restart Courses": "Admin Restart Courses",
     "Admin Dashboard": "Admin Dashboard",
-    "New messages": "New messages"
-}
+    "New messages": "New messages",
+    "Authentication source": "Authentication source",
+    "Assign authentication sources to users": "Assign authentication sources to users",
+    "Back to user assignment page": "Back to user assignment page",
+    "Authentication sources assigned successfully": "Authentication sources assigned successfully",
+    "Tip: choose “— Just upload —” to store without sending to anyone.": "Tip: choose “— Just upload —” to store without sending to anyone.",
+    "Please select at least one recipient (“— Just upload —” or any user)": "Please select at least one recipient (“— Just upload —” or any user)",
+    "Sharing": "Sharing",
+    "Overwrite previous versions of same document?": "Overwrite previous versions of same document?",
+    "Selected files": "Selected files",
+    "Hide password": "Hide password",
+    "Show password": "Show password",
+    "Upload SVG logo for e-mails": "Upload SVG logo for e-mails",
+    "You must move or remove all learning paths from this category before deleting it.": "You must move or remove all learning paths from this category before deleting it.",
+    "Clear filters": "Clear filters",
+    "Attendances (tablet)": "Attendances (tablet)",
+    "Exit tablet mode": "Exit tablet mode",
+    "Attended": "Attended",
+    "No members found.": "No members found.",
+    "Health check": "Health check",
+    "Export Common Cartridge v1.3": "Export Common Cartridge v1.3",
+    "Export your course content in the IMS Common Cartridge 1.3 format, to share it on other platforms.": "Export your course content in the IMS Common Cartridge 1.3 format, to share it on other platforms.",
+    "Full copy": "Full copy",
+    "Loading resources...": "Loading resources...",
+    "Import Common Cartridge v1.3": "Import Common Cartridge v1.3",
+    "Import a course in IMS Common Cartridge 1.3 format, from another platform compatible with this format. The version is important.": "Import a course in IMS Common Cartridge 1.3 format, from another platform compatible with this format. The version is important.",
+    "Failed to load resources.": "Failed to load resources.",
+    "Please select at least one exportable resource (document, web link, discussion,...).": "Please select at least one exportable resource (document, web link, discussion,...).",
+    "Export finished.": "Export finished.",
+    "Export failed.": "Export failed.",
+    "Import failed.": "Import failed.",
+    "Local file (.zip, .mbz, .tgz, .gz)": "Local file (.zip, .mbz, .tgz, .gz)",
+    "server file": "sever file",
+    "Select a backup file": "Select a backup file",
+    "What should be done with imported files with the same file name as existing files?": "What should be done with imported files with the same file name as existing files?",
+    "Ready to import": "Ready to import",
+    "We will restore the backup into this course. You can go back to change options.": "We will restore the backup into this course. You can go back to change options.",
+    "Import backup": "Import backup",
+    "Select resources to import": "Select resources to import",
+    "No resources available in this backup.": "No resources available in this backup.",
+    "Import selection": "Import selection",
+    "Import completed": "Import completed",
+    "Could not load options.": "Could not load options.",
+    "Please select a backup file (.zip, .mbz, .tgz, .gz)": "Please select a backup file (.zip, .mbz, .tgz, .gz)",
+    "Please choose a backup from the server": "Please choose a backup from the server",
+    "Error selecting source.": "Error selecting source.",
+    "Recycling options": "Recycling options",
+    "Delete everything": "Delete everything",
+    "Type the course code to confirm": "Type the course code to confirm",
+    "This will remove or reset selected resources. This action cannot be undone.": "This will remove or reset selected resources. This action cannot be undone.",
+    "Select resources to recycle": "Select resources to recycle",
+    "No resources available in this course.": "No resources available in this course.",
+    "Recycle selected": "Recycle selected",
+    "Recycle is finished": "Recycle is finished",
+    "Error loading resources.": "Error loading resources.",
+    "Clear search": "Clear search"
+}

assets/vue/components/admin/BrandingSection.vue

@@ -182,11 +182,11 @@
 
       <section class="grid grid-cols-1 gap-3">
         <div>
-          <label class="text-xs block mb-1">{{ t('Upload email SVG') }}</label>
+          <label class="text-xs block mb-1">{{ t('Upload SVG logo for e-mails') }}</label>
           <input type="file" accept=".svg,image/svg+xml" @change="onPick($event, 'emailSvg')" />
         </div>
         <div>
-          <label class="text-xs block mb-1">{{ t('Upload email PNG (~540 px width)') }}</label>
+          <label class="text-xs block mb-1">{{ t('Upload PNG logo for e-mails (~540 px width)') }}</label>
           <input type="file" accept="image/png" @change="onPick($event, 'emailPng', { recommendW:540 })" />
         </div>
       </section>

assets/vue/components/basecomponents/BaseCalendar.vue

@@ -178,7 +178,7 @@ const onCancelClick = () => {
               class="base-calendar-footer__button base-calendar-footer__button--primary"
               @click="onApplyClick"
             >
-              {{ t("Ok") }}
+              {{ t("OK") }}
             </button>
           </div>
         </template>

assets/vue/components/documents/ResourceFileLink.vue

@@ -25,10 +25,14 @@ export default {
   },
   computed: {
     getDataType() {
-      if (this.resource.resourceNode.firstResourceFile.image) {
+      const node = this.resource && this.resource.resourceNode
+      const file = node && node.firstResourceFile
+
+      if (file && file.image) {
         return "image"
       }
-      if (this.resource.resourceNode.firstResourceFile.video) {
+
+      if (file && file.video) {
         return "video"
       }
 

assets/vue/components/documents/ResourceIcon.vue

@@ -4,19 +4,19 @@
     icon="folder-generic"
   />
   <BaseIcon
-    v-else-if="resourceData.resourceNode.firstResourceFile.image"
+    v-else-if="isImage(resourceData)"
     icon="file-image"
   />
   <BaseIcon
-    v-else-if="resourceData.resourceNode.firstResourceFile.video"
+    v-else-if="isVideo(resourceData)"
     icon="file-video"
   />
   <BaseIcon
-    v-else-if="resourceData.resourceNode.firstResourceFile.text"
+    v-else-if="hasTextFlag"
     icon="file-text"
   />
   <BaseIcon
-    v-else-if="'application/pdf' === resourceData.resourceNode.firstResourceFile.mimeType"
+    v-else-if="isPdfFile"
     icon="file-pdf"
   />
   <BaseIcon
@@ -30,15 +30,33 @@
 </template>
 
 <script setup>
+import { computed } from "vue"
 import BaseIcon from "../basecomponents/BaseIcon.vue"
 import { useFileUtils } from "../../composables/fileUtils"
 
-const { isAudio } = useFileUtils()
+const { isImage, isVideo, isAudio } = useFileUtils()
 
-defineProps({
+const props = defineProps({
   resourceData: {
     type: Object,
     required: true,
   },
 })
+
+const hasTextFlag = computed(() => {
+  const file = props.resourceData?.resourceNode?.firstResourceFile
+  return !!file && !!file.text
+})
+
+const isPdfFile = computed(() => {
+  const file = props.resourceData?.resourceNode?.firstResourceFile
+
+  if (!file || !file.mimeType) {
+    return false
+  }
+
+  const mime = String(file.mimeType).split(";")[0].trim().toLowerCase()
+
+  return mime === "application/pdf"
+})
 </script>

assets/vue/views/accessurl/AccessUrlAuthSourcesAssign.vue

@@ -53,7 +53,7 @@ async function assignAuthSources() {
       true,
     )
 
-    showSuccessNotification(t("Auth sources assigned successfully"))
+    showSuccessNotification(t("Authentication sources assigned successfully"))
 
     userFinder.value.selectedUsers = []
   } catch (e) {
@@ -67,7 +67,7 @@ listAccessUrl().then((items) => (accessUrlList.value = items))
 </script>
 
 <template>
-  <SectionHeader :title="t('Assign auth sources to users')" />
+  <SectionHeader :title="t('Assign authentication sources to users')" />
 
   <BaseToolbar>
     <template #start>
@@ -102,7 +102,7 @@ listAccessUrl().then((items) => (accessUrlList.value = items))
         id="auth_source"
         v-model="authSource"
         :disabled="0 === authSourceList.length"
-        :label="t('Auth source')"
+        :label="t('Authentication source')"
         :options="authSourceList"
       />
 

assets/vue/views/attendance/AttendanceSheetTablet.vue

@@ -1,13 +1,13 @@
 <template>
-  <SectionHeader :title="t('Attendance (tablet)')" />
+  <SectionHeader :title="t('Attendances (tablet)')" />
 
   <div class="p-4 space-y-4">
     <!-- Loading state -->
     <div
       v-if="isLoading"
       class="flex items-center justify-center py-10 text-gray-600"
     >
-      {{ t("Loading attendance...") }}
+      {{ t("Loading...") }}
     </div>
 
     <!-- Main content -->
@@ -62,7 +62,7 @@
               <th class="p-3 text-left">{{ t("Photo") }}</th>
               <th class="p-3 text-left">{{ t("Last name") }}</th>
               <th class="p-3 text-left">{{ t("First name") }}</th>
-              <th class="p-3 text-center">{{ t("Presence") }}</th>
+              <th class="p-3 text-center">{{ t("Attended") }}</th>
               <th
                 class="p-3 text-center"
                 v-if="allowComments"
@@ -149,7 +149,7 @@
       <!-- Comment Dialog -->
       <BaseDialog
         v-model:isVisible="showCommentDialog"
-        :title="t('Add Comment')"
+        :title="t('Add comment')"
       >
         <textarea
           class="w-full h-32 border rounded p-2"

assets/vue/views/coursemaintenance/Cc13.vue

@@ -6,9 +6,9 @@
       <div class="grid grid-cols-1 gap-6 md:grid-cols-2">
         <!-- Export -->
         <div class="rounded-lg border border-gray-100 p-4">
-          <h4 class="mb-2 text-sm font-semibold text-gray-800">{{ t("Export to CC 1.3") }}</h4>
+          <h4 class="mb-2 text-sm font-semibold text-gray-800">{{ t("Export Common Cartridge v1.3") }}</h4>
           <p class="mb-3 text-sm text-gray-600">
-            {{ t("Generate a Common Cartridge package for this course.") }}
+            {{ t("Export your course content in the IMS Common Cartridge 1.3 format, to share it on other platforms.") }}
           </p>
 
           <div class="mb-3">
@@ -25,7 +25,7 @@
                 :class="segClass('full')"
                 @click="scope = 'full'"
               >
-                {{ t("Full course") }}
+                {{ t("Full copy") }}
               </button>
               <button
                 type="button"
@@ -73,7 +73,7 @@
               v-if="loadingResources"
               class="p-3 text-xs text-gray-500"
             >
-              {{ t("Loading resources…") }}
+              {{ t("Loading resources...") }}
             </div>
 
             <div
@@ -246,9 +246,9 @@
 
         <!-- Import -->
         <div class="rounded-lg border border-gray-100 p-4">
-          <h4 class="mb-2 text-sm font-semibold text-gray-800">{{ t("Import from CC 1.3") }}</h4>
+          <h4 class="mb-2 text-sm font-semibold text-gray-800">{{ t("Import Common Cartridge v1.3") }}</h4>
           <p class="mb-3 text-sm text-gray-600">
-            {{ t("Upload a Common Cartridge 1.3 (.imscc or .zip) to import resources.") }}
+            {{ t("Import a course in IMS Common Cartridge 1.3 format, from another platform compatible with this format. The version is important.") }}
           </p>
           <input
             type="file"
@@ -457,7 +457,7 @@ async function doExport() {
       const total =
         Object.values(resSel).reduce((acc, obj) => acc + Object.keys(obj || {}).length, 0)
       if (total === 0) {
-        throw new Error(t("Please select at least one exportable resource (documents, web links, or discussions)."))
+        throw new Error(t("Please select at least one exportable resource (document, web link, discussion,...)."))
       }
       payload.resources = resSel
     }
@@ -466,7 +466,7 @@ async function doExport() {
     if (res.downloadUrl) window.location.href = res.downloadUrl
     notice.value = res.message || t("Export finished.")
   } catch (e) {
-    error.value = e?.response?.data?.error || e.message || t("Failed to export.")
+    error.value = e?.response?.data?.error || e.message || t("Export failed.")
   } finally {
     loadingExport.value = false
   }
@@ -482,7 +482,7 @@ async function doImport() {
     const res = await svc.cc13Import(node.value, file.value)
     notice.value = res.message || t("Import finished")
   } catch (e) {
-    error.value = e?.response?.data?.error || e.message || t("Failed to import.")
+    error.value = e?.response?.data?.error || e.message || t("Import failed.")
   } finally {
     loadingImport.value = false
   }

assets/vue/views/coursemaintenance/ImportBackup.vue

@@ -79,14 +79,14 @@
               value="server"
               v-model="backupType"
             />
-            <span class="text-sm text-gray-90">{{ t("Server file") }}</span>
+            <span class="text-sm text-gray-90">{{ t("server file") }}</span>
           </label>
           <select
             v-if="backupType === 'server'"
             v-model="serverFilename"
             class="w-full rounded border border-gray-25 p-2 text-sm"
           >
-            <option value="">{{ t("Select a backup") }}</option>
+            <option value="">{{ t("Select a backup file") }}</option>
             <option
               v-for="b in backups"
               :key="b.file"
@@ -122,7 +122,7 @@
 
           <div class="mt-4">
             <p class="mb-2 text-sm font-medium text-gray-90">
-              {{ t("When a file with the same name exists") }}
+              {{ t("What should be done with imported files with the same file name as existing files?") }}
             </p>
             <div class="space-y-2">
               <label class="flex items-center gap-2">
@@ -197,7 +197,7 @@
           @click="doRestore"
           :disabled="loading"
         >
-          <i class="mdi mdi-database-import-outline"></i> {{ t("Start import") }}
+          <i class="mdi mdi-database-import-outline"></i> {{ t("Import backup") }}
         </button>
       </div>
     </section>
@@ -234,7 +234,7 @@
           @click="doRestore"
           :disabled="loading"
         >
-          <i class="mdi mdi-database-import-outline"></i> {{ t("Import selected") }}
+          <i class="mdi mdi-database-import-outline"></i> {{ t("Import selection") }}
         </button>
       </div>
     </section>
@@ -358,10 +358,10 @@ async function nextFromStep1() {
     // Standard archive flows (local/server): .zip/.mbz/.tgz/.gz
     let res
     if (backupType.value === "local") {
-      if (!localFile.value) throw new Error(t("Please select a backup file (.zip, .mbz, .tgz, .gz)."))
+      if (!localFile.value) throw new Error(t("Please select a backup file (.zip, .mbz, .tgz, .gz)"))
       res = await svc.uploadFile(node.value, localFile.value)
     } else {
-      if (!serverFilename.value) throw new Error(t("Please choose a server backup."))
+      if (!serverFilename.value) throw new Error(t("Please choose a backup from the server"))
       res = await svc.chooseServerFile(node.value, serverFilename.value)
     }
     backupId.value = res.backupId
@@ -398,7 +398,7 @@ async function doRestore() {
     step.value = 4
     if (res.redirectUrl) pushWithQuery(res.redirectUrl)
   } catch (e) {
-    error.value = e?.response?.data?.error || t("Failed to import backup.")
+    error.value = e?.response?.data?.error || t("Import failed.")
   } finally {
     loading.value = false
   }