Merge remote-tracking branch 'origin/main' into dcat

SPW-DIG · Apr 29, 2024 · d5755c8 · d5755c8
2 parents 2d1e5d8 + bb6a19e
commit d5755c8
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/citation/common.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/citation/common.xsl
@@ -12,7 +12,6 @@
                 extension-element-prefixes="saxon"
                 exclude-result-prefixes="#all">
 
-
   <xsl:param name="format"
              select="'html'"/>
 

diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/citation/view.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/citation/view.xsl
@@ -13,15 +13,15 @@
                 extension-element-prefixes="saxon"
                 exclude-result-prefixes="#all">
 
+  <xsl:import href="base.xsl"/>
+  <xsl:import href="common.xsl"/>
+
   <xsl:output omit-xml-declaration="yes"
               method="xml"
               indent="yes"
               saxon:indent-spaces="2"
               encoding="UTF-8"/>
 
-  <xsl:import href="base.xsl"/>
-  <xsl:import href="common.xsl"/>
-
   <xsl:variable name="metadata"
                 select="/root/mdb:MD_Metadata"/>
 

diff --git a/schemas/iso19139/src/main/plugin/iso19139/formatter/citation/view.xsl b/schemas/iso19139/src/main/plugin/iso19139/formatter/citation/view.xsl
@@ -18,15 +18,15 @@
                 extension-element-prefixes="saxon"
                 exclude-result-prefixes="#all">
 
+  <xsl:include href="base.xsl"/>
+  <xsl:include href="../../../iso19115-3.2018/formatter/citation/common.xsl"/>
+
   <xsl:output omit-xml-declaration="yes"
               method="xml"
               indent="yes"
               saxon:indent-spaces="2"
               encoding="UTF-8"/>
 
-  <xsl:include href="base.xsl"/>
-  <xsl:include href="../../../iso19115-3.2018/formatter/citation/common.xsl"/>
-
   <xsl:variable name="metadata"
                 select="/root/gmd:MD_Metadata"/>
 

diff --git a/web-ui/src/main/resources/catalog/components/viewer/wps/WpsDirective.js b/web-ui/src/main/resources/catalog/components/viewer/wps/WpsDirective.js
@@ -253,19 +253,23 @@
                   return "time";
                 } else if (scope.isDate(input)) {
                   return "date";
-                } if (scope.isDateTime(input)) {
+                }
+                if (scope.isDateTime(input)) {
                   return "datetime-local";
-                } else
-                return "";
+                } else return "";
               };
               scope.getDateBounds = function (input, isMin) {
                 if (!input) {
                   return;
                 } else if (isMin) {
-                  return input.literalData.allowedValues.valueOrRange[0].minimumValue
-                    .value || "";
+                  return (
+                    input.literalData.allowedValues.valueOrRange[0].minimumValue.value ||
+                    ""
+                  );
                 }
-                return input.literalData.allowedValues.valueOrRange[0].maximumValue.value || "";
+                return (
+                  input.literalData.allowedValues.valueOrRange[0].maximumValue.value || ""
+                );
               };
 
               // get values from wfs filters

diff --git a/web/src/main/webapp/WEB-INF/classes/org/fao/geonet/api/Messages_fre.properties b/web/src/main/webapp/WEB-INF/classes/org/fao/geonet/api/Messages_fre.properties
@@ -112,7 +112,7 @@ metadata_published_text=Les fiches suivantes ont \u00E9t\u00E9 trait\u00E9es:\n\
     <ul>%s</ul>
 metadata_published_record_text=<li>La m\u00E9tadonn\u00E9e <a href="{{link}}">{{index:resourceTitleObject}}</a> a \u00E9t\u00E9 publi\u00E9e.</li>
 metadata_unpublished_record_text=<li>La m\u00E9tadonn\u00E9e <a href="{{link}}">{{index:resourceTitleObject}}</a> a \u00E9t\u00E9 d\u00E9publi\u00E9e.</li>
-metadata_approved_published_record_text=<li>La m\u00E9tadonn\u00E9e <a href="{{link}}">{{index:resourceTitleObject}}</a> a \u00E9t\u00E9 publi\u00E9e dans une nouvelle version.</li>
+metadata_approved_published_record_text=<li>Une nouvelle version de la m\u00E9tadonn\u00E9e <a href="{{link}}">{{index:resourceTitleObject}}</a> a \u00E9t\u00E9 publi\u00E9e.</li>
 
 api.groups.group_not_found=Le groupe avec l''identifiant ''{0}'' n''a pas \u00E9t\u00E9 trouv\u00E9 dans le catalogue.
 user_watchlist_subject=%s / %d mises \u00e0 jour dans vos fiches surveill\u00E9es %s