mirror of
https://github.com/xdan/datetimepicker.git
synced 2024-11-18 06:24:22 +00:00
Merge pull request #579 from bunhann/master
Fix Khmer Language Spelling
This commit is contained in:
commit
b5443286af
@ -621,8 +621,7 @@ var DateFormatter;
|
||||
return '';
|
||||
}
|
||||
};
|
||||
})();
|
||||
/**
|
||||
})();/**
|
||||
* @preserve jQuery DateTimePicker plugin v2.5.4
|
||||
* @homepage http://xdsoft.net/jqplugins/datetimepicker/
|
||||
* @author Chupurnov Valeriy (<chupurnov@gmail.com>)
|
||||
@ -821,12 +820,12 @@ var DateFormatter;
|
||||
"Sön", "Mån", "Tis", "Ons", "Tor", "Fre", "Lör"
|
||||
]
|
||||
},
|
||||
km: { // Khmer
|
||||
km: { // Khmer (ភាសាខ្មែរ)
|
||||
months: [
|
||||
"មករា", "កុម្ភៈ", "មិនា", "មេសា", "ឧសភា", "មិថុនា", "កក្កដា", "សីហា", "កញ្ញា", "តុលា", "វិច្ឋិកា", "ធ្នូ"
|
||||
"មករា", "កុម្ភៈ", "មិនា", "មេសា", "ឧសភា", "មិថុនា", "កក្កដា", "សីហា", "កញ្ញា", "តុលា", "វិច្ឆិកា", "ធ្នូ"
|
||||
],
|
||||
dayOfWeekShort: ["អាទិ", "ចន្ទ", "អង្គារ", "ពុធ", "ព្រហ", "សុក្រ", "សៅរ៍"],
|
||||
dayOfWeek: ["អាទិត្យ", "ចន្ទ", "អង្គារ", "ពុធ", "ព្រហស្បតិ៍", "សុក្រ", "សៅរ៍"]
|
||||
dayOfWeekShort: ["អាទិ", "ច័ន្ទ", "អង្គារ", "ពុធ", "ព្រហ", "សុក្រ", "សៅរ៍"],
|
||||
dayOfWeek: ["អាទិត្យ", "ច័ន្ទ", "អង្គារ", "ពុធ", "ព្រហស្បតិ៍", "សុក្រ", "សៅរ៍"]
|
||||
},
|
||||
kr: { // Korean
|
||||
months: [
|
||||
@ -848,7 +847,7 @@ var DateFormatter;
|
||||
},
|
||||
da: { // Dansk
|
||||
months: [
|
||||
"January", "Februar", "Marts", "April", "Maj", "Juni", "July", "August", "September", "Oktober", "November", "December"
|
||||
"Januar", "Februar", "Marts", "April", "Maj", "Juni", "Juli", "August", "September", "Oktober", "November", "December"
|
||||
],
|
||||
dayOfWeekShort: [
|
||||
"Søn", "Man", "Tir", "Ons", "Tor", "Fre", "Lør"
|
||||
@ -1106,6 +1105,14 @@ var DateFormatter;
|
||||
],
|
||||
dayOfWeek: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"]
|
||||
},
|
||||
ug:{ // Uyghur(ئۇيغۇرچە)
|
||||
months: [
|
||||
"1-ئاي","2-ئاي","3-ئاي","4-ئاي","5-ئاي","6-ئاي","7-ئاي","8-ئاي","9-ئاي","10-ئاي","11-ئاي","12-ئاي"
|
||||
],
|
||||
dayOfWeek: [
|
||||
"يەكشەنبە", "دۈشەنبە","سەيشەنبە","چارشەنبە","پەيشەنبە","جۈمە","شەنبە"
|
||||
]
|
||||
},
|
||||
he: { //Hebrew (עברית)
|
||||
months: [
|
||||
'ינואר', 'פברואר', 'מרץ', 'אפריל', 'מאי', 'יוני', 'יולי', 'אוגוסט', 'ספטמבר', 'אוקטובר', 'נובמבר', 'דצמבר'
|
||||
@ -1562,8 +1569,7 @@ var DateFormatter;
|
||||
setPos,
|
||||
timer = 0,
|
||||
_xdsoft_datetime,
|
||||
forEachAncestorOf,
|
||||
throttle;
|
||||
forEachAncestorOf;
|
||||
|
||||
if (options.id) {
|
||||
datetimepicker.attr('id', options.id);
|
||||
@ -1892,7 +1898,6 @@ var DateFormatter;
|
||||
|
||||
if (!norecursion && options.defaultDate) {
|
||||
date = _this.strToDateTime(options.defaultDate);
|
||||
d.setDate(1);
|
||||
d.setFullYear(date.getFullYear());
|
||||
d.setMonth(date.getMonth());
|
||||
d.setDate(date.getDate());
|
||||
@ -1924,7 +1929,7 @@ var DateFormatter;
|
||||
else if (_this.isValidDate(dTime)) {
|
||||
_this.currentTime = dTime;
|
||||
}
|
||||
else if (!dTime && !requireValidDate && options.allowBlank) {
|
||||
else if (!dTime && !requireValidDate && options.allowBlank && !options.inline) {
|
||||
_this.currentTime = null;
|
||||
}
|
||||
else {
|
||||
@ -2268,7 +2273,7 @@ var DateFormatter;
|
||||
classes.push('xdsoft_disabled');
|
||||
} else if (options.disabledWeekDays.indexOf(day) !== -1) {
|
||||
classes.push('xdsoft_disabled');
|
||||
}else if (input.is('[readonly]')) {
|
||||
}else if (input.is('[disabled]')) {
|
||||
classes.push('xdsoft_disabled');
|
||||
}
|
||||
|
||||
@ -2351,7 +2356,7 @@ var DateFormatter;
|
||||
classes.push('xdsoft_disabled');
|
||||
} else if ((options.minDateTime !== false && options.minDateTime > optionDateTime) || ((options.disabledMinTime !== false && now.getTime() > _xdsoft_datetime.strtotime(options.disabledMinTime).getTime()) && (options.disabledMaxTime !== false && now.getTime() < _xdsoft_datetime.strtotime(options.disabledMaxTime).getTime()))) {
|
||||
classes.push('xdsoft_disabled');
|
||||
} else if (input.is('[readonly]')) {
|
||||
} else if (input.is('[disabled]')) {
|
||||
classes.push('xdsoft_disabled');
|
||||
}
|
||||
|
||||
@ -2636,6 +2641,10 @@ var DateFormatter;
|
||||
dateInputHasFixedAncestor = false;
|
||||
|
||||
forEachAncestorOf(dateInputElem, function (ancestorNode) {
|
||||
if (ancestorNode === null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (options.contentWindow.getComputedStyle(ancestorNode).getPropertyValue('position') === 'fixed') {
|
||||
dateInputHasFixedAncestor = true;
|
||||
return false;
|
||||
@ -2653,8 +2662,8 @@ var DateFormatter;
|
||||
verticalPosition -= windowScrollTop;
|
||||
}
|
||||
} else {
|
||||
if (verticalPosition + dateInputElem.offsetHeight > windowHeight + windowScrollTop) {
|
||||
verticalPosition = dateInputOffset.top - dateInputElem.offsetHeight + 1;
|
||||
if (verticalPosition + datetimepicker[0].offsetHeight > windowHeight + windowScrollTop) {
|
||||
verticalPosition = dateInputOffset.top - datetimepicker[0].offsetHeight + 1;
|
||||
}
|
||||
}
|
||||
|
||||
@ -3026,7 +3035,6 @@ var DateFormatter;
|
||||
this.style = style;
|
||||
}
|
||||
}));
|
||||
|
||||
/*!
|
||||
* jQuery Mousewheel 3.1.13
|
||||
*
|
||||
|
5
build/jquery.datetimepicker.full.min.js
vendored
5
build/jquery.datetimepicker.full.min.js
vendored
File diff suppressed because one or more lines are too long
2
build/jquery.datetimepicker.min.css
vendored
2
build/jquery.datetimepicker.min.css
vendored
File diff suppressed because one or more lines are too long
4
build/jquery.datetimepicker.min.js
vendored
4
build/jquery.datetimepicker.min.js
vendored
File diff suppressed because one or more lines are too long
@ -197,12 +197,12 @@
|
||||
"Sön", "Mån", "Tis", "Ons", "Tor", "Fre", "Lör"
|
||||
]
|
||||
},
|
||||
km: { // Khmer
|
||||
km: { // Khmer (ភាសាខ្មែរ)
|
||||
months: [
|
||||
"មករា", "កុម្ភៈ", "មិនា", "មេសា", "ឧសភា", "មិថុនា", "កក្កដា", "សីហា", "កញ្ញា", "តុលា", "វិច្ឋិកា", "ធ្នូ"
|
||||
"មករា", "កុម្ភៈ", "មិនា", "មេសា", "ឧសភា", "មិថុនា", "កក្កដា", "សីហា", "កញ្ញា", "តុលា", "វិច្ឆិកា", "ធ្នូ"
|
||||
],
|
||||
dayOfWeekShort: ["អាទិ", "ចន្ទ", "អង្គារ", "ពុធ", "ព្រហ", "សុក្រ", "សៅរ៍"],
|
||||
dayOfWeek: ["អាទិត្យ", "ចន្ទ", "អង្គារ", "ពុធ", "ព្រហស្បតិ៍", "សុក្រ", "សៅរ៍"]
|
||||
dayOfWeekShort: ["អាទិ", "ច័ន្ទ", "អង្គារ", "ពុធ", "ព្រហ", "សុក្រ", "សៅរ៍"],
|
||||
dayOfWeek: ["អាទិត្យ", "ច័ន្ទ", "អង្គារ", "ពុធ", "ព្រហស្បតិ៍", "សុក្រ", "សៅរ៍"]
|
||||
},
|
||||
kr: { // Korean
|
||||
months: [
|
||||
|
18
yarn.lock
18
yarn.lock
@ -44,12 +44,6 @@ code-point-at@^1.0.0:
|
||||
version "1.1.0"
|
||||
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
|
||||
|
||||
commander@^2.9.0:
|
||||
version "2.9.0"
|
||||
resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
|
||||
dependencies:
|
||||
graceful-readlink ">= 1.0.0"
|
||||
|
||||
concat-cli@^4.0.0:
|
||||
version "4.0.0"
|
||||
resolved "https://registry.yarnpkg.com/concat-cli/-/concat-cli-4.0.0.tgz#a73a0fb0d18b25804ebe703bcc35922324dbf74d"
|
||||
@ -58,13 +52,7 @@ concat-cli@^4.0.0:
|
||||
concat "^1.0.0"
|
||||
yargs "^3.30.0"
|
||||
|
||||
concat@^1.0.0:
|
||||
version "1.0.3"
|
||||
resolved "https://registry.yarnpkg.com/concat/-/concat-1.0.3.tgz#40f3353089d65467695cb1886b45edd637d8cca8"
|
||||
dependencies:
|
||||
commander "^2.9.0"
|
||||
|
||||
concat@azer/concat:
|
||||
concat@^1.0.0, concat@azer/concat:
|
||||
version "1.0.0"
|
||||
resolved "https://codeload.github.com/azer/concat/tar.gz/c64c5cbc2e60b0bc1a8f4bceafed661f66f19dcf"
|
||||
dependencies:
|
||||
@ -79,10 +67,6 @@ escape-string-regexp@^1.0.2:
|
||||
version "1.0.5"
|
||||
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
|
||||
|
||||
"graceful-readlink@>= 1.0.0":
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
|
||||
|
||||
has-ansi@^2.0.0:
|
||||
version "2.0.0"
|
||||
resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
|
||||
|
Loading…
Reference in New Issue
Block a user