Merge remote-tracking branch master into revisions

2 files changed, 39 insertions, 25 deletions

diff --git a/inc/lang/ms/jquery.ui.datepicker.js b/inc/lang/ms/jquery.ui.datepicker.js
index e70de7299..d452df3ef 100644
--- a/inc/lang/ms/jquery.ui.datepicker.js
+++ b/inc/lang/ms/jquery.ui.datepicker.js
@@ -1,23 +1,37 @@
 /* Malaysian initialisation for the jQuery UI date picker plugin. */
 /* Written by Mohd Nawawi Mohamad Jamili (nawawi@ronggeng.net). */
-jQuery(function($){
-	$.datepicker.regional['ms'] = {
-		closeText: 'Tutup',
-		prevText: '<Sebelum',
-		nextText: 'Selepas>',
-		currentText: 'hari ini',
-		monthNames: ['Januari','Februari','Mac','April','Mei','Jun',
-		'Julai','Ogos','September','Oktober','November','Disember'],
-		monthNamesShort: ['Jan','Feb','Mac','Apr','Mei','Jun',
-		'Jul','Ogo','Sep','Okt','Nov','Dis'],
-		dayNames: ['Ahad','Isnin','Selasa','Rabu','Khamis','Jumaat','Sabtu'],
-		dayNamesShort: ['Aha','Isn','Sel','Rab','kha','Jum','Sab'],
-		dayNamesMin: ['Ah','Is','Se','Ra','Kh','Ju','Sa'],
-		weekHeader: 'Mg',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 0,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['ms']);
-});
+(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['ms'] = {
+	closeText: 'Tutup',
+	prevText: '<Sebelum',
+	nextText: 'Selepas>',
+	currentText: 'hari ini',
+	monthNames: ['Januari','Februari','Mac','April','Mei','Jun',
+	'Julai','Ogos','September','Oktober','November','Disember'],
+	monthNamesShort: ['Jan','Feb','Mac','Apr','Mei','Jun',
+	'Jul','Ogo','Sep','Okt','Nov','Dis'],
+	dayNames: ['Ahad','Isnin','Selasa','Rabu','Khamis','Jumaat','Sabtu'],
+	dayNamesShort: ['Aha','Isn','Sel','Rab','kha','Jum','Sab'],
+	dayNamesMin: ['Ah','Is','Se','Ra','Kh','Ju','Sa'],
+	weekHeader: 'Mg',
+	dateFormat: 'dd/mm/yy',
+	firstDay: 0,
+	isRTL: false,
+	showMonthAfterYear: false,
+	yearSuffix: ''};
+datepicker.setDefaults(datepicker.regional['ms']);
+
+return datepicker.regional['ms'];
+
+}));
diff --git a/inc/lang/ms/lang.php b/inc/lang/ms/lang.php
index 02c0e2c91..303116429 100644
--- a/inc/lang/ms/lang.php
+++ b/inc/lang/ms/lang.php
@@ -47,7 +47,7 @@ $lang['btn_revert']            = 'Pulihkan';
 $lang['btn_register']          = 'Daftaran';
 $lang['btn_apply']             = 'Simpan';
 $lang['btn_media']             = 'Manager media';
-$lang['loggedinas']            = 'Log masuk sebagai';
+$lang['loggedinas']            = 'Log masuk sebagai:';
 $lang['user']                  = 'Nama pengguna';
 $lang['pass']                  = 'Kata laluan';
 $lang['newpass']               = 'Kata laluan baru';
@@ -83,10 +83,10 @@ $lang['license']               = 'Selain daripada yang dinyata, isi wiki ini dis
 $lang['licenseok']             = 'Perhatian: Dengan menyunting halaman ini, anda setuju untuk isi-isi anda dilesen menggunakan lesen berikut:';
 $lang['searchmedia']           = 'Cari nama fail:';
 $lang['searchmedia_in']        = 'Cari di %s';
-$lang['txt_upload']            = 'Pilih fail untuk diunggah';
-$lang['txt_filename']          = 'Unggah fail dengan nama (tidak wajib)';
+$lang['txt_upload']            = 'Pilih fail untuk diunggah:';
+$lang['txt_filename']          = 'Unggah fail dengan nama (tidak wajib):';
 $lang['txt_overwrt']           = 'Timpa fail sekarang';
-$lang['lockedby']              = 'Halaman ini telah di';
+$lang['lockedby']              = 'Halaman ini telah di:';
 $lang['fileupload']            = 'Muat naik fail';
 $lang['uploadsucc']            = 'Pemuatan naik berjaya';
 $lang['uploadfail']            = 'Ralat muat naik';