From 138bfd16df9cb583107097f32be288b8705cd035 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 17 Jan 2014 15:36:34 +0100
Subject: localize jQuery UI date picker FS#2912

---
 lib/exe/js.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib/exe/js.php')

diff --git a/lib/exe/js.php b/lib/exe/js.php
index 040b8874d..04413b409 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -44,6 +44,7 @@ function js_out(){
                 DOKU_INC.'lib/scripts/jquery/jquery.cookie.js',
                 DOKU_INC."lib/scripts/jquery/jquery-ui$min.js",
                 DOKU_INC."lib/scripts/jquery/jquery-migrate$min.js",
+                DOKU_INC.'inc/lang/'.$conf['lang'].'/jquery.ui.datepicker.js',
                 DOKU_INC."lib/scripts/fileuploader.js",
                 DOKU_INC."lib/scripts/fileuploaderextended.js",
                 DOKU_INC.'lib/scripts/helpers.js',
@@ -112,6 +113,7 @@ function js_out(){
 
     // load files
     foreach($files as $file){
+        if(!file_exists($file)) continue;
         $ismin = (substr($file,-7) == '.min.js');
         $debugjs = ($conf['allowdebug'] && strpos($file, DOKU_INC.'lib/scripts/') !== 0);
 
-- 
cgit v1.2.3


From 56b0b744e40b19048e14cee4ff6caf69858d9fd6 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Tue, 18 Feb 2014 13:50:12 +0100
Subject: PHPDocs js.php

---
 lib/exe/js.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'lib/exe/js.php')

diff --git a/lib/exe/js.php b/lib/exe/js.php
index 04413b409..8f16f4a96 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -220,6 +220,12 @@ function js_pluginstrings() {
     return $pluginstrings;
 }
 
+/**
+ * Return an two-dimensional array with strings from the language file of current active template.
+ *
+ * - $lang['js'] must be an array.
+ * - Nothing is returned for template without an entry for $lang['js']
+ */
 function js_templatestrings() {
     global $conf;
     $templatestrings = array();
-- 
cgit v1.2.3