diff --git a/htdocs/includes/jquery/i18n/README b/htdocs/includes/jquery/i18n/README
index 85d09fc88c0..44fe75ed28e 100644
--- a/htdocs/includes/jquery/i18n/README
+++ b/htdocs/includes/jquery/i18n/README
@@ -3,8 +3,8 @@ http://github.com/jquery/jquery-ui
add "js" directory in language directory
eg: /langs/fr_FR/js/
-add datepicker language file
+move datepicker language file
eg: /langs/fr_FR/js/jquery.ui.datepicker-fr.js
-and rename the file with country code
-eg: /langs/fr_FR/js/jquery.ui.datepicker-fr_FR.js
+and rename the file
+eg: /langs/fr_FR/js/jquery.ui.datepicker.js
diff --git a/htdocs/includes/jquery/i18n/jquery.ui.datepicker-ca.js b/htdocs/langs/ca_ES/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/includes/jquery/i18n/jquery.ui.datepicker-ca.js
rename to htdocs/langs/ca_ES/js/jquery.ui.datepicker.js
diff --git a/htdocs/includes/jquery/i18n/jquery.ui.datepicker-da.js b/htdocs/langs/da_DK/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/includes/jquery/i18n/jquery.ui.datepicker-da.js
rename to htdocs/langs/da_DK/js/jquery.ui.datepicker.js
diff --git a/htdocs/includes/jquery/i18n/jquery.ui.datepicker-de.js b/htdocs/langs/de_DE/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/includes/jquery/i18n/jquery.ui.datepicker-de.js
rename to htdocs/langs/de_DE/js/jquery.ui.datepicker.js
diff --git a/htdocs/includes/jquery/i18n/jquery.ui.datepicker-el.js b/htdocs/langs/el_GR/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/includes/jquery/i18n/jquery.ui.datepicker-el.js
rename to htdocs/langs/el_GR/js/jquery.ui.datepicker.js
diff --git a/htdocs/includes/jquery/i18n/jquery.ui.datepicker-en-AU.js b/htdocs/langs/en_AU/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/includes/jquery/i18n/jquery.ui.datepicker-en-AU.js
rename to htdocs/langs/en_AU/js/jquery.ui.datepicker.js
diff --git a/htdocs/includes/jquery/i18n/jquery.ui.datepicker-en-GB.js b/htdocs/langs/en_GB/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/includes/jquery/i18n/jquery.ui.datepicker-en-GB.js
rename to htdocs/langs/en_GB/js/jquery.ui.datepicker.js
diff --git a/htdocs/includes/jquery/i18n/jquery.ui.datepicker-en-NZ.js b/htdocs/langs/en_NZ/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/includes/jquery/i18n/jquery.ui.datepicker-en-NZ.js
rename to htdocs/langs/en_NZ/js/jquery.ui.datepicker.js
diff --git a/htdocs/includes/jquery/i18n/jquery.ui.datepicker-es.js b/htdocs/langs/es_ES/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/includes/jquery/i18n/jquery.ui.datepicker-es.js
rename to htdocs/langs/es_ES/js/jquery.ui.datepicker.js
diff --git a/htdocs/includes/jquery/i18n/jquery.ui.datepicker-fa.js b/htdocs/langs/fa_IR/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/includes/jquery/i18n/jquery.ui.datepicker-fa.js
rename to htdocs/langs/fa_IR/js/jquery.ui.datepicker.js
diff --git a/htdocs/includes/jquery/i18n/jquery.ui.datepicker-fi.js b/htdocs/langs/fi_FI/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/includes/jquery/i18n/jquery.ui.datepicker-fi.js
rename to htdocs/langs/fi_FI/js/jquery.ui.datepicker.js
diff --git a/htdocs/langs/fr_CH/js/jquery.ui.datepicker-fr_CH.js b/htdocs/langs/fr_CH/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/langs/fr_CH/js/jquery.ui.datepicker-fr_CH.js
rename to htdocs/langs/fr_CH/js/jquery.ui.datepicker.js
diff --git a/htdocs/langs/fr_FR/js/jquery.ui.datepicker-fr_FR.js b/htdocs/langs/fr_FR/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/langs/fr_FR/js/jquery.ui.datepicker-fr_FR.js
rename to htdocs/langs/fr_FR/js/jquery.ui.datepicker.js
diff --git a/htdocs/includes/jquery/i18n/jquery.ui.datepicker-hu.js b/htdocs/langs/hu_HU/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/includes/jquery/i18n/jquery.ui.datepicker-hu.js
rename to htdocs/langs/hu_HU/js/jquery.ui.datepicker.js
diff --git a/htdocs/includes/jquery/i18n/jquery.ui.datepicker-is.js b/htdocs/langs/is_IS/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/includes/jquery/i18n/jquery.ui.datepicker-is.js
rename to htdocs/langs/is_IS/js/jquery.ui.datepicker.js
diff --git a/htdocs/includes/jquery/i18n/jquery.ui.datepicker-it.js b/htdocs/langs/it_IT/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/includes/jquery/i18n/jquery.ui.datepicker-it.js
rename to htdocs/langs/it_IT/js/jquery.ui.datepicker.js
diff --git a/htdocs/includes/jquery/i18n/jquery.ui.datepicker-ja.js b/htdocs/langs/ja_JP/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/includes/jquery/i18n/jquery.ui.datepicker-ja.js
rename to htdocs/langs/ja_JP/js/jquery.ui.datepicker.js
diff --git a/htdocs/includes/jquery/i18n/jquery.ui.datepicker-no.js b/htdocs/langs/nb_NO/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/includes/jquery/i18n/jquery.ui.datepicker-no.js
rename to htdocs/langs/nb_NO/js/jquery.ui.datepicker.js
diff --git a/htdocs/includes/jquery/i18n/jquery.ui.datepicker-nl.js b/htdocs/langs/nl_NL/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/includes/jquery/i18n/jquery.ui.datepicker-nl.js
rename to htdocs/langs/nl_NL/js/jquery.ui.datepicker.js
diff --git a/htdocs/includes/jquery/i18n/jquery.ui.datepicker-pl.js b/htdocs/langs/pl_PL/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/includes/jquery/i18n/jquery.ui.datepicker-pl.js
rename to htdocs/langs/pl_PL/js/jquery.ui.datepicker.js
diff --git a/htdocs/includes/jquery/i18n/jquery.ui.datepicker-pt-BR.js b/htdocs/langs/pt_BR/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/includes/jquery/i18n/jquery.ui.datepicker-pt-BR.js
rename to htdocs/langs/pt_BR/js/jquery.ui.datepicker.js
diff --git a/htdocs/includes/jquery/i18n/jquery.ui.datepicker-pt.js b/htdocs/langs/pt_PT/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/includes/jquery/i18n/jquery.ui.datepicker-pt.js
rename to htdocs/langs/pt_PT/js/jquery.ui.datepicker.js
diff --git a/htdocs/includes/jquery/i18n/jquery.ui.datepicker-ro.js b/htdocs/langs/ro_RO/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/includes/jquery/i18n/jquery.ui.datepicker-ro.js
rename to htdocs/langs/ro_RO/js/jquery.ui.datepicker.js
diff --git a/htdocs/includes/jquery/i18n/jquery.ui.datepicker-ru.js b/htdocs/langs/ru_RU/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/includes/jquery/i18n/jquery.ui.datepicker-ru.js
rename to htdocs/langs/ru_RU/js/jquery.ui.datepicker.js
diff --git a/htdocs/includes/jquery/i18n/jquery.ui.datepicker-sl.js b/htdocs/langs/sl_SI/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/includes/jquery/i18n/jquery.ui.datepicker-sl.js
rename to htdocs/langs/sl_SI/js/jquery.ui.datepicker.js
diff --git a/htdocs/includes/jquery/i18n/jquery.ui.datepicker-sv.js b/htdocs/langs/sv_SE/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/includes/jquery/i18n/jquery.ui.datepicker-sv.js
rename to htdocs/langs/sv_SE/js/jquery.ui.datepicker.js
diff --git a/htdocs/includes/jquery/i18n/jquery.ui.datepicker-tr.js b/htdocs/langs/tr_TR/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/includes/jquery/i18n/jquery.ui.datepicker-tr.js
rename to htdocs/langs/tr_TR/js/jquery.ui.datepicker.js
diff --git a/htdocs/includes/jquery/i18n/jquery.ui.datepicker-zh-CN.js b/htdocs/langs/zh_CN/js/jquery.ui.datepicker.js
similarity index 100%
rename from htdocs/includes/jquery/i18n/jquery.ui.datepicker-zh-CN.js
rename to htdocs/langs/zh_CN/js/jquery.ui.datepicker.js
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 39f18d9a451..e316daa44a7 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1018,7 +1018,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
// Add datepicker default options
print ''."\n";
// Add datepicker i18n for current language
- print ''."\n";
+ print ''."\n";
if (! empty($head)) print $head."\n";
if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER."\n";