Merge remote-tracking branch 'origin/master' into overridablelangstrings

Conflicts:
	inc/plugin.php

1 files changed, 35 insertions, 21 deletions

diff --git a/inc/lang/sl/jquery.ui.datepicker.js b/inc/lang/sl/jquery.ui.datepicker.js
index 048a47af7..88d7f2b19 100644
--- a/inc/lang/sl/jquery.ui.datepicker.js
+++ b/inc/lang/sl/jquery.ui.datepicker.js
@@ -1,24 +1,38 @@
 /* Slovenian initialisation for the jQuery UI date picker plugin. */
 /* Written by Jaka Jancar (jaka@kubje.org). */
 /* c = č, s = š z = ž C = Č S = Š Z = Ž */
-jQuery(function($){
-	$.datepicker.regional['sl'] = {
-		closeText: 'Zapri',
-		prevText: '<Prejšnji',
-		nextText: 'Naslednji>',
-		currentText: 'Trenutni',
-		monthNames: ['Januar','Februar','Marec','April','Maj','Junij',
-		'Julij','Avgust','September','Oktober','November','December'],
-		monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
-		'Jul','Avg','Sep','Okt','Nov','Dec'],
-		dayNames: ['Nedelja','Ponedeljek','Torek','Sreda','Četrtek','Petek','Sobota'],
-		dayNamesShort: ['Ned','Pon','Tor','Sre','Čet','Pet','Sob'],
-		dayNamesMin: ['Ne','Po','To','Sr','Če','Pe','So'],
-		weekHeader: 'Teden',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['sl']);
-});
+(function( factory ) {
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define([ "../datepicker" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery.datepicker );
+	}
+}(function( datepicker ) {
+
+datepicker.regional['sl'] = {
+	closeText: 'Zapri',
+	prevText: '<Prejšnji',
+	nextText: 'Naslednji>',
+	currentText: 'Trenutni',
+	monthNames: ['Januar','Februar','Marec','April','Maj','Junij',
+	'Julij','Avgust','September','Oktober','November','December'],
+	monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
+	'Jul','Avg','Sep','Okt','Nov','Dec'],
+	dayNames: ['Nedelja','Ponedeljek','Torek','Sreda','Četrtek','Petek','Sobota'],
+	dayNamesShort: ['Ned','Pon','Tor','Sre','Čet','Pet','Sob'],
+	dayNamesMin: ['Ne','Po','To','Sr','Če','Pe','So'],
+	weekHeader: 'Teden',
+	dateFormat: 'dd.mm.yy',
+	firstDay: 1,
+	isRTL: false,
+	showMonthAfterYear: false,
+	yearSuffix: ''};
+datepicker.setDefaults(datepicker.regional['sl']);
+
+return datepicker.regional['sl'];
+
+}));