From 41b597e179a694973c709613cdf41e2b379c8df9 Mon Sep 17 00:00:00 2001
From: scambra <sergio@entrecables.com>
Date: Fri, 21 Sep 2012 08:33:26 +0200
Subject: [PATCH] Translate formatDate using jquery datepicker
---
core/js/js.js | 4 +---
core/l10n/l10n-de.php | 1 +
core/l10n/l10n-en.php | 1 +
core/l10n/l10n-es.php | 1 +
core/templates/layout.user.php | 1 +
lib/l10n.php | 2 ++
6 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/core/js/js.js b/core/js/js.js
index ba8020c89e..c5e32f3c27 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/l10n/l10n-de.php b/core/l10n/l10n-de.php
index d80c3beb2b..77d35af493 100644
--- a/core/l10n/l10n-de.php
+++ b/core/l10n/l10n-de.php
@@ -1,5 +1,6 @@
<?php
$LOCALIZATIONS = array(
+ 'jsdate' => 'dd.mm.yy',
'date' => '%d.%m.%Y',
'datetime' => '%d.%m.%Y %H:%M:%S',
'time' => '%H:%M:%S',
diff --git a/core/l10n/l10n-en.php b/core/l10n/l10n-en.php
index 6268214b50..9ee748bee2 100644
--- a/core/l10n/l10n-en.php
+++ b/core/l10n/l10n-en.php
@@ -1,5 +1,6 @@
<?php
$LOCALIZATIONS = array(
+ 'jsdate' => 'MM d, yy',
'date' => '%B %e, %Y',
'datetime' => '%B %e, %Y %H:%M',
'time' => '%H:%M:%S',
diff --git a/core/l10n/l10n-es.php b/core/l10n/l10n-es.php
index 8798b24d62..13db2ec5d4 100644
--- a/core/l10n/l10n-es.php
+++ b/core/l10n/l10n-es.php
@@ -1,5 +1,6 @@
<?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',
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 92d47cc51f..1f16fdf7c6 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -13,6 +13,7 @@
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')) ?>;
diff --git a/lib/l10n.php b/lib/l10n.php
index 72ac9e353d..18706e4b4a 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -58,6 +58,7 @@ 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',
@@ -223,6 +224,7 @@ class OC_L10N{
return strftime($this->localizations[$type], $data);
break;
case 'firstday':
+ case 'jsdate':
return $this->localizations[$type];
default:
return false;
--
GitLab