From e49c19ab00451dc0dbfdf4775bcc4ad837019f9e Mon Sep 17 00:00:00 2001
From: Markus Jung <markus@markusnb>
Date: Sat, 18 Jun 2016 22:14:15 +0200
Subject: [PATCH] Avoid warnings due to non-existant 'en' datepicker locale
---
app/classes/Framadate/Utils.php | 8 ++++++--
tpl/page.tpl | 2 ++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/app/classes/Framadate/Utils.php b/app/classes/Framadate/Utils.php
index dba51d6e..1fae70e4 100644
--- a/app/classes/Framadate/Utils.php
+++ b/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 -->';
diff --git a/tpl/page.tpl b/tpl/page.tpl
index 72c46615..db31fb8d 100644
--- a/tpl/page.tpl
+++ b/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}
--
GitLab