diff options
| -rw-r--r-- | core/js/js.js | 4 | ||||
| -rw-r--r-- | core/js/share.js | 8 | ||||
| -rw-r--r-- | core/l10n/l10n-de.php | 4 | ||||
| -rw-r--r-- | core/l10n/l10n-en.php | 4 | ||||
| -rw-r--r-- | core/l10n/l10n-es.php | 4 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 4 | ||||
| -rw-r--r-- | lib/l10n.php | 7 |
7 files changed, 28 insertions, 7 deletions
diff --git a/core/js/js.js b/core/js/js.js index ba8020c89ed..c5e32f3c278 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -667,9 +667,7 @@ function formatDate(date){ if(typeof date=='number'){ date=new Date(date); } - var monthNames = [ t('files','January'), t('files','February'), t('files','March'), t('files','April'), t('files','May'), t('files','June'), - t('files','July'), t('files','August'), t('files','September'), t('files','October'), t('files','November'), t('files','December') ]; - return monthNames[date.getMonth()]+' '+date.getDate()+', '+date.getFullYear()+', '+((date.getHours()<10)?'0':'')+date.getHours()+':'+((date.getMinutes()<10)?'0':'')+date.getMinutes(); + return $.datepicker.formatDate(datepickerFormatDate, date)+' '+date.getHours()+':'+((date.getMinutes()<10)?'0':'')+date.getMinutes(); } /** diff --git a/core/js/share.js b/core/js/share.js index de50e53a441..1bc8f555680 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -343,6 +343,14 @@ OC.Share={ } $(document).ready(function() { + $.datepicker.setDefaults({ + monthNames: monthNames, + monthNamesShort: $.map(monthNames, function(v) { return v.slice(0,3)+'.'; }), + dayNames: dayNames, + dayNamesMin: $.map(dayNames, function(v) { return v.slice(0,2); }), + dayNamesShort: $.map(dayNames, function(v) { return v.slice(0,3)+'.'; }), + firstDay: firstDay + }); $('a.share').live('click', function(event) { event.stopPropagation(); diff --git a/core/l10n/l10n-de.php b/core/l10n/l10n-de.php index 976f8ce3c51..77d35af4936 100644 --- a/core/l10n/l10n-de.php +++ b/core/l10n/l10n-de.php @@ -1,5 +1,7 @@ <?php $LOCALIZATIONS = array( + 'jsdate' => 'dd.mm.yy', 'date' => '%d.%m.%Y', 'datetime' => '%d.%m.%Y %H:%M:%S', - 'time' => '%H:%M:%S' ); + 'time' => '%H:%M:%S', + 'firstday' => 0 ); diff --git a/core/l10n/l10n-en.php b/core/l10n/l10n-en.php index 3a050d477ce..9ee748bee23 100644 --- a/core/l10n/l10n-en.php +++ b/core/l10n/l10n-en.php @@ -1,5 +1,7 @@ <?php $LOCALIZATIONS = array( + 'jsdate' => 'MM d, yy', 'date' => '%B %e, %Y', 'datetime' => '%B %e, %Y %H:%M', - 'time' => '%H:%M:%S' ); + 'time' => '%H:%M:%S', + 'firstday' => 0 ); diff --git a/core/l10n/l10n-es.php b/core/l10n/l10n-es.php index b81464b491a..13db2ec5d4c 100644 --- a/core/l10n/l10n-es.php +++ b/core/l10n/l10n-es.php @@ -1,5 +1,7 @@ <?php $LOCALIZATIONS = array( + 'jsdate' => "d 'de' MM 'de' yy", 'date' => '%e de %B de %Y', 'datetime' => '%e de %B de %Y %H:%M', - 'time' => '%H:%M:%S' ); + 'time' => '%H:%M:%S', + 'firstday' => 1 ); diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index b6d8a7604a2..1f16fdf7c6c 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -13,6 +13,10 @@ var oc_current_user = '<?php echo OC_User::getUser() ?>'; var oc_requesttoken = '<?php echo $_['requesttoken']; ?>'; var oc_requestlifespan = '<?php echo $_['requestlifespan']; ?>'; + var datepickerFormatDate = <?php echo json_encode($l->l('jsdate')) ?>; + var dayNames = <?php echo json_encode(array((string)$l->t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))) ?>; + var monthNames = <?php echo json_encode(array((string)$l->t('January'), (string)$l->t('February'), (string)$l->t('March'), (string)$l->t('April'), (string)$l->t('May'), (string)$l->t('June'), (string)$l->t('July'), (string)$l->t('August'), (string)$l->t('September'), (string)$l->t('October'), (string)$l->t('November'), (string)$l->t('December'))) ?>; + var firstDay = <?php echo json_encode($l->l('firstday')) ?>; </script> <?php foreach($_['jsfiles'] as $jsfile): ?> <script type="text/javascript" src="<?php echo $jsfile; ?>"></script> diff --git a/lib/l10n.php b/lib/l10n.php index ac57115da4e..6667747b885 100644 --- a/lib/l10n.php +++ b/lib/l10n.php @@ -58,9 +58,11 @@ class OC_L10N{ * Localization */ private $localizations = array( + 'jsdate' => 'dd.mm.yy', 'date' => '%d.%m.%Y', 'datetime' => '%d.%m.%Y %H:%M:%S', - 'time' => '%H:%M:%S'); + 'time' => '%H:%M:%S', + 'firstday' => 0); /** * get an L10N instance @@ -223,6 +225,9 @@ class OC_L10N{ setlocale(LC_TIME, $locales); return strftime($this->localizations[$type], $data); break; + case 'firstday': + case 'jsdate': + return $this->localizations[$type]; default: return false; } |