Fixes #19228: Date format in search is French localised and the datep…

…icker is broken
Normation · May 7, 2021 · 9870980 · 9870980
1 parent 074cb46
commit 9870980
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/...ces/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/CmdbQuery.scala b/...ces/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/CmdbQuery.scala
@@ -419,16 +419,17 @@ final case object DateComparator extends LDAPCriterionType {
   override val comparators = OrderedComparators.comparators.filterNot( c => c == Regex || c == NotRegex)
   val fmt = "dd/MM/yyyy"
   val frenchFmt = DateTimeFormat.forPattern(fmt).withLocale(Locale.FRANCE)
+  def error(value: String, e: Exception) = Inconsistency(s"Invalide date: '${value}', expected format is: '${fmt}'. Error was: ${e.getMessage}")
 
   override protected def validateSubCase(v:String,comparator:CriterionComparator) = try {
     Right(frenchFmt.parseDateTime(v).toString)
   } catch {
     case e:Exception =>
-      Left(Inconsistency(s"Invalide date: '${v}'. Error was: ${e.getMessage}"))
+      Left(error(v, e))
   }
   //init a jquery datepicker
   override def initForm(formId:String) : JsCmd = OnLoad(JsRaw(
-    """var init = $.datepicker.regional['en-GB'];
+    """var init = $.datepicker.regional['en'];
        init['showOn'] = 'focus';
        $('#%s').datepicker(init);
        """.format(formId)))
@@ -441,7 +442,7 @@ final case object DateComparator extends LDAPCriterionType {
     Right(date)
   } catch {
     case e:Exception =>
-      Left(Inconsistency(s"Invalide date: '${value}'. Error was: ${e.getMessage}"))
+      Left(error(value, e))
   }
 
   /*

diff --git a/...p/sources/rudder/rudder-web/src/main/webapp/secure/administration/databaseManagement.html b/...p/sources/rudder/rudder-web/src/main/webapp/secure/administration/databaseManagement.html
@@ -13,7 +13,7 @@
         , changeYear: true
         , showButtonPanel: true
       });
-      $.datepicker.setDefaults( $.datepicker.regional[ "en-GB" ] );
+      $.datepicker.setDefaults( $.datepicker.regional[ "en" ] );
     };
 
     // ]]>