Merge branch 'fix-datepicker-en' into 'release'

Avoid warnings due to non-existant 'en' datepicker locale

There is no 'en' Translation of datepicker. Hence, do no try to load it.

See merge request !127

app/classes/Framadate/Utils.php

@@ -59,8 +59,12 @@ class Utils {
         <link rel="stylesheet" href="' . self::get_server_name() . 'css/print.css" media="print" />
         <script type="text/javascript" src="' . self::get_server_name() . 'js/jquery-1.11.1.min.js"></script>
         <script type="text/javascript" src="' . self::get_server_name() . 'js/bootstrap.min.js"></script>
-        <script type="text/javascript" src="' . self::get_server_name() . 'js/bootstrap-datepicker.js"></script>
-        <script type="text/javascript" src="' . self::get_server_name() . 'js/locales/bootstrap-datepicker.' . $locale . '.js"></script>
+        <script type="text/javascript" src="' . self::get_server_name() . 'js/bootstrap-datepicker.js"></script>';
+        if ('en' != $locale) {
+        	   echo '
+        <script type="text/javascript" src="' . self::get_server_name() . 'js/locales/bootstrap-datepicker.' . $locale . '.js"></script>';
+        }
+        echo '
         <script type="text/javascript" src="' . self::get_server_name() . 'js/core.js"></script>';
         if (is_file($_SERVER['DOCUMENT_ROOT'] . "/nav/nav.js")) {
             echo '<script src="/nav/nav.js" id="nav_js" type="text/javascript" charset="utf-8"></script><!-- /Framanav -->';

tpl/page.tpl

@@ -17,7 +17,9 @@
     <script type="text/javascript" src="{'js/jquery-1.11.1.min.js'|resource}"></script>
     <script type="text/javascript" src="{'js/bootstrap.min.js'|resource}"></script>
     <script type="text/javascript" src="{'js/bootstrap-datepicker.js'|resource}"></script>
+    {if "en" != $locale}
     <script type="text/javascript" src="{"js/locales/bootstrap-datepicker.$locale.js"|resource}"></script>
+    {/if}
     <script type="text/javascript" src="{'js/core.js'|resource}"></script>
 
     {block name="header"}{/block}