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

Conflicts:
	inc/plugin.php

1 files changed, 35 insertions, 21 deletions

diff --git a/inc/lang/sq/jquery.ui.datepicker.js b/inc/lang/sq/jquery.ui.datepicker.js
index d6086a789..f88c22c56 100644
--- a/inc/lang/sq/jquery.ui.datepicker.js
+++ b/inc/lang/sq/jquery.ui.datepicker.js
@@ -1,23 +1,37 @@
 /* Albanian initialisation for the jQuery UI date picker plugin. */
 /* Written by Flakron Bytyqi (flakron@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['sq'] = {
-		closeText: 'mbylle',
-		prevText: '<mbrapa',
-		nextText: 'Përpara>',
-		currentText: 'sot',
-		monthNames: ['Janar','Shkurt','Mars','Prill','Maj','Qershor',
-		'Korrik','Gusht','Shtator','Tetor','Nëntor','Dhjetor'],
-		monthNamesShort: ['Jan','Shk','Mar','Pri','Maj','Qer',
-		'Kor','Gus','Sht','Tet','Nën','Dhj'],
-		dayNames: ['E Diel','E Hënë','E Martë','E Mërkurë','E Enjte','E Premte','E Shtune'],
-		dayNamesShort: ['Di','Hë','Ma','Më','En','Pr','Sh'],
-		dayNamesMin: ['Di','Hë','Ma','Më','En','Pr','Sh'],
-		weekHeader: 'Ja',
-		dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['sq']);
-});
+(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['sq'] = {
+	closeText: 'mbylle',
+	prevText: '<mbrapa',
+	nextText: 'Përpara>',
+	currentText: 'sot',
+	monthNames: ['Janar','Shkurt','Mars','Prill','Maj','Qershor',
+	'Korrik','Gusht','Shtator','Tetor','Nëntor','Dhjetor'],
+	monthNamesShort: ['Jan','Shk','Mar','Pri','Maj','Qer',
+	'Kor','Gus','Sht','Tet','Nën','Dhj'],
+	dayNames: ['E Diel','E Hënë','E Martë','E Mërkurë','E Enjte','E Premte','E Shtune'],
+	dayNamesShort: ['Di','Hë','Ma','Më','En','Pr','Sh'],
+	dayNamesMin: ['Di','Hë','Ma','Më','En','Pr','Sh'],
+	weekHeader: 'Ja',
+	dateFormat: 'dd.mm.yy',
+	firstDay: 1,
+	isRTL: false,
+	showMonthAfterYear: false,
+	yearSuffix: ''};
+datepicker.setDefaults(datepicker.regional['sq']);
+
+return datepicker.regional['sq'];
+
+}));