Merge remote-tracking branch 'origin/OpenOLAT_14.1'

src/main/java/org/olat/core/commons/modules/bc/components/FolderComponentRenderer.java

@@ -28,8 +28,10 @@ package org.olat.core.commons.modules.bc.components;
 
 import java.util.List;
 
+import org.olat.core.CoreSpringFactory;
 import org.olat.core.commons.modules.bc.FolderRunController;
 import org.olat.core.commons.modules.bc.commands.FolderCommandFactory;
+import org.olat.core.commons.services.vfs.VFSVersionModule;
 import org.olat.core.gui.components.Component;
 import org.olat.core.gui.components.DefaultComponentRenderer;
 import org.olat.core.gui.components.form.flexible.impl.NameValuePair;
@@ -55,6 +57,8 @@ public class FolderComponentRenderer extends DefaultComponentRenderer {
 	private final ListRenderer listRenderer;
 	private final CrumbRenderer crumbRenderer;
 
+	private VFSVersionModule vfsVersionModule;
+
 	/**
 	 * Constructor for TableRenderer. Singleton and must be reentrant
 	 * There must be an empty contructor for the Class.forName() call
@@ -67,6 +71,10 @@ public class FolderComponentRenderer extends DefaultComponentRenderer {
 
 	@Override
 	public void render(Renderer renderer, StringOutput target, Component source, URLBuilder ubu, Translator translator, RenderResult renderResult, String[] args) {
+		if(vfsVersionModule == null) {
+			vfsVersionModule = CoreSpringFactory.getImpl(VFSVersionModule.class);
+		}
+		
 		FolderComponent fc = (FolderComponent) source;
 		// is called for the current inline html
 		int renderType = 0;
@@ -94,7 +102,7 @@ public class FolderComponentRenderer extends DefaultComponentRenderer {
 		}
 		
 		boolean canDelete = false;
-		boolean canVersion = fc.getCurrentContainer().canVersion() == VFSConstants.YES;
+		boolean canVersion = vfsVersionModule.isEnabled() && fc.getCurrentContainer().canVersion() == VFSConstants.YES;
 		boolean canMail = fc.isCanMail();
 		
 		List<VFSItem> children = fc.getCurrentContainerChildren();

src/main/java/org/olat/course/assessment/ui/mode/_i18n/LocalStrings_pt_BR.properties

-#Thu Jul 04 16:06:34 CEST 2019
+#Fri Sep 13 17:06:12 CEST 2019
 add.mode=Criar configura\u00E7\u00E3o do teste
 admin.menu.title=Modo do teste
 admin.menu.title.alt=$\:admin.menu.title
@@ -112,6 +112,7 @@ table.header.status=Status
 table.header.target=Para
 target.course=Apenas participantes do curso
 target.courseAndGroups=Participantes do curso e grupos
+target.courseGroupsAndCurriculums=Participantes do curso, grupos e curr\u00EDculos
 target.curriculumElements=Somente participantes do curr\u00EDculo
 target.groups=Apenas participantes do grupo
 time.formatted={0}m

src/main/java/org/olat/course/db/_i18n/LocalStrings_pt_BR.properties

-#Thu Sep 12 20:59:38 CEST 2019
+#Fri Sep 13 17:06:14 CEST 2019
 command.new_db=Criar novo banco de dados
 customDb.category=Nome
 customDb.create=Criar

src/main/java/org/olat/course/nodes/survey/_i18n/LocalStrings_pt_BR.properties

-#Tue Oct 23 22:19:51 CEST 2018
+#Fri Sep 13 17:07:50 CEST 2019
 condition.accessibility.title=Acesso
 course.node.link.text=Pesquisa
 edit.choose=Escolha, crie ou importe
@@ -33,6 +33,8 @@ run.command.delete.data.all.check=Excluir todas as respostas
 run.command.delete.data.all.confirmation.error=Por favor, confirme a exclus\u00E3o das respostas.
 run.command.delete.data.all.message=Voc\u00EA realmente deseja excluir todas as respostas? {0} usu\u00E1rios j\u00E1 participaram desta pesquisa. N\u00E3o \u00E9 poss\u00EDvel restaurar as respostas.
 run.command.delete.data.all.title=Excluir todas as respostas
+run.no.survey.message=Esta pesquisa n\u00E3o est\u00E1 dispon\u00EDvel.
+run.no.survey.title=Pesquisa n\u00E3o est\u00E1 pronta
 run.noaccess.message=Esta parte do curso n\u00E3o est\u00E1 acess\u00EDvel para voc\u00EA.
 run.noaccess.title=Sem acesso
 run.participation.done.message=Voc\u00EA j\u00E1 terminou esta pesquisa. Obrigado pela sua participa\u00E7\u00E3o.

src/main/java/org/olat/course/nodes/tu/_i18n/LocalStrings_pt_BR.properties

-#Thu Sep 12 21:00:36 CEST 2019
+#Fri Sep 13 17:07:51 CEST 2019
 TUConfigForm.invalidurl=Favor inserir uma URL v\u00E1lida.
 TUConfigForm.pass=Senha
 TUConfigForm.protected=P\u00E1gina controlada por senha

src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_pt_BR.properties

-#Wed Mar 06 15:29:03 CET 2019
+#Fri Sep 13 17:05:13 CEST 2019
 accept=Confirmar
 action=A\u00E7\u00E3o
 add.member=Adicionar membro
@@ -146,6 +146,7 @@ table.header.ac=AC
 table.header.ac.method=Acesso
 table.header.bgname=Nome
 table.header.businesscard=Contato
+table.header.createionDate=Data de cria\u00E7\u00E3o
 table.header.curriculum=Curr\u00EDculo
 table.header.curriculum.element=Elemento
 table.header.delete=Apagar