wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #38 from scambra/datepicker-l10n

Browse source 
Translate Datepicker
This commit is contained in:
Lukas Reschke 2012-10-22 23:53:24 -07:00
commit b66dd3ebef
7 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/js/js.js
View file

@ -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();
}
/**

8
core/js/share.js
View file

@ -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();

4
core/l10n/l10n-de.php
View file

@ -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 );

4
core/l10n/l10n-en.php
View file

@ -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 );

4
core/l10n/l10n-es.php
View file

@ -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 );

4
core/templates/layout.user.php
View file

@ -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>

7
lib/l10n.php
View file

@ -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;
}