Merge pull request #206 from VinceMacBuche/bug_3576/backport_3425

Fixes #3576 backport : datepicker localized in english
Normation · May 7, 2013 · 3871e9f · 3871e9f
2 parents 749b99b + 3c46764
commit 3871e9f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/rudder-core/src/main/scala/com/normation/rudder/domain/queries/CmdbQuery.scala b/rudder-core/src/main/scala/com/normation/rudder/domain/queries/CmdbQuery.scala
@@ -204,8 +204,9 @@ case object DateComparator extends CriterionType {
   }
   //init a jquery datepicker
   override def initForm(formId:String) : JsCmd = OnLoad(JsRaw(
-    "var init = $.datepicker.regional['fr']; init['showOn'] = 'both'; jQuery('#%s').datepicker(init);".
-      format(formId,formId)))
+    """var init = $.datepicker.regional['en-GB'];
+       init['showOn'] = 'both';
+       $('#%s').datepicker(init);""".format(formId,formId)))
 
   override def toLDAP(value:String) = try {
     val date = frenchFmt.parseDateTime(value)

diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/model/DirectiveFieldEditors.scala b/rudder-web/src/main/scala/com/normation/rudder/web/model/DirectiveFieldEditors.scala
@@ -308,7 +308,7 @@ class DateField(format: DateTimeFormatter)(val id: String) extends DirectiveFiel
   def toForm() = {
     val xml = (<head>
                  <script type="text/javascript" src="/javascript/jquery/ui/jquery.ui.datepicker.js"></script>
-                 <script type="text/javascript" src="/javascript/jquery/ui/i18n/jquery.ui.datepicker-fr.js"></script>
+                 <script type="text/javascript" src="/javascript/jquery/ui/i18n/jquery-ui-i18n.js"></script>
                </head>) ++ (SHtml.text(toClient, { x => parseClient(x) }) % ("id" -> this.id)) ++
       Script(OnLoad(JsRaw("var init%s = $.datepicker.regional['%s']; init%s['showOn'] = 'both';jQuery('#%s').datepicker(init%s)".
         format(id, format.getLocale.getLanguage, id, id, id))))
@@ -349,7 +349,7 @@ class TimeField(format: DateTimeFormatter)(val id: String) extends DirectiveFiel
   def toForm() = {
     val xml = (<head>
                  <script type="text/javascript" src="/javascript/jquery/ui/jquery.ui.datepicker.js"></script>
-                 <script type="text/javascript" src="/javascript/jquery/ui/i18n/jquery.ui.datepicker-fr.js"></script>
+                 <script type="text/javascript" src="/javascript/jquery/ui/i18n/jquery-ui-i18n.js"></script>
                </head>) ++ (SHtml.text(toClient, { x => parseClient(x) }) % ("id" -> this.id)) ++
       Script(OnLoad(JsRaw("var init%s = $.datepicker.regional['%s']; init%s['showOn'] = 'both';jQuery('#%s').datepicker(init%s)".
         format(id, format.getLocale.getLanguage, id, id, id))))
@@ -505,4 +505,4 @@ class CheckboxField(val id: String) extends DirectiveField {
   def getPossibleValues(filters: (ValueType => Boolean)*): Option[Set[ValueType]] = None
 
   def getDefaultValue = "false"
-}
+}
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/Groups.scala b/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/Groups.scala
@@ -119,7 +119,7 @@ class Groups extends StatefulSnippet with SpringExtendableSnippet[Groups] with L
   def head(html:NodeSeq) : NodeSeq = {
     {<head>
       <script type="text/javascript" src="/javascript/jquery/ui/jquery.ui.datepicker.js"></script>
-      <script type="text/javascript" src="/javascript/jquery/ui/i18n/jquery.ui.datepicker-fr.js"></script>
+      <script type="text/javascript" src="/javascript/jquery/ui/i18n/jquery-ui-i18n.js"></script>
       <script type="text/javascript" src="/javascript/jstree/jquery.jstree.js" id="jstree"></script>
       <script type="text/javascript" src="/javascript/rudder/tree.js" id="tree"></script>
       <script type="text/javascript" src="/javascript/json2.js" id="json2"></script>

diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/SearchNodes.scala b/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/SearchNodes.scala
@@ -146,7 +146,7 @@ class SearchNodes extends StatefulSnippet with Loggable {
 
     { <head>
       <script type="text/javascript" src="/javascript/jquery/ui/jquery.ui.datepicker.js"></script>
-      <script type="text/javascript" src="/javascript/jquery/ui/i18n/jquery.ui.datepicker-fr.js"></script>
+      <script type="text/javascript" src="/javascript/jquery/ui/i18n/jquery-ui-i18n.js"></script>
       {Script(OnLoad(parseJsArg()))}
     </head> } ++ ShowNodeDetailsFromNode.staticInit
   }