Merge pull request #2479 from 810/k3.1-develop-bugs3

"Last visit date: Today" in profilebox #2301
Kunena · May 11, 2014 · ff7ea6f · ff7ea6f
2 parents 58ddb8a + dd57d90
commit ff7ea6f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/components/com_kunena/site/language/en-GB/en-GB.com_kunena.ini b/components/com_kunena/site/language/en-GB/en-GB.com_kunena.ini
@@ -239,4 +239,5 @@ COM_KUNENA_ALERT_SUCCESS_X="Success: %s"
 COM_KUNENA_ALERT_INFO_X="Info: %s"
 
 COM_KUNENA_LIB_TIME_NOW="Just now"
-COM_KUNENA_LIB_TIME_AGO="%s ago"
+COM_KUNENA_LIB_TIME_AGO="%s ago"
+COM_KUNENA_MYPROFILE_LASTLOGIN="Last login"
diff --git a/components/com_kunena/site/template/blue_eagle/html/common/logout.php b/components/com_kunena/site/template/blue_eagle/html/common/logout.php
@@ -29,7 +29,7 @@
 				</ul>
 				<ul class="kprofilebox-welcome">
 					<li><?php echo JText::_('COM_KUNENA_PROFILEBOX_WELCOME'); ?>, <strong><?php echo $this->me->getLink() ?></strong></li>
-					<li class="kms"><strong><?php echo JText::_('COM_KUNENA_MYPROFILE_LASTVISITDATE'); ?>:</strong> <span title="<?php echo KunenaDate::getInstance($this->me->lastvisitDate)->toKunena('ago'); ?>"><?php echo KunenaDate::getInstance($this->me->lastvisitDate)->toKunena('date_today'); ?></span></li>
+					<li class="kms"><strong><?php echo JText::_('COM_KUNENA_MYPROFILE_LASTLOGIN'); ?>:</strong> <span title="<?php echo KunenaDate::getInstance($this->me->lastvisitDate)->toKunena('ago'); ?>"><?php echo KunenaDate::getInstance($this->me->lastvisitDate)->toKunena('config_post_dateformat', 'ago'); ?></span></li>
 					<?php if ($this->logout->enabled()) : ?>
 					<li>
 					<form action="<?php echo KunenaRoute::_('index.php?option=com_kunena') ?>" method="post" name="login">

diff --git a/components/com_kunena/site/template/crypsis/layouts/user/item/summary/default.php b/components/com_kunena/site/template/crypsis/layouts/user/item/summary/default.php
@@ -72,7 +72,7 @@
 				<?php endif; ?>
 				<?php if ($this->config->userlist_lastvisitdate || $me->isModerator()) : ?>
 					<li>
-						<strong> <?php echo JText::_('COM_KUNENA_MYPROFILE_LASTVISITDATE'); ?>:</strong>
+						<strong> <?php echo JText::_('COM_KUNENA_MYPROFILE_LASTLOGIN'); ?>:</strong>
 						<span title="<?php echo $profile->getLastVisitDate()->toKunena('ago'); ?>"> <?php echo $profile->getLastVisitDate()->toKunena('config_post_dateformat', 'ago'); ?> </span>
 					</li>
 				<?php endif; ?>

diff --git a/components/com_kunena/site/template/crypsis/layouts/widget/login/logout/default.php b/components/com_kunena/site/template/crypsis/layouts/widget/login/logout/default.php
@@ -30,7 +30,7 @@
 					</p>
 					<p>
 						<i class="icon-clock"></i>
-						<?php echo $this->lastvisitDate->toSpan('datetime_today', 'ago'); ?>
+						<?php echo $this->me->getLastVisitDate()->toKunena('config_post_dateformat', 'ago'); ?>
 					</p>
 				</div>
 				<div class="divider"></div>