Merge branch 'release-7.10.0'

oat-sa · May 5, 2023 · 478f2cc · 478f2cc
2 parents 6ec16f8 + 474d4bb
commit 478f2cc
Show file tree

Hide file tree

Showing 17 changed files with 153 additions and 25 deletions.
diff --git a/locales/pt-BR/dac.rdf.po b/locales/pt-BR/dac.rdf.po
@@ -0,0 +1,29 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: tao-3x\n"
+"PO-Revision-Date: 2023-04-21 15:46\n"
+"Last-Translator: TAO Translation Team <translation@tao.lu>\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: /taoDacSimple/locales/en-US/dac.rdf.po\n"
+"X-Crowdin-File-ID: 1439\n"
+"Language-Team: Portuguese, Brazilian\n"
+
+# http://www.tao.lu/Ontologies/TAO.rdf#DacAdministrator
+msgctxt "http://www.w3.org/2000/01/rdf-schema#label"
+msgid "Data Access Administrator"
+msgstr "Administrador de Acesso aos Dados"
+
+# http://www.tao.lu/Ontologies/TAO.rdf#DacAdministrator
+msgctxt "http://www.w3.org/2000/01/rdf-schema#comment"
+msgid "Data Access Administrator role"
+msgstr "Função de Administrador de Acesso aos Dados"
+
diff --git a/locales/pt-BR/messages.po b/locales/pt-BR/messages.po
@@ -0,0 +1,94 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: tao-3x\n"
+"PO-Revision-Date: 2023-04-21 15:46\n"
+"Last-Translator: TAO Translation Team <translation@tao.lu>\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: /taoDacSimple/locales/en-US/messages.po\n"
+"X-Crowdin-File-ID: 1437\n"
+"Language-Team: Portuguese, Brazilian\n"
+
+msgid "%s classes and instances have been updated"
+msgstr "%s classes e instâncias foram atualizadas"
+
+msgid "Access control"
+msgstr "Controle de Acesso"
+
+msgid "Access Permissions for"
+msgstr "Permissões de Acesso para"
+
+msgid "Actions"
+msgstr "Ações"
+
+msgid "Add role(s)"
+msgstr "Adicionar funções"
+
+msgid "Add user(s)"
+msgstr "Adicionar usuário(s)"
+
+msgid "Error"
+msgstr "ERRO"
+
+msgid "grant"
+msgstr "conceder"
+
+msgid "Name"
+msgstr "Nome:"
+
+msgid "Permissions saved"
+msgstr "Permissões salvas"
+
+msgid "read"
+msgstr "lidos"
+
+msgid "Recursive"
+msgstr "Recursiva"
+
+msgid "Remove"
+msgstr "Excluir"
+
+msgid "role"
+msgstr "Função"
+
+msgid "Roles"
+msgstr "Papéis"
+
+msgid "Save"
+msgstr "Salvar"
+
+msgid "something went wrong during taoDacSimple uninstallation\n"
+msgstr "algo deu errado durante a desinstalação taoDacSimple\n"
+
+msgid "taoDacSimple extension correctly uninstalled"
+msgstr "extensão taoDacSimple desinstalada corretamente"
+
+msgid "Type"
+msgstr "tipo"
+
+msgid "Unable to process your request"
+msgstr "Não foi possível processar sua solicitação"
+
+msgid "user"
+msgstr "usuário"
+
+msgid "Users"
+msgstr "Utilizadores"
+
+msgid "write"
+msgstr "escrever"
+
+msgid "You must have one role or user that have the manage permission on this element."
+msgstr "Você deve ter uma função ou usuário que tenha a permissão de gerenciar este elemento."
+
diff --git a/locales/pt-BR/messages_po.js b/locales/pt-BR/messages_po.js
diff --git a/manifest.php b/manifest.php
@@ -1,9 +1,5 @@
 <?php
 
-use oat\taoDacSimple\model\Copy\ServiceProvider\CopyServiceProvider;
-use oat\taoDacSimple\scripts\install\AttachEventHandler;
-use oat\taoDacSimple\scripts\update\Updater;
-
 /**
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -22,6 +18,9 @@
  * Copyright (c) 2014-2022 (original work) Open Assessment Technologies SA;
  */
 
+use oat\taoDacSimple\model\Copy\ServiceProvider\CopyServiceProvider;
+use oat\taoDacSimple\scripts\install\AttachEventHandler;
+use oat\taoDacSimple\scripts\update\Updater;
 use oat\taoDacSimple\scripts\install\SetupDataAccess;
 use oat\taoDacSimple\scripts\install\RegisterAction;
 use oat\taoDacSimple\controller\AdminAccessController;

