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

Conflicts:
	inc/plugin.php

1 files changed, 35 insertions, 21 deletions

diff --git a/inc/lang/fo/jquery.ui.datepicker.js b/inc/lang/fo/jquery.ui.datepicker.js
index cb0e3def7..1754f7be7 100644
--- a/inc/lang/fo/jquery.ui.datepicker.js
+++ b/inc/lang/fo/jquery.ui.datepicker.js
@@ -1,23 +1,37 @@
 /* Faroese initialisation for the jQuery UI date picker plugin */
 /* Written by Sverri Mohr Olsen, sverrimo@gmail.com */
-jQuery(function($){
-	$.datepicker.regional['fo'] = {
-		closeText: 'Lat aftur',
-		prevText: '<Fyrra',
-		nextText: 'Næsta>',
-		currentText: 'Í dag',
-		monthNames: ['Januar','Februar','Mars','Apríl','Mei','Juni',
-		'Juli','August','September','Oktober','November','Desember'],
-		monthNamesShort: ['Jan','Feb','Mar','Apr','Mei','Jun',
-		'Jul','Aug','Sep','Okt','Nov','Des'],
-		dayNames: ['Sunnudagur','Mánadagur','Týsdagur','Mikudagur','Hósdagur','Fríggjadagur','Leyardagur'],
-		dayNamesShort: ['Sun','Mán','Týs','Mik','Hós','Frí','Ley'],
-		dayNamesMin: ['Su','Má','Tý','Mi','Hó','Fr','Le'],
-		weekHeader: 'Vk',
-		dateFormat: 'dd-mm-yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['fo']);
-});
+(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['fo'] = {
+	closeText: 'Lat aftur',
+	prevText: '<Fyrra',
+	nextText: 'Næsta>',
+	currentText: 'Í dag',
+	monthNames: ['Januar','Februar','Mars','Apríl','Mei','Juni',
+	'Juli','August','September','Oktober','November','Desember'],
+	monthNamesShort: ['Jan','Feb','Mar','Apr','Mei','Jun',
+	'Jul','Aug','Sep','Okt','Nov','Des'],
+	dayNames: ['Sunnudagur','Mánadagur','Týsdagur','Mikudagur','Hósdagur','Fríggjadagur','Leyardagur'],
+	dayNamesShort: ['Sun','Mán','Týs','Mik','Hós','Frí','Ley'],
+	dayNamesMin: ['Su','Má','Tý','Mi','Hó','Fr','Le'],
+	weekHeader: 'Vk',
+	dateFormat: 'dd-mm-yy',
+	firstDay: 1,
+	isRTL: false,
+	showMonthAfterYear: false,
+	yearSuffix: ''};
+datepicker.setDefaults(datepicker.regional['fo']);
+
+return datepicker.regional['fo'];
+
+}));