mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-13 12:35:06 +01:00
Code Issues Releases Wiki Activity

#10067

Browse Source 
Never noticed the date output in the dropdown was dynamic... so made sense to actually use the relative days feature to _actually show_ how it works by placing "Today" within the date, and append it with a date of how it'd be formatted it it wasn't yesterday/today/tomorrow by offsetting the time() by 1 year negatively.

Bonus is that the RELATIVE_DAYS variable is no longer needed, though have switched that for a VARIANT_DATE_SEPARATOR variable incase people want to localise " / " (could have been hardcoded, but you never know! :P)

The YESTERDAY/TODAY/TOMORROW variables have also had their trailing commas nuked (the comma has gone into the date format code) as people whom want:

"d M Y @ H:i:s" => "01 Jan 2007 @ 13:37:00"

... enabling relative days with: "|d M Y| @ H:i:s"

... would have got: "Today, @ 13:37:00"

... but now they shall get: "Today @ 13:37:00"

Lastly, added a relative date option for those prefering middle-endian dates with am/pm time.


git-svn-id: file:///svn/phpbb/trunk@7391 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Jonathan Stanley 2007-04-24 00:11:20 +00:00
parent 56e83ff4ea
commit 5ebb018cb8
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/acp/acp_board.php
View File

@ -767,7 +767,7 @@ class acp_board
foreach ($user->lang['dateformats'] as $format => $null)
{
$dateformat_options .= '<option value="' . $format . '"' . (($format == $value) ? ' selected="selected"' : '') . '>';
$dateformat_options .= $user->format_date(time(), $format, true) . ((strpos($format, '|') !== false) ? ' [' . $user->lang['RELATIVE_DAYS'] . ']' : '');
$dateformat_options .= $user->format_date(time(), $format, false) . ((strpos($format, '|') !== false) ? $user->lang['VARIANT_DATE_SEPARATOR'] . $user->format_date(time() - 31536000, $format, true) : '');
$dateformat_options .= '</option>';
}

2
phpBB/includes/acp/acp_users.php
View File

@ -1235,7 +1235,7 @@ class acp_users
foreach ($user->lang['dateformats'] as $format => $null)
{
$dateformat_options .= '<option value="' . $format . '"' . (($format == $data['dateformat']) ? ' selected="selected"' : '') . '>';
$dateformat_options .= $user->format_date(time(), $format, true) . ((strpos($format, '|') !== false) ? ' [' . $user->lang['RELATIVE_DAYS'] . ']' : '');
$dateformat_options .= $user->format_date(time(), $format, false) . ((strpos($format, '|') !== false) ? $user->lang['VARIANT_DATE_SEPARATOR'] . $user->format_date(time() - 31536000, $format, true) : '');
$dateformat_options .= '</option>';
}

2
phpBB/includes/ucp/ucp_prefs.php
View File

@ -94,7 +94,7 @@ class ucp_prefs
foreach ($user->lang['dateformats'] as $format => $null)
{
$dateformat_options .= '<option value="' . $format . '"' . (($format == $data['dateformat']) ? ' selected="selected"' : '') . '>';
$dateformat_options .= $user->format_date(time(), $format, true) . ((strpos($format, '|') !== false) ? ' [' . $user->lang['RELATIVE_DAYS'] . ']' : '');
$dateformat_options .= $user->format_date(time(), $format, false) . ((strpos($format, '|') !== false) ? $user->lang['VARIANT_DATE_SEPARATOR'] . $user->format_date(time() - 31536000, $format, true) : '');
$dateformat_options .= '</option>';
}

1
phpBB/language/en/acp/board.php
View File

@ -42,7 +42,6 @@ $lang = array_merge($lang, array(
'DISABLE_BOARD_EXPLAIN' => 'This will make the board unavailable to users. You can also enter a short (255 character) message to display if you wish.',
'OVERRIDE_STYLE' => 'Override user style',
'OVERRIDE_STYLE_EXPLAIN' => 'Replaces user’s style with the default.',
'RELATIVE_DAYS' => 'Relative days',
'SITE_DESC' => 'Site description',
'SITE_NAME' => 'Site name',
'SYSTEM_DST' => 'Enable Summer Time/<abbr title="Daylight Saving Time">DST</abbr>',

14
phpBB/language/en/common.php
View File

@ -593,6 +593,7 @@ $lang = array_merge($lang, array(
'USERS' => 'Users',
'USE_PERMISSIONS' => 'Test out user’s permissions',
'VARIANT_DATE_SEPARATOR' => ' / ', // Used in date format dropdown, eg: "Today, 13:37 / 01 Jan 2007, 13:37" ... to join a relative date with calendar date
'VIEWED' => 'Viewed',
'VIEWING_FAQ' => 'Viewing FAQ',
'VIEWING_MEMBERS' => 'Viewing member details',
@ -642,9 +643,9 @@ $lang = array_merge($lang, array(
'YOU_NO_NEW_PM' => 'No new private messages are waiting for you',
'datetime' => array(
'TODAY' => 'Today, ',
'TOMORROW' => 'Tomorrow, ',
'YESTERDAY' => 'Yesterday, ',
'TODAY' => 'Today',
'TOMORROW' => 'Tomorrow',
'YESTERDAY' => 'Yesterday',
'Sunday' => 'Sunday',
'Monday' => 'Monday',
@ -776,12 +777,13 @@ $lang = array_merge($lang, array(
// The value is only an example and will get replaced by the current time on view
'dateformats' => array(
'|d M Y| H:i' => '01 Jan 2007 13:37 [Relative days]',
'|d M Y|, H:i' => 'Today, 13:37 / 01 Jan 2007, 13:37',
'd M Y, H:i' => '01 Jan 2007, 13:37',
'd M Y H:i' => '01 Jan 2007 13:37',
'M jS, \'y, H:i' => 'Jan 1st, \'07, 13:37',
'D M d, Y g:i a' => 'Mon Jan 01, 2007 1:37 pm',
'M jS, y, H:i' => 'Jan 1st, 07, 1:37 pm',
'F jS, Y, g:i a' => 'January 1st, 2007, 1:37 pm'
'F jS, Y, g:i a' => 'January 1st, 2007, 1:37 pm',
'|F jS, Y|, g:i a' => 'Today, 1:37 pm / January 1st, 2007, 1:37 pm'
),
// The default dateformat which will be used on new installs in this language

1
phpBB/language/en/ucp.php
View File

@ -340,7 +340,6 @@ $lang = array_merge($lang, array(
'RECIPIENT' => 'Recipient',
'RECIPIENTS' => 'Recipients',
'REGISTRATION' => 'Registration',
'RELATIVE_DAYS' => 'Relative days',
'RELEASE_MESSAGES' => '%sRelease all on-hold messages%s… they will be re-sorted into the appropriate folder if enough space is made available.',
'REMOVE_ADDRESS' => 'Remove address',
'REMOVE_SELECTED_BOOKMARKS' => 'Remove selected bookmarks',