Merge branch 'main' into wip/mkdocs-build-strict

dasch-swiss · Apr 15, 2024 · f296600 · f296600
2 parents 6af2861 + c82749f
commit f296600
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/webapi/src/main/resources/knora-ontologies/knora-base.ttl b/webapi/src/main/resources/knora-ontologies/knora-base.ttl
@@ -20,7 +20,7 @@
     rdf:type           owl:Ontology ;
     rdfs:label         "The Knora base ontology"@en ;
     :attachedToProject knora-admin:SystemProject ;
-    :ontologyVersion   "knora-base v34" .
+    :ontologyVersion   "knora-base v35" .
 
 
 #################################################################
@@ -385,7 +385,7 @@
     rdf:type                owl:ObjectProperty ;
     rdfs:label              "hat Standoff Link zu"@de,
                             "has Standoff Link to"@en,
-                            "a standoff lien vers"@fr,
+                            "liens intégrés"@fr,
                             "ha standoff link verso"@it ;
     rdfs:comment            "Repräsentiert einen Link im Standoff Markup von einer Ressource zu einer anderen"@de,
                             "Represents a link in standoff markup from one resource to another."@en ;
@@ -400,7 +400,7 @@
     rdf:type                owl:ObjectProperty ;
     rdfs:label              "hat Standoff Link zu"@de,
                             "has Standoff Link to"@en,
-                            "a standoff lien vers"@fr,
+                            "liens intégrés"@fr,
                             "ha standoff link verso"@it ;
     rdfs:comment            "Repräsentiert einen Link im Standoff Markup von einer Ressource zu einer anderen"@de,
                             "Represents a link in standoff markup from one resource to another."@en ;

diff --git a/...i/messages/v2/responder/ontologymessages/KnoraBaseToApiV2ComplexTransformationRules.scala b/...i/messages/v2/responder/ontologymessages/KnoraBaseToApiV2ComplexTransformationRules.scala
@@ -479,6 +479,7 @@ object KnoraBaseToApiV2ComplexTransformationRules extends OntologyTransformation
         objectsWithLang = Map(
           LanguageCodes.DE -> "hat eingehenden Verweis",
           LanguageCodes.EN -> "has incoming link",
+          LanguageCodes.FR -> "liens entrants",
         ),
       ),
       makePredicate(

diff --git a/webapi/src/main/scala/org/knora/webapi/package.scala b/webapi/src/main/scala/org/knora/webapi/package.scala
@@ -11,7 +11,7 @@ package object webapi {
    * The version of `knora-base` and of the other built-in ontologies that this version of Knora requires.
    * Must be the same as the object of `knora-base:ontologyVersion` in the `knora-base` ontology being used.
    */
-  val KnoraBaseVersion: String = "knora-base v34"
+  val KnoraBaseVersion: String = "knora-base v35"
 
   /**
    * `IRI` is a synonym for `String`, used to improve code readability.

diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdatePlan.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdatePlan.scala
@@ -50,6 +50,7 @@ object RepositoryUpdatePlan {
       PluginForKnoraBaseVersion(versionNumber = 32, plugin = new MigrateOnlyBuiltInGraphs()),
       PluginForKnoraBaseVersion(versionNumber = 33, plugin = new MigrateOnlyBuiltInGraphs()),
       PluginForKnoraBaseVersion(versionNumber = 34, plugin = new MigrateOnlyBuiltInGraphs()),
+      PluginForKnoraBaseVersion(versionNumber = 35, plugin = new MigrateOnlyBuiltInGraphs()),
     )
 
   /**