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

Conflicts:
	inc/plugin.php

1 files changed, 35 insertions, 21 deletions

diff --git a/inc/lang/ko/jquery.ui.datepicker.js b/inc/lang/ko/jquery.ui.datepicker.js
index af36f3d6b..991b5727e 100644
--- a/inc/lang/ko/jquery.ui.datepicker.js
+++ b/inc/lang/ko/jquery.ui.datepicker.js
@@ -1,23 +1,37 @@
 /* Korean initialisation for the jQuery calendar extension. */
 /* Written by DaeKwon Kang (ncrash.dk@gmail.com), Edited by Genie. */
-jQuery(function($){
-	$.datepicker.regional['ko'] = {
-		closeText: '닫기',
-		prevText: '이전달',
-		nextText: '다음달',
-		currentText: '오늘',
-		monthNames: ['1월','2월','3월','4월','5월','6월',
-		'7월','8월','9월','10월','11월','12월'],
-		monthNamesShort: ['1월','2월','3월','4월','5월','6월',
-		'7월','8월','9월','10월','11월','12월'],
-		dayNames: ['일요일','월요일','화요일','수요일','목요일','금요일','토요일'],
-		dayNamesShort: ['일','월','화','수','목','금','토'],
-		dayNamesMin: ['일','월','화','수','목','금','토'],
-		weekHeader: 'Wk',
-		dateFormat: 'yy-mm-dd',
-		firstDay: 0,
-		isRTL: false,
-		showMonthAfterYear: true,
-		yearSuffix: '년'};
-	$.datepicker.setDefaults($.datepicker.regional['ko']);
-});
+(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['ko'] = {
+	closeText: '닫기',
+	prevText: '이전달',
+	nextText: '다음달',
+	currentText: '오늘',
+	monthNames: ['1월','2월','3월','4월','5월','6월',
+	'7월','8월','9월','10월','11월','12월'],
+	monthNamesShort: ['1월','2월','3월','4월','5월','6월',
+	'7월','8월','9월','10월','11월','12월'],
+	dayNames: ['일요일','월요일','화요일','수요일','목요일','금요일','토요일'],
+	dayNamesShort: ['일','월','화','수','목','금','토'],
+	dayNamesMin: ['일','월','화','수','목','금','토'],
+	weekHeader: 'Wk',
+	dateFormat: 'yy-mm-dd',
+	firstDay: 0,
+	isRTL: false,
+	showMonthAfterYear: true,
+	yearSuffix: '년'};
+datepicker.setDefaults(datepicker.regional['ko']);
+
+return datepicker.regional['ko'];
+
+}));