Skip to content

Separated date and time from the signature #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Zdzisiu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Separated date and time from the signature #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions conf/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

$conf['dayheaderfmt'] = '%Y-%m-%d';
$conf['datefmt'] = '%Y-%m-%d';
$conf['timefmt'] = '%H:%M';
$conf['listmedia'] = 0;
2 changes: 2 additions & 0 deletions conf/metadata.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

$meta['dayheaderfmt'] = array('string');
$meta['datefmt'] = array('string');
$meta['timefmt'] = array('string');
$meta['listmedia'] = array('onoff');
2 changes: 2 additions & 0 deletions lang/en/settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

$lang['dayheaderfmt'] = 'Date format for the day headers. (strftime format)';
$lang['datefmt'] = 'Date format';
$lang['timefmt'] = 'Time format';
$lang['listmedia'] = 'Include changes of media files.';
14 changes: 11 additions & 3 deletions syntax.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,14 +458,22 @@ protected function renderSimpleList($changes, $renderer, $flags = [])
}
if ($flags['signature']) {
$user = $this->getUserName($change);
$date = strftime($conf['dformat'], $change['date']);
$renderer->cdata(' ');
$renderer->entity('---');
$renderer->cdata(' ');
$renderer->emphasis_open();
$renderer->cdata($user . ' ' . $date);
$renderer->cdata($user . ' ');
$renderer->emphasis_close();
}
if ($flags['date']) {
//$date = strftime($conf['dformat'], $change['date']);
$date = strftime($this->getConf('datefmt'), $change['date']);
$renderer->cdata(' ' . $date);
}
if ($flags['time']) {
$time = strftime($this->getConf('timefmt'), $change['date']);
$renderer->cdata(' ' . $time);
}
$renderer->listcontent_close();
$renderer->listitem_close();
}
Expand All @@ -480,7 +488,7 @@ protected function renderSimpleList($changes, $renderer, $flags = [])
*/
protected function parseSimpleListFlags($flags)
{
$outFlags = ['summary' => true, 'signature' => false, 'dayheaders' => false];
$outFlags = ['summary' => true, 'signature' => false, 'dayheaders' => false, 'date' => false, 'time' => false];
if (!empty($flags)) {
foreach ($flags as $flag) {
if (array_key_exists($flag, $outFlags)) {
Expand Down