Merge branch 'release-8.11.0'

oat-sa · May 4, 2023 · 8d23842 · 8d23842
2 parents ae0f3b0 + 4008d03
commit 8d23842
Show file tree

Hide file tree

Showing 31 changed files with 300 additions and 106 deletions.
diff --git a/actions/Api.php b/actions/Api.php
@@ -34,7 +34,6 @@
  */
 class Api extends \tao_actions_CommonRestModule
 {
-
     /**
      * Api constructor.
      * @security("hide");
@@ -44,7 +43,7 @@ public function __construct()
         parent::__construct();
         $this->service = CrudService::singleton();
     }
-    
+
     /**
      * Optionnaly a specific rest controller may declare
      * aliases for parameters used for the rest communication

diff --git a/actions/Export.php b/actions/Export.php
@@ -15,10 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2002-2008 (update and modification) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
- *
+ * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2002-2008 (update and modification) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  */
 
 namespace oat\taoTestTaker\actions;

diff --git a/actions/Import.php b/actions/Import.php
@@ -15,10 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2002-2008 (update and modification) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
- *
+ * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2002-2008 (update and modification) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  */
 
 declare(strict_types=1);

diff --git a/actions/Main.php b/actions/Main.php
@@ -15,10 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2002-2008 (update and modification) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
- *
+ * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2002-2008 (update and modification) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  */
 
 namespace oat\taoTestTaker\actions;
@@ -31,5 +33,4 @@
  */
 class Main extends \tao_actions_Main
 {
-
 }
diff --git a/actions/RestTestTakers.php b/actions/RestTestTakers.php
@@ -119,12 +119,14 @@ class RestTestTakers extends \tao_actions_CommonRestModule
      *     @OA\Property(
      *         property="userLanguage",
      *         type="string",
-     *         description="Interface language (uri or language code, 'fr-FR' or 'http://www.tao.lu/Ontologies/TAO.rdf#Langfr-FR' for example)"
+     *         description="Interface language (uri or language code, 'fr-FR'
+     *                      or 'http://www.tao.lu/Ontologies/TAO.rdf#Langfr-FR' for example)"
      *     ),
      *     @OA\Property(
      *         property="defaultLanguage",
      *         type="string",
-     *         description="Default language (uri or language code, 'fr-FR' or 'http://www.tao.lu/Ontologies/TAO.rdf#Langfr-FR' for example)"
+     *         description="Default language (uri or language code, 'fr-FR'
+     *                      or 'http://www.tao.lu/Ontologies/TAO.rdf#Langfr-FR' for example)"
      *     ),
      *     @OA\Property(
      *         property="firstName",
@@ -144,7 +146,7 @@ class RestTestTakers extends \tao_actions_CommonRestModule
      * )
      */
 
-    const ROOT_CLASS = TaoOntology::CLASS_URI_SUBJECT;
+    public const ROOT_CLASS = TaoOntology::CLASS_URI_SUBJECT;
 
     /**
      * RestTestTakers constructor.

diff --git a/actions/SasImport.php b/actions/SasImport.php
@@ -15,10 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2002-2008 (update and modification) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
- *
+ * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2002-2008 (update and modification) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  */
 
 namespace oat\taoTestTaker\actions;
