Merge remote branch 'origin/master'

This commit is contained in:
Pootle server
2011-01-13 22:40:10 +01:00
2 changed files with 2 additions and 2 deletions

View File

@@ -986,7 +986,7 @@ $(function() {
stepMinutes: 1, stepMinutes: 1,
stepHours: 1, stepHours: 1,
<?php echo ($field['pma_type'] == 'date' ? "showTime: false,":"showTime: true,"); ?> <?php echo ($field['pma_type'] == 'date' ? "showTime: false,":"showTime: true,"); ?>
dateFormat: 'yy-mm-dd', dateFormat: 'yy-mm-dd', // yy means year with four digits
altTimeField: '', altTimeField: '',
constrainInput: false constrainInput: false
}); });

View File

@@ -219,7 +219,7 @@ $(function() {
stepMinutes: 1, stepMinutes: 1,
stepHours: 1, stepHours: 1,
<?php echo ($type == 'date' ? "showTime: false,":"showTime: true,"); ?> <?php echo ($type == 'date' ? "showTime: false,":"showTime: true,"); ?>
dateFormat: 'yy-mm-dd', dateFormat: 'yy-mm-dd', // yy means year with four digits
altTimeField: '', altTimeField: '',
constrainInput: false constrainInput: false
}); });