Merge pull request ILIAS-eLearning#8768 from leifos-gmbh/10_mantis_il…

…ias_42590

Export: ilias mantis issue 42590, Button and Dropdown Labels

components/ILIAS/Blog/classes/class.ilBlogExportOptionHTML.php

@@ -56,7 +56,7 @@ public function getSupportedRepositoryObjectTypes(): array
     public function getLabel(): string
     {
         $this->lng->loadLanguageModule('exp');
-        return $this->lng->txt("exp_html");
+        return $this->lng->txt("exp_format_dropdown-html");
     }
 
     public function onExportOptionSelected(

components/ILIAS/Blog/classes/class.ilBlogExportOptionHTMLWithComments.php

@@ -57,7 +57,8 @@ public function getSupportedRepositoryObjectTypes(): array
 
     public function getLabel(): string
     {
-        return "HTML (" . $this->lng->txt("blog_incl_comments") . ")";
+        $this->lng->loadLanguageModule('exp');
+        return $this->lng->txt("exp_format_dropdown-html") . " (" . $this->lng->txt("blog_incl_comments") . ")";
     }
 
     public function onExportOptionSelected(

components/ILIAS/Export/classes/class.ilExportExportOptionXML.php

@@ -76,7 +76,7 @@ public function isPublicAccessPossible(): bool
 
     public function getLabel(): string
     {
-        return $this->lng->txt("exp_create_file") . " (xml)";
+        return $this->lng->txt("exp_format_dropdown-xml");
     }
 
     public function onExportOptionSelected(

components/ILIAS/Export/classes/class.ilExportGUI.php

@@ -203,7 +203,7 @@ final protected function displayExportFiles(): void
         }
         if (count($infos) === 1) {
             $this->toolbar->addComponent($this->ui_services->factory()->button()->standard(
-                array_keys($infos)[0],
+                sprintf($this->lng->txt("exp_export_single_option"), array_keys($infos)[0]),
                 array_values($infos)[0]
             ));
         }

components/ILIAS/Forum/classes/class.ilForumExportOptionHTML.php

@@ -52,7 +52,7 @@ public function getSupportedRepositoryObjectTypes(): array
     public function getLabel(): string
     {
         $this->lng->loadLanguageModule('exp');
-        return $this->lng->txt('exp_html');
+        return $this->lng->txt('exp_format_dropdown-html');
     }
 
     public function onExportOptionSelected(ilExportHandlerConsumerContextInterface $context): void

components/ILIAS/Glossary/classes/class.ilGlossaryExportOptionHTML.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of ILIAS, a powerful learning management system
  * published by ILIAS open source e-Learning e.V.
@@ -19,6 +17,8 @@
  ********************************************************************
  */
 
+declare(strict_types=1);
+
 use ILIAS\Export\ExportHandler\I\Consumer\Context\HandlerInterface as ilExportHandlerConsumerContextInterface;
 use ILIAS\Export\ExportHandler\Consumer\ExportOption\BasicLegacyHandler as ilBasicLegacyExportOption;
 use ILIAS\DI\Container;
@@ -56,7 +56,7 @@ public function getSupportedRepositoryObjectTypes(): array
     public function getLabel(): string
     {
         $this->lng->loadLanguageModule('exp');
-        return $this->lng->txt("exp_html");
+        return $this->lng->txt("exp_format_dropdown-html");
     }
 
     public function onExportOptionSelected(

components/ILIAS/HTMLLearningModule/classes/class.ilHTLMExportOptionHTML.php

@@ -53,7 +53,7 @@ public function getSupportedRepositoryObjectTypes(): array
     public function getLabel(): string
     {
         $this->lng->loadLanguageModule('exp');
-        return $this->lng->txt("exp_html");
+        return $this->lng->txt("exp_format_dropdown-html");
     }
 
     public function onExportOptionSelected(

components/ILIAS/LearningModule/classes/class.ilLearningModuleExportOptionHTML.php

@@ -64,7 +64,7 @@ public function getSupportedRepositoryObjectTypes(): array
     public function getLabel(): string
     {
         $this->lng->loadLanguageModule('exp');
-        return $this->lng->txt("exp_html");
+        return $this->lng->txt("exp_format_dropdown-html");
     }
 
     public function onDeleteFiles(

components/ILIAS/LearningModule/classes/class.ilLearningModuleExportOptionXML.php

@@ -63,7 +63,7 @@ public function isPublicAccessPossible(): bool
     public function getLabel(): string
     {
         $this->lng->loadLanguageModule('exp');
-        return $this->lng->txt("exp_xml");
+        return $this->lng->txt("exp_format_dropdown-xml");
     }
 
     public function onExportOptionSelected(\ILIAS\Export\ExportHandler\I\Consumer\Context\HandlerInterface $context): void

components/ILIAS/MediaPool/classes/class.ilMediaPoolExportOptionXMLMaster.php

@@ -54,7 +54,8 @@ public function getSupportedRepositoryObjectTypes(): array
 
     public function getLabel(): string
     {
-        return "XML (" . $this->lng->txt("mep_master_language_only") . ")";
+        $this->lng->loadLanguageModule('exp');
+        return $this->lng->txt("exp_format_dropdown-xml") . " (" . $this->lng->txt("mep_master_language_only") . ")";
     }
 
     public function onDownloadFiles(

components/ILIAS/MediaPool/classes/class.ilMediaPoolExportOptionXMLMasterNoMedia.php

@@ -54,6 +54,7 @@ public function getSupportedRepositoryObjectTypes(): array
 
     public function getLabel(): string
     {
+        $this->lng->loadLanguageModule('exp');
         return "XML (" . $this->lng->txt("mep_master_language_only_no_media") . ")";
     }
 

components/ILIAS/OrgUnit/classes/class.ilOrgUnitExportOptionXLS.php

@@ -55,7 +55,8 @@ public function getSupportedRepositoryObjectTypes(): array
 
     public function getLabel(): string
     {
-        return $this->lng->txt('simple_xls');
+        $this->lng->loadLanguageModule('exp');
+        return $this->lng->txt('exp_format_dropdown-xls');
     }
 
     public function isObjectSupported(ObjectId $object_id): bool

components/ILIAS/OrgUnit/classes/class.ilOrgUnitExportOptionXML.php

@@ -61,7 +61,8 @@ public function isObjectSupported(ObjectId $object_id): bool
 
     public function getLabel(): string
     {
-        return $this->lng->txt('simple_xml');
+        $this->lng->loadLanguageModule('exp');
+        return $this->lng->txt('exp_format_dropdown-xml');
     }
 
     public function onExportOptionSelected(ilExportHandlerConsumerContextInterface $context): void

components/ILIAS/Test/classes/class.ilTestExportOptionARC.php

@@ -57,6 +57,7 @@ public function getSupportedRepositoryObjectTypes(): array
 
     public function getLabel(): string
     {
+        $this->lng->loadLanguageModule('assessment');
         return $this->lng->txt('ass_create_export_test_archive');
     }
 

components/ILIAS/Test/classes/class.ilTestExportOptionXML.php

@@ -55,7 +55,8 @@ public function getSupportedRepositoryObjectTypes(): array
 
     public function getLabel(): string
     {
-        return $this->lng->txt('ass_create_export_file');
+        $this->lng->loadLanguageModule('exp');
+        return $this->lng->txt("exp_format_dropdown-xml");
     }
 
     public function onDeleteFiles(

components/ILIAS/Test/classes/class.ilTestExportOptionXMLRES.php

@@ -55,7 +55,9 @@ public function getSupportedRepositoryObjectTypes(): array
 
     public function getLabel(): string
     {
-        return $this->lng->txt('ass_create_export_file_with_results');
+        $this->lng->loadLanguageModule('exp');
+        $this->lng->loadLanguageModule('assessment');
+        return  $this->lng->txt("exp_format_dropdown-xml") . " (" . $this->lng->txt('ass_create_export_file_with_results') . ")";
     }
 
     public function onDeleteFiles(

components/ILIAS/TestQuestionPool/classes/class.ilTestQuestionPoolExportOptionXML.php

@@ -55,7 +55,8 @@ public function getSupportedRepositoryObjectTypes(): array
 
     public function getLabel(): string
     {
-        return "{$this->lng->txt('exp_create_file')} (xml)";
+        $this->lng->loadLanguageModule('exp');
+        return $this->lng->txt('exp_format_dropdown-xml');
     }
 
     public function onDeleteFiles(

components/ILIAS/Wiki/classes/class.ilWikiExportOptionHTML.php

@@ -56,7 +56,7 @@ public function getSupportedRepositoryObjectTypes(): array
     public function getLabel(): string
     {
         $this->lng->loadLanguageModule('exp');
-        return $this->lng->txt('exp_html');
+        return $this->lng->txt('exp_format_dropdown-html');
     }
 
     public function onExportOptionSelected(ilExportHandlerConsumerContextInterface $context): void

components/ILIAS/Wiki/classes/class.ilWikiExportOptionHTMLWithComments.php

@@ -55,7 +55,8 @@ public function getSupportedRepositoryObjectTypes(): array
 
     public function getLabel(): string
     {
-        return "HTML (" . $this->lng->txt("wiki_incl_comments") . ")";
+        $this->lng->loadLanguageModule('exp');
+        return $this->lng->txt("exp_format_dropdown-html") . " (" . $this->lng->txt("wiki_incl_comments") . ")";
     }
 
     public function isObjectSupported(ObjectId $object_id): bool

lang/ilias_de.lang

@@ -505,10 +505,8 @@ assessment#:#ass_comments#:#Kommentare
 assessment#:#ass_competence_respect_level_ordering#:#Bitte beachten Sie, dass die Kompetenz-Schwellenwerte gemäß der Reihenfolge der Kompetenzstufen in aufsteigender Reihenfolge definiert werden müssen.
 assessment#:#ass_completion_by_submission#:#Bestehen durch Abgabe
 assessment#:#ass_completion_by_submission_info#:#Falls aktiviert, führt die Abgabe einer Lösungsdatei zur Vergabe der Maximalpunktzahl für diese Frage. Die Bewertung kann jederzeit manuell angepasst werden. Das Ändern dieser Einstellung hat keine nachträglichen Auswirkungen auf bereits eingereichte Lösungen.
-assessment#:#ass_create_export_file#:#Erstelle Exportdatei
-assessment#:#ass_create_export_file_with_results#:#Erstelle Exportdatei (inkl. Teilnehmerergebnisse)
-assessment#:#ass_create_export_test_archive#:#Erstelle Archivdatei für Test
-assessment#:#ass_create_export_test_results#:#Erstelle Ergebnisdatei
+assessment#:#ass_create_export_file_with_results#:#inkl. Teilnehmerergebnisse
+assessment#:#ass_create_export_test_archive#:#als Archivdatei
 assessment#:#ass_create_question#:#Frage erstellen
 assessment#:#ass_imap_hint#:#Hinweis (angezeigt als Tooltip)
 assessment#:#ass_imap_map_file_not_readable#:#Die hochgeladene Imagemap kann nicht gelesen werden.
@@ -9756,7 +9754,12 @@ exp#:#exp_create_file#:#Exportdatei erzeugen
 exp#:#exp_error_disabled#:#Der Export von Container-Objekten ist deaktiviert. Bei Fragen wenden Sie sich bitte an die technische Betreuung.
 exp#:#exp_error_too_many_objects#:#Der Export überschreitet die maximal erlaubte Zahl an Objekten (%1). Bitte wählen Sie eine kleinere Anzahl an Objekten.
 exp#:#exp_export_files#:#Exportdateien
+exp#:#exp_export_single_option#:#Export %s
 exp#:#exp_file_created#:#Eine Exportdatei wurde erstellt.
+exp#:#exp_format_dropdown-csv#:#als CSV
+exp#:#exp_format_dropdown-html#:#als HTML
+exp#:#exp_format_dropdown-xls#:#als XLS
+exp#:#exp_format_dropdown-xml#:#als XML
 exp#:#exp_html#:#HTML
 exp#:#exp_import_validation_err_no_matching_xsd#:#Eine Schema Datei für Version %s existiert nicht.
 exp#:#exp_print_pdf#:#Drucken/PDF

lang/ilias_en.lang

@@ -505,10 +505,8 @@ assessment#:#ass_comments#:#Comments
 assessment#:#ass_competence_respect_level_ordering#:#Please note that the competence thresholds have to be defined in an ascending order according to the available competence levels.
 assessment#:#ass_completion_by_submission#:#Completed by Submission
 assessment#:#ass_completion_by_submission_info#:#If enabled, the submission of at least one file causes the completion of this question by granting the maximum score for this question. The score could be manually changed later. Switching this setting does not effect already submitted solutions.
-assessment#:#ass_create_export_file#:#Create Test Export File
-assessment#:#ass_create_export_file_with_results#:#Create Test Export File (incl. Participant Results)
-assessment#:#ass_create_export_test_archive#:#Create Test Archive File
-assessment#:#ass_create_export_test_results#:#Create Test Results Export File
+assessment#:#ass_create_export_file_with_results#:#incl. Participant Results
+assessment#:#ass_create_export_test_archive#:#as Archive File
 assessment#:#ass_create_question#:#Create Question
 assessment#:#ass_imap_hint#:#Hint to be shown as Tooltip
 assessment#:#ass_imap_map_file_not_readable#:#The uploaded image map could not be read.
@@ -9756,8 +9754,14 @@ exercise#:#exc_your_submission#:#Your Submission
 exp#:#exp_create_file#:#Create Export File
 exp#:#exp_error_disabled#:#The export feature is disabled for containers. You may contact your system administrator.
 exp#:#exp_error_too_many_objects#:#The export exceeds the maximum number of allowerd objects (%1). Please select a lower number of objects.
+exp#:#exp_export_dropdown#:#Export
 exp#:#exp_export_files#:#Export Files
+exp#:#exp_export_single_option#:#Export %s
 exp#:#exp_file_created#:#The export file has been created.
+exp#:#exp_format_dropdown-csv#:#as CSV
+exp#:#exp_format_dropdown-html#:#as HTML
+exp#:#exp_format_dropdown-xls#:#as XLS
+exp#:#exp_format_dropdown-xml#:#as XML
 exp#:#exp_html#:#HTML
 exp#:#exp_import_validation_err_no_matching_xsd#:#No valid schema file for version %s exists.
 exp#:#exp_print_pdf#:#Print/PDF
@@ -9769,7 +9773,6 @@ exp#:#export_created#:#A new export file has been created.
 exp#:#export_files_deleted#:#The selected export files have been deleted.
 exp#:#export_options#:#Export Options
 exp#:#export_type#:#Export Type
-export#:#exp_export_dropdown#:#Export
 export#:#exp_file#:#File Name
 export#:#exp_public_access#:#Public Access
 export#:#exp_size#:#File Size (MB)