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

Conflicts:
	inc/plugin.php

1 files changed, 35 insertions, 21 deletions

diff --git a/inc/lang/id/jquery.ui.datepicker.js b/inc/lang/id/jquery.ui.datepicker.js
index 6327fa60c..0db693faf 100644
--- a/inc/lang/id/jquery.ui.datepicker.js
+++ b/inc/lang/id/jquery.ui.datepicker.js
@@ -1,23 +1,37 @@
 /* Indonesian initialisation for the jQuery UI date picker plugin. */
 /* Written by Deden Fathurahman (dedenf@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['id'] = {
-		closeText: 'Tutup',
-		prevText: '<mundur',
-		nextText: 'maju>',
-		currentText: 'hari ini',
-		monthNames: ['Januari','Februari','Maret','April','Mei','Juni',
-		'Juli','Agustus','September','Oktober','Nopember','Desember'],
-		monthNamesShort: ['Jan','Feb','Mar','Apr','Mei','Jun',
-		'Jul','Agus','Sep','Okt','Nop','Des'],
-		dayNames: ['Minggu','Senin','Selasa','Rabu','Kamis','Jumat','Sabtu'],
-		dayNamesShort: ['Min','Sen','Sel','Rab','kam','Jum','Sab'],
-		dayNamesMin: ['Mg','Sn','Sl','Rb','Km','jm','Sb'],
-		weekHeader: 'Mg',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 0,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['id']);
-});
+(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['id'] = {
+	closeText: 'Tutup',
+	prevText: '<mundur',
+	nextText: 'maju>',
+	currentText: 'hari ini',
+	monthNames: ['Januari','Februari','Maret','April','Mei','Juni',
+	'Juli','Agustus','September','Oktober','Nopember','Desember'],
+	monthNamesShort: ['Jan','Feb','Mar','Apr','Mei','Jun',
+	'Jul','Agus','Sep','Okt','Nop','Des'],
+	dayNames: ['Minggu','Senin','Selasa','Rabu','Kamis','Jumat','Sabtu'],
+	dayNamesShort: ['Min','Sen','Sel','Rab','kam','Jum','Sab'],
+	dayNamesMin: ['Mg','Sn','Sl','Rb','Km','jm','Sb'],
+	weekHeader: 'Mg',
+	dateFormat: 'dd/mm/yy',
+	firstDay: 0,
+	isRTL: false,
+	showMonthAfterYear: false,
+	yearSuffix: ''};
+datepicker.setDefaults(datepicker.regional['id']);
+
+return datepicker.regional['id'];
+
+}));