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

Conflicts:
	inc/plugin.php

1 files changed, 35 insertions, 21 deletions

diff --git a/inc/lang/gl/jquery.ui.datepicker.js b/inc/lang/gl/jquery.ui.datepicker.js
index 59b989a6d..ed5b2d2fc 100644
--- a/inc/lang/gl/jquery.ui.datepicker.js
+++ b/inc/lang/gl/jquery.ui.datepicker.js
@@ -1,23 +1,37 @@
 /* Galician localization for 'UI date picker' jQuery extension. */
 /* Translated by Jorge Barreiro <yortx.barry@gmail.com>. */
-jQuery(function($){
-	$.datepicker.regional['gl'] = {
-		closeText: 'Pechar',
-		prevText: '&#x3C;Ant',
-		nextText: 'Seg&#x3E;',
-		currentText: 'Hoxe',
-		monthNames: ['Xaneiro','Febreiro','Marzo','Abril','Maio','Xuño',
-		'Xullo','Agosto','Setembro','Outubro','Novembro','Decembro'],
-		monthNamesShort: ['Xan','Feb','Mar','Abr','Mai','Xuñ',
-		'Xul','Ago','Set','Out','Nov','Dec'],
-		dayNames: ['Domingo','Luns','Martes','Mércores','Xoves','Venres','Sábado'],
-		dayNamesShort: ['Dom','Lun','Mar','Mér','Xov','Ven','Sáb'],
-		dayNamesMin: ['Do','Lu','Ma','Mé','Xo','Ve','Sá'],
-		weekHeader: 'Sm',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['gl']);
-});
+(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['gl'] = {
+	closeText: 'Pechar',
+	prevText: '&#x3C;Ant',
+	nextText: 'Seg&#x3E;',
+	currentText: 'Hoxe',
+	monthNames: ['Xaneiro','Febreiro','Marzo','Abril','Maio','Xuño',
+	'Xullo','Agosto','Setembro','Outubro','Novembro','Decembro'],
+	monthNamesShort: ['Xan','Feb','Mar','Abr','Mai','Xuñ',
+	'Xul','Ago','Set','Out','Nov','Dec'],
+	dayNames: ['Domingo','Luns','Martes','Mércores','Xoves','Venres','Sábado'],
+	dayNamesShort: ['Dom','Lun','Mar','Mér','Xov','Ven','Sáb'],
+	dayNamesMin: ['Do','Lu','Ma','Mé','Xo','Ve','Sá'],
+	weekHeader: 'Sm',
+	dateFormat: 'dd/mm/yy',
+	firstDay: 1,
+	isRTL: false,
+	showMonthAfterYear: false,
+	yearSuffix: ''};
+datepicker.setDefaults(datepicker.regional['gl']);
+
+return datepicker.regional['gl'];
+
+}));