@@ -36,7 +38,6 @@
 
 class SasImport extends Import
 {
-
     /**
      * @see Subjects::__construct()
      * @security("hide")

diff --git a/actions/TestTaker.php b/actions/TestTaker.php
@@ -15,9 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2002-2008 (update and modification) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
+ * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2002-2008 (update and modification) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  *               2013-2014 (update and modification) Open Assessment Technologies SA
  */
 
@@ -137,7 +140,9 @@ public function editSubject()
         $subject = $this->getCurrentInstance();
 
         $addMode = false;
-        $login = (string) $subject->getOnePropertyValue(new core_kernel_classes_Property(GenerisRdf::PROPERTY_USER_LOGIN));
+        $login = (string) $subject->getOnePropertyValue(
+            new core_kernel_classes_Property(GenerisRdf::PROPERTY_USER_LOGIN)
+        );
         if (empty($login)) {
             $addMode = true;
             $this->setData('loginUri', tao_helpers_Uri::encode(GenerisRdf::PROPERTY_USER_LOGIN));

diff --git a/actions/TestTakerGenerisTree.php b/actions/TestTakerGenerisTree.php
@@ -34,7 +34,6 @@
  */
 class TestTakerGenerisTree extends tao_actions_GenerisTree
 {
-
     /**
      * @see tao_actions_GenerisTree::setValues()
      */

diff --git a/actions/form/Search.php b/actions/form/Search.php
@@ -25,15 +25,18 @@
 
 class Search extends \tao_actions_form_Search
 {
-
     /**
      * (non-PHPdoc)
      * @see tao_actions_form_Search::getClassProperties()
      */
     protected function getClassProperties()
     {
         $testTakerProps = \tao_helpers_form_GenerisFormFactory::getClassProperties($this->clazz, $this->getTopClazz());
-        $userProps = \tao_helpers_form_GenerisFormFactory::getClassProperties(new \core_kernel_classes_Class(GenerisRdf::CLASS_GENERIS_USER), $this->getTopClazz());
+        $userProps = \tao_helpers_form_GenerisFormFactory::getClassProperties(
+            new \core_kernel_classes_Class(GenerisRdf::CLASS_GENERIS_USER),
+            $this->getTopClazz()
+        );
+
         return array_merge($testTakerProps, $userProps);
     }
 }
diff --git a/actions/form/TestTaker.php b/actions/form/TestTaker.php
@@ -15,10 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2002-2008 (update and modification) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
- *
+ * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2002-2008 (update and modification) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  */
 
 namespace oat\taoTestTaker\actions\form;
@@ -35,7 +37,6 @@
  */
 class TestTaker extends \tao_actions_form_Users
 {
-
     /**
      * Short description of method initElements
      *
@@ -45,7 +46,7 @@ class TestTaker extends \tao_actions_form_Users
      */
     public function initElements()
     {
-        
+
         parent::initElements();
         $this->form->removeElement(\tao_helpers_Uri::encode(GenerisRdf::PROPERTY_USER_DEFLG));
         $this->form->removeElement(\tao_helpers_Uri::encode(GenerisRdf::PROPERTY_USER_ROLES));

diff --git a/includes/constants.php b/includes/constants.php
@@ -15,9 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
+ * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  *
  */
 

diff --git a/includes/raw_start.php b/includes/raw_start.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -14,19 +15,21 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg (under the project TAO & TAO2);
- *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
- *
+ * Copyright (c) 2002-2008 (original work) Public Research Centre Henri Tudor & University of Luxembourg
+ *                         (under the project TAO & TAO2);
+ *               2008-2010 (update and modification) Deutsche Institut für Internationale Pädagogische Forschung
+ *                         (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor
+ *                         (under the project TAO-SUSTAIN & TAO-DEV);
  */
-?>
-<?php
+
 /**
  * RAW Bootstraping
  *
  * @author CRP Henri Tudor - TAO Team - {@link http://www.tao.lu}
  * @license GPLv2  http://www.opensource.org/licenses/gpl-2.0.php
  */
+
 if (PHP_SAPI == 'cli') {
     $_SERVER['HTTP_HOST'] = 'http://localhost';
     $_SERVER['DOCUMENT_ROOT'] = dirname(__FILE__) . '/../../..';

diff --git a/locales/pt-BR/messages.po b/locales/pt-BR/messages.po
@@ -0,0 +1,92 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: tao-3x\n"
+"PO-Revision-Date: 2023-04-21 15:46\n"
+"Last-Translator: TAO Translation Team <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Language: pt\n"
+"sourceLanguage: en-US\n"
+"targetLanguage: en-US\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Basepath: ../../\n"
+"X-Poedit-KeywordsList: __\n"
+"X-Poedit-SearchPath-0: .\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Crowdin-Project: tao-3x\n"
+"X-Crowdin-Project-ID: 582145\n"
+"X-Crowdin-Language: pt-BR\n"
+"X-Crowdin-File: /taoTestTaker/locales/en-US/messages.po\n"
+"X-Crowdin-File-ID: 1713\n"
+"Language-Team: Portuguese, Brazilian\n"
+
+#, tao-public
+msgid "Delete"
+msgstr "Remover"
+
+msgid "Edit subject"
+msgstr "Editar assunto"
+
+#, tao-public
+msgid "Export"
+msgstr "Exportar"
+
+#, tao-public
+msgid "Import"
+msgstr "Importar"
+
+msgid "Last updated on %2s"
+msgstr "Última atualização em %2s"
+
+#, tao-public
+msgid "Manage Schema"
+msgstr "Gerenciar esquema"
+
+#, tao-public
+msgid "Manage test takers"
+msgstr "Gerenciar candidatos"
+
+#, tao-public
+msgid "Move"
+msgstr "Mover"
+
+#, tao-public
+msgid "Move To"
+msgstr "Mover para"
+
+#, tao-public
+msgid "New class"
+msgstr "Nova pasta"
+
+#, tao-public
+msgid "New test-taker"
+msgstr "Novo candidato"
+
+#, tao-public
+msgid "Properties"
+msgstr "Propriedades"
+
+#, tao-public
+msgid "Record and manage test takers."
+msgstr "Registre e gerencie os candidatos."
+
+msgid "Test taker saved"
+msgstr "Candidato salvo"
+
+msgid "Test takers"
+msgstr "Candidatos"
+
+#, tao-public
+msgid "Test takers library"
+msgstr "Biblioteca de candidatos"
+
+msgid "Test takers may be assigned to sets according to the relevant assessment context (Human resources management, education, edumetric monitoring, etc.)."
+msgstr "Candidatos podem ser atribuídos a organismos de realização de testes conforme o contexto de avaliação relevante (gestão de recursos humanos, educação, monitoramento edumétrico, etc.)."
+
+#, tao-public
+msgid "Test-takers"
+msgstr "Candidatos"
+
+msgid "The Test takers module allows to record and manage  test takers."
+msgstr "O módulo de candidatos permite registrar e gerenciar os candidatos."
+
diff --git a/locales/pt-BR/messages_po.js b/locales/pt-BR/messages_po.js
diff --git a/locales/pt-BR/taosubject.rdf.po b/locales/pt-BR/taosubject.rdf.po
@@ -0,0 +1,39 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: tao-3x\n"
+"PO-Revision-Date: 2023-04-21 15:46\n"
+"Last-Translator: TAO Translation Team <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Language: pt\n"
+"sourceLanguage: en-US\n"
+"targetLanguage: en-US\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Crowdin-Project: tao-3x\n"
+"X-Crowdin-Project-ID: 582145\n"
+"X-Crowdin-Language: pt-BR\n"
+"X-Crowdin-File: /taoTestTaker/locales/en-US/taosubject.rdf.po\n"
+"X-Crowdin-File-ID: 1715\n"
+"Language-Team: Portuguese, Brazilian\n"
+
+# http://www.tao.lu/Ontologies/TAOSubject.rdf#Subject
+msgctxt "http://www.w3.org/2000/01/rdf-schema#label"
+msgid "Test-taker"
+msgstr "Candidato"
+
+# http://www.tao.lu/Ontologies/TAOSubject.rdf#Subject
+msgctxt "http://www.w3.org/2000/01/rdf-schema#comment"
+msgid "The Test-taker class"
+msgstr "Classe de candidato"
+
+# http://www.tao.lu/Ontologies/TAOSubject.rdf#SubjectsManagerRole
+msgctxt "http://www.w3.org/2000/01/rdf-schema#label"
+msgid "Test Takers Manager"
+msgstr "Gerente de candidatos"
+
+# http://www.tao.lu/Ontologies/TAOSubject.rdf#SubjectsManagerRole
+msgctxt "http://www.w3.org/2000/01/rdf-schema#comment"
+msgid "The Test Takers Manager Role"
+msgstr "Função de Gestor de Candidatos"
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,6 @@ @@
      */
     class TestTakerGenerisTree extends tao_actions_GenerisTree
     {
         /**
          * @see tao_actions_GenerisTree::setValues()
          */
@@ Expand Down @@