From 9f9322511d8ab88beb8f1bf3e5e8b4495a7179ce Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Tue, 24 Apr 2007 17:19:01 +0000
Subject: [PATCH] do not substract one year, only show the full date to not
 confuse users.

git-svn-id: file:///svn/phpbb/trunk@7396 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/acp/acp_board.php         | 2 +-
 phpBB/includes/acp/acp_users.php         | 2 +-
 phpBB/includes/ucp/ucp_prefs.php         | 2 +-
 phpBB/language/en/common.php             | 2 +-
 phpBB/language/en/email/topic_notify.txt | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index d3a6e9da6f..7565161b69 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -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, 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>';
 		}
 
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index d3dd8ee7c3..18aa88c93a 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -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, 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>';
 				}
 
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index 07fa954d16..2291fedfe7 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -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, 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>';
 				}
 
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index d7bfa6a613..5bd6a0579a 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -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
 	'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',
 		'M jS, \'y, H:i'		=> 'Jan 1st, \'07, 13:37',
 		'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',
+		'|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'
 	),
 
diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt
index dc36eed5f5..3c8c38cf0a 100644
--- a/phpBB/language/en/email/topic_notify.txt
+++ b/phpBB/language/en/email/topic_notify.txt
@@ -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:
 {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}