Merge branch 'master' into dependabot-2024-11

sillsdev · Dec 10, 2024 · 877824a · 877824a
2 parents 632f8dd + 1fed334
commit 877824a
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 11 deletions.
diff --git a/public/locales/ar/translation.json b/public/locales/ar/translation.json
@@ -84,7 +84,7 @@
     "upload?": "تحميل البيانات الموجودة؟",
     "uploadFormat": "يجب أن يكون الملف مجلد مضغوط يحتوي على <1>نموذج تبادل المعجم (LIFT)</1>.",
     "create": "إنشاء مشروع",
-    "fileSelected": "تم تحديد الملف",
+    "fileSelected": "تم تحديد الملف: {{ val }}",
     "language": "ستستخرج معلومات لغة المشروع تلقائيًا من البيانات التي تم تحميلها.",
     "languageOptionOther": "آخر",
     "languageSelect": "اختر من بين اللغات الموجودة في الملف:",

diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
@@ -95,7 +95,7 @@
     "upload?": "Upload existing data?",
     "uploadFormat": "File must be a zipped folder containing a <1>Lexicon Interchange FormaT (LIFT)</1> project.",
     "create": "Create Project",
-    "fileSelected": "File selected",
+    "fileSelected": "File selected: {{ val }}",
     "language": "Project language information will be automatically extracted from uploaded data.",
     "languageOptionOther": "other",
     "languageSelect": "Select from languages in file:",

diff --git a/public/locales/es/translation.json b/public/locales/es/translation.json
@@ -92,7 +92,7 @@
     "upload?": "¿Cargar los datos existentes?",
     "uploadFormat": "El archivo debe ser una carpeta comprimida que contenga un proyecto <1>Lexicon Interchange FormaT (LIFT)</1>.",
     "create": "Crear Proyecto",
-    "fileSelected": "Archivo seleccionado",
+    "fileSelected": "Archivo seleccionado: {{ val }}",
     "language": "La información lingüística del proyecto se extraerá automáticamente de los datos cargados.",
     "languageOptionOther": "otro",
     "languageSelect": "Seleccionar de idiomas en el archivo:",

diff --git a/public/locales/fr/translation.json b/public/locales/fr/translation.json
@@ -83,7 +83,7 @@
     "nameTaken": "Nom pris",
     "upload?": "Télécharger des données existantes ?",
     "create": "Créer un projet",
-    "fileSelected": "Fichier sélectionné",
+    "fileSelected": "Fichier sélectionné : {{ val }}",
     "success": "Projet créé !"
   },
   "selectProject": { "title": "Sélectionner un projet" },

diff --git a/public/locales/pt/translation.json b/public/locales/pt/translation.json
@@ -84,7 +84,7 @@
     "upload?": "Carregar dados existentes?",
     "uploadFormat": "O arquivo deve ser uma pasta zipada que contenha um <1>Lexicon Interchange FormaT (LIFT)</1> projeto.",
     "create": "Criar Projeto",
-    "fileSelected": "Arquivo selecionado",
+    "fileSelected": "Arquivo selecionado: {{ val }}",
     "success": "Projeto Criado!"
   },
   "selectProject": { "title": "Selecionar Projeto" },

diff --git a/public/locales/zh/translation.json b/public/locales/zh/translation.json
@@ -87,7 +87,7 @@
     "upload?": "上传现有数据？",
     "uploadFormat": "文件必须是一个包含 <1>Lexicon Interchange FormaT (LIFT)</1> 项目的压缩文件夹。",
     "create": "创建项目",
-    "fileSelected": "文件已选定",
+    "fileSelected": "文件已选定: {{ val }}",
     "language": "项目语言资料将从上传的数据中提取。",
     "languageOptionOther": "其它",
     "languageSelect": "从文件中选择语言：",

diff --git a/src/components/Dialogs/UploadImage.tsx b/src/components/Dialogs/UploadImage.tsx
@@ -50,7 +50,7 @@ export default function ImageUpload(props: ImageUploadProps): ReactElement {
       {/* Displays the name of the selected file */}
       {filename && (
         <Typography variant="body1" noWrap>
-          {t("createProject.fileSelected")}: {filename}
+          {t("createProject.fileSelected", { val: filename })}
         </Typography>
       )}
       <Grid container spacing={1} justifyContent="flex-start">

diff --git a/src/components/ProjectScreen/CreateProject.tsx b/src/components/ProjectScreen/CreateProject.tsx
@@ -256,7 +256,7 @@ export default function CreateProject(): ReactElement {
             {/* Uploaded file name and remove button */}
             {languageData && (
               <Typography variant="body2" style={{ margin: theme.spacing(1) }}>
-                {`${t("createProject.fileSelected")}: ${languageData.name}`}
+                {t("createProject.fileSelected", { val: languageData.name })}
                 <IconButton size="small" onClick={() => updateLanguageData()}>
                   <Cancel />
                 </IconButton>

diff --git a/src/components/ProjectSettings/ProjectImport.tsx b/src/components/ProjectSettings/ProjectImport.tsx
@@ -78,9 +78,7 @@ export default function ProjectImport(
         {/* Displays the name of the selected file */}
         {liftFile && (
           <Typography variant="body1" noWrap>
-            {t("createProject.fileSelected")}
-            {": "}
-            {liftFile.name}
+            {t("createProject.fileSelected", { val: liftFile.name })}
           </Typography>
         )}
       </Grid>