Merge branch 'rdmorganiser:master' into nfdi4ds-hackathon-2023

rdmorganiser · Dec 4, 2023 · 97978c0 · 97978c0
2 parents c0dd422 + 918e69d
commit 97978c0
Show file tree

Hide file tree

Showing 3 changed files with 484 additions and 5 deletions.
diff --git a/rdmorganiser/conditions/rdmo.xml b/rdmorganiser/conditions/rdmo.xml
@@ -18,6 +18,15 @@
 		<target_text>1</target_text>
 		<target_option/>
 	</condition>
+	<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/data_published">
+		<uri_prefix>https://rdmorganiser.github.io/terms/</uri_prefix>
+		<key>data_published</key>
+		<dc:comment/>
+		<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/data_publication_date"/>
+		<relation>eq</relation>
+		<target_text/>
+		<target_option dc:uri="https://rdmorganiser.github.io/terms/options/dfg_using_when/dfg-uw_08"/>
+	</condition>
 	<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/data_sharing">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
 		<key>data_sharing</key>
@@ -117,6 +126,15 @@
 		<target_text/>
 		<target_option dc:uri="https://rdmorganiser.github.io/terms/options/preservation_repository_options/138"/>
 	</condition>
+	<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/reuse_scenario">
+		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
+		<key>reuse_scenario</key>
+		<dc:comment/>
+		<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/reuse_scenario"/>
+		<relation>neq</relation>
+		<target_text/>
+		<target_option dc:uri="https://rdmorganiser.github.io/terms/options/dfg_reuse_context/dfg-rsc_04"/>
+	</condition>
 	<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/rights_owner_clear">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
 		<key>rights_owner_clear</key>

diff --git a/rdmorganiser/questions/rdmo.xml b/rdmorganiser/questions/rdmo.xml
@@ -393,23 +393,23 @@
 		<is_collection>True</is_collection>
 		<order>21</order>
 		<title lang="en">Project partners</title>
-		<help lang="en"/>
+		<help lang="en">In this questionnaire the first "partner" is the very project applicant. So even if no further partners are involved in your project, please create at least one "partner" to enter the minimum required information for yourself.</help>
 		<verbose_name lang="en">project partner</verbose_name>
 		<verbose_name_plural lang="en">project partners</verbose_name_plural>
 		<title lang="de">Projektpartner</title>
-		<help lang="de"/>
+		<help lang="de">In diesem Fragebogen, der erste "Partner" ist der Antragsteller selbst. Also selbst wenn keine weitere Partner an Ihrem Projekt beteiligt sind, legen Sie bitte mindestens einen "Partner" an, um die erforderlichen Mindestangaben für sich selbst einzugeben.</help>
 		<verbose_name lang="de">Projektpartner</verbose_name>
 		<verbose_name_plural lang="de">Projektpartner</verbose_name_plural>
 		<title lang="es">Socios del proyecto</title>
-		<help lang="es"/>
+		<help lang="es">En este cuestionario, el primero "socio" es el solicitante mismo del proyecto. Luego, también si no hay otros socios implicados en su proyecto, cree al menos un socio para introducir la información mínima requerida para usted mismo.</help>
 		<verbose_name lang="es">Socio del proyecto</verbose_name>
 		<verbose_name_plural lang="es">Socios del proyecto</verbose_name_plural>
 		<title lang="fr">Partenaires du projet</title>
-		<help lang="fr"/>
+		<help lang="fr">Dans ce questionnaire le premier « partenaire » est l'appliquant même du projet. Ensuite, si aucun outre partenaire n'est impliqué dans votre projet, veuillez créer au moins un « partenaire », afin de saisir les informations minimes requises pour vous-même.</help>
 		<verbose_name lang="fr">Partenaire du projet</verbose_name>
 		<verbose_name_plural lang="fr">Partenaires du projet</verbose_name_plural>
 		<title lang="it">Partner del progetto</title>
-		<help lang="it"/>
+		<help lang="it">In questo questionario, il primo "partner" è il richiedente stesso del progetto. Perciò, anche se non ci sono partner coinvolti nel vostro progetto, create almeno un "partner" per inserire le informazioni minime richieste per voi stessi.</help>
 		<verbose_name lang="it">Partner del progetto</verbose_name>
 		<verbose_name_plural lang="it">Partner del progetto</verbose_name_plural>
 		<conditions/>