makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

do not substract one year, only show the full date to not confuse users.

Browse source 
git-svn-id: file:///svn/phpbb/trunk@7396 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-04-24 17:19:01 +00:00
parent 7730930373
commit 9f9322511d
5 changed files with 5 additions and 5 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) foreach ($user->lang['dateformats'] as $format => $null)
{ {
$dateformat_options .= '<option value="' . $format . '"' . (($format == $value) ? ' selected="selected"' : '') . '>'; $dateformat_options .= '<option value="' . $format . '"' . (($format == $value) ? ' selected="selected"' : '') . '>';
$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 .= $user->format_date(time(), $format, false) . ((strpos($format, '|') !== false) ? $user->lang['VARIANT_DATE_SEPARATOR'] . $user->format_date(time(), $format, false) : '');
$dateformat_options .= '</option>'; $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) foreach ($user->lang['dateformats'] as $format => $null)
{ {
$dateformat_options .= '<option value="' . $format . '"' . (($format == $data['dateformat']) ? ' selected="selected"' : '') . '>'; $dateformat_options .= '<option value="' . $format . '"' . (($format == $data['dateformat']) ? ' selected="selected"' : '') . '>';
$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 .= $user->format_date(time(), $format, false) . ((strpos($format, '|') !== false) ? $user->lang['VARIANT_DATE_SEPARATOR'] . $user->format_date(time(), $format, false) : '');
$dateformat_options .= '</option>'; $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) foreach ($user->lang['dateformats'] as $format => $null)
{ {
$dateformat_options .= '<option value="' . $format . '"' . (($format == $data['dateformat']) ? ' selected="selected"' : '') . '>'; $dateformat_options .= '<option value="' . $format . '"' . (($format == $data['dateformat']) ? ' selected="selected"' : '') . '>';
$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 .= $user->format_date(time(), $format, false) . ((strpos($format, '|') !== false) ? $user->lang['VARIANT_DATE_SEPARATOR'] . $user->format_date(time(), $format, false) : '');
$dateformat_options .= '</option>'; $dateformat_options .= '</option>';
} }

2
phpBB/language/en/common.php
View file

@ -777,12 +777,12 @@ $lang = array_merge($lang, array(
// The value is only an example and will get replaced by the current time on view // The value is only an example and will get replaced by the current time on view
'dateformats' => array( 'dateformats' => array(
'|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',
'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', 'M jS, \'y, H:i' => 'Jan 1st, \'07, 13:37',
'D M d, Y g:i a' => 'Mon Jan 01, 2007 1:37 pm', 'D M d, Y g:i a' => 'Mon Jan 01, 2007 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',
'|d M Y|, H:i' => 'Today, 13:37 / 01 Jan 2007, 13:37',
'|F jS, Y|, g:i a' => 'Today, 1:37 pm / January 1st, 2007, 1:37 pm' '|F jS, Y|, g:i a' => 'Today, 1:37 pm / January 1st, 2007, 1:37 pm'
), ),

2
phpBB/language/en/email/topic_notify.txt
View file

@ -10,7 +10,7 @@ If you want to view the newest post made since your last visit, click the follow
If you want to view the topic, click the following link: If you want to view the topic, click the following link:
{U_TOPIC} {U_TOPIC}
If you no longer wish to watch this topic you can either click the "Stop watching this topic" link found at the bottom of the topic above, or by clicking the following link: If you no longer wish to watch this topic you can either click the "Unsubscribe topic" link found at the bottom of the topic above, or by clicking the following link:
{U_STOP_WATCHING_TOPIC} {U_STOP_WATCHING_TOPIC}