From 459ffe40ded11e23370938025505cf6da83e9533 Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Thu, 21 Nov 2013 19:43:00 -0800
Subject: [PATCH] Language fix for datetimepicker()

---
 e107_admin/header.php          |  8 +++++++-
 e107_handlers/form_handler.php |  2 +-
 e107_web/js/core/all.jquery.js | 11 ++++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/e107_admin/header.php b/e107_admin/header.php
index 65d867801..4ca1fc480 100644
--- a/e107_admin/header.php
+++ b/e107_admin/header.php
@@ -64,8 +64,14 @@ function loadJSAddons()
 	e107::css('core', 	'bootstrap-datetimepicker/css/datetimepicker.css', 'jquery');
 	e107::js('core', 	'bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js', 'jquery', 2);
 	
+	$bs_date_link = "bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.".e_LAN.".js";
 	
-	
+	if(e_LAN != 'en' && file_exists(e_WEB_JS.$bs_date_link)) // load datetime picker language file. 
+	{
+		// e107::getMessage()->addDebug("Loading ".$bs_date_link);
+		e107::js('core', $bs_date_link, 'jquery', 2);
+	}
+		
 	e107::js('core', 	'jquery.elastic.js', 'jquery', 2);
 	e107::js('core', 	'jquery.at.caret.min.js', 'jquery', 2);
 	
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 9809888a4..13bb910a0 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -662,7 +662,7 @@ class e_form
 		}
 		else
 		{			
-			$text .= "<input class='{$class} input-xlarge' type='text' size='{$size}' name='{$name}' id='{$id}' value='{$value}' data-date-format='{$dformat}' data-date-ampm='{$ampm}' data-date-firstday='{$firstDay}' {$required} />";		
+			$text .= "<input class='{$class} input-xlarge' type='text' size='{$size}' name='{$name}' id='{$id}' value='{$value}' data-date-format='{$dformat}' data-date-ampm='{$ampm}'  data-date-language='".e_LAN."' data-date-firstday='{$firstDay}' {$required} />";		
 		}
 
 	//	$text .= "ValueFormat: ".$dateFormat."  Value: ".$value;
diff --git a/e107_web/js/core/all.jquery.js b/e107_web/js/core/all.jquery.js
index 6ab0a87a0..e50889dc1 100644
--- a/e107_web/js/core/all.jquery.js
+++ b/e107_web/js/core/all.jquery.js
@@ -155,23 +155,24 @@ $(document).ready(function()
 		
 			// https://github.com/smalot/bootstrap-datetimepicker
 				
-			$("input.e-date").each(function() {
-				
+			$("input.e-date").each(function() {			
         		$(this).datetimepicker({
         			minView: 'month',
         			maxView: 'decade',
         			autoclose: true,
         			format: $(this).attr("data-date-format"),
-        			weekStart: $(this).attr("data-date-firstday")
+        			weekStart: $(this).attr("data-date-firstday"),
+        			language: $(this).attr("data-date-language")
         		 });    		 
     		});
     	
-    		$("input.e-datetime").each(function() {
+    		$("input.e-datetime").each(function() {  			
         		$(this).datetimepicker({
         			autoclose: true,
         			format: $(this).attr("data-date-format"),
         			weekStart: $(this).attr("data-date-firstday"),
-        			showMeridian: $(this).attr("data-date-ampm")
+        			showMeridian: $(this).attr("data-date-ampm"),
+        			language: $(this).attr("data-date-language")
         		 });    		 
     		});