diff --git a/model/PermissionProvider.php b/model/PermissionProvider.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -21,6 +19,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace oat\taoDacSimple\model;
 
 use common_exception_Error;

diff --git a/model/PermissionsService.php b/model/PermissionsService.php
@@ -169,7 +169,7 @@ private function getResourcesToUpdate(ChangePermissionsCommand $command): array
             return array_merge([$root], $root->getInstances()); // non-recursive
         }
 
-         return [$root];
+        return [$root];
     }
 
     private function getActions(

diff --git a/model/PermissionsServiceFactory.php b/model/PermissionsServiceFactory.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -21,6 +19,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace oat\taoDacSimple\model;
 
 use oat\oatbox\event\EventManager;

diff --git a/model/PermissionsStrategyInterface.php b/model/PermissionsStrategyInterface.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -21,6 +19,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace oat\taoDacSimple\model;
 
 interface PermissionsStrategyInterface

diff --git a/model/SavePermissionsStrategy.php b/model/SavePermissionsStrategy.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -21,6 +19,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace oat\taoDacSimple\model;
 
 class SavePermissionsStrategy extends PermissionsStrategyAbstract

diff --git a/model/SyncPermissionsStrategy.php b/model/SyncPermissionsStrategy.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -21,6 +19,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace oat\taoDacSimple\model;
 
 class SyncPermissionsStrategy extends PermissionsStrategyAbstract

diff --git a/model/action/AdminAction.php b/model/action/AdminAction.php
@@ -30,7 +30,8 @@
 /**
  * Admin Action, based on xml:
  *
- * <action id="access-control-admin" name="Access control" url="/taoDacSimple/AdminAccessController/adminPermissions" group="tree" context="resource">
+ * <action id="access-control-admin" name="Access control" url="/taoDacSimple/AdminAccessController/adminPermissions"
+ *         group="tree" context="resource">
  *     <icon id="icon-unlock" />
  * </action>
  */

diff --git a/model/event/DacAffectedUsersEvent.php b/model/event/DacAffectedUsersEvent.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -21,6 +19,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace oat\taoDacSimple\model\event;
 
 use oat\oatbox\event\Event;

diff --git a/scripts/tools/UpdateDataAccess.php b/scripts/tools/UpdateDataAccess.php
@@ -51,7 +51,10 @@ public function __invoke($params)
             $updated += $this->addPermissionsToClass($class, $rights);
         }
 
-        return new \common_report_Report(\common_report_Report::TYPE_SUCCESS, __('%s classes and instances have been updated', $updated));
+        return new \common_report_Report(
+            \common_report_Report::TYPE_SUCCESS,
+            __('%s classes and instances have been updated', $updated)
+        );
     }
 
 

diff --git a/scripts/uninstall/RemoveDataAccess.php b/scripts/uninstall/RemoveDataAccess.php
@@ -47,7 +47,9 @@ public function __invoke($params)
 
             $this->getServiceManager()->register(PermissionInterface::SERVICE_ID, new FreeAccess());
         } catch (\Exception $e) {
-            return \common_report_Report::createFailure(__("something went wrong during taoDacSimple uninstallation\n" . $e->getMessage()));
+            return \common_report_Report::createFailure(
+                __("something went wrong during taoDacSimple uninstallation\n" . $e->getMessage())
+            );
         }
 
         return \common_report_Report::createSuccess(__('taoDacSimple extension correctly uninstalled'));

diff --git a/test/unit/model/DataBaseAccessTest.php b/test/unit/model/DataBaseAccessTest.php
@@ -276,4 +276,3 @@ public function fetchAll($mode = PDO::FETCH_BOTH, $fetch_argument = null, ...$ar
     }
 }
 // @codingStandardsIgnoreEnd
-
diff --git a/test/unit/model/SavePermissionsStrategyTest.php b/test/unit/model/SavePermissionsStrategyTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -21,6 +19,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace oat\taoDacSimple\test\unit\model;
 
 use oat\taoDacSimple\model\SavePermissionsStrategy;

diff --git a/test/unit/model/SyncPermissionsStrategyTest.php b/test/unit/model/SyncPermissionsStrategyTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -21,6 +19,8 @@
  *
  */
 
+declare(strict_types=1);
+
 namespace oat\taoDacSimple\test;
 
 use oat\taoDacSimple\model\SyncPermissionsStrategy;