Skip to content

Commit

Permalink
commit 2
Browse files Browse the repository at this point in the history
  • Loading branch information
brianteeman committed Feb 15, 2018
1 parent d45dbe8 commit ba45527
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<?php echo $item->count; ?>
</td>
<td class="hidden-phone">
<?php echo JHtml::_('date', $item->track_date, JText::_('DATE_FORMAT_LC4') . ' H:i'); ?>
<?php echo JHtml::_('date', $item->track_date, JText::_('DATE_FORMAT_LC5')); ?>
</td>
</tr>
<?php endforeach; ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public function getItems()
$object->version_note = $table->version_note;

// Let's use custom calendars when present
$object->save_date = JHtml::_('date', $table->save_date, 'Y-m-d H:i:s');
$object->save_date = JHtml::_('date', $table->save_date, JText::_('DATE_FORMAT_LC6'));

$dateProperties = array (
'modified_time',
Expand All @@ -92,7 +92,7 @@ public function getItems()
{
if (array_key_exists($dateProperty, $object->data) && $object->data->$dateProperty->value != '0000-00-00 00:00:00')
{
$object->data->$dateProperty->value = JHtml::_('date', $object->data->$dateProperty->value, 'Y-m-d H:i:s');
$object->data->$dateProperty->value = JHtml::_('date', $object->data->$dateProperty->value, JText::_('DATE_FORMAT_LC6'));
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public function getItem()
$result->data = ContenthistoryHelper::prepareData($table);

// Let's use custom calendars when present
$result->save_date = JHtml::_('date', $table->save_date, 'Y-m-d H:i:s');
$result->save_date = JHtml::_('date', $table->save_date, JText::_('DATE_FORMAT_LC6'));

$dateProperties = array (
'modified_time',
Expand All @@ -84,7 +84,7 @@ public function getItem()
{
if (array_key_exists($dateProperty, $result->data) && $result->data->$dateProperty->value != '0000-00-00 00:00:00')
{
$result->data->$dateProperty->value = JHtml::_('date', $result->data->$dateProperty->value, 'Y-m-d H:i:s');
$result->data->$dateProperty->value = JHtml::_('date', $result->data->$dateProperty->value, JText::_('DATE_FORMAT_LC6'));
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<?php echo JText::_('COM_MESSAGES_FIELD_DATE_TIME_LABEL'); ?>
</div>
<div class="controls">
<?php echo JHtml::_('date', $this->item->date_time); ?>
<?php echo JHtml::_('date', $this->item->date_time, JText::_('DATE_FORMAT_LC2')); ?>
</div>
</div>
<div class="control-group">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</div>

<div class="fltlft utitle">
<?php echo JHtml::_('date', $item->created_time, 'D d M Y H:i'); ?>
<?php echo JHtml::_('date', $item->created_time, JText::_('DATE_FORMAT_LC2')); ?>
</div>

<?php $category_image = $item->cparams->get('image'); ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
<?php echo $item->count;?>
</td>
<td>
<?php echo JHtml::_('date', $item->track_date, JText::_('DATE_FORMAT_LC4').' H:i');?>
<?php echo JHtml::_('date', $item->track_date, JText::_('DATE_FORMAT_LC5'));?>
</td>
</tr>
<?php endforeach; ?>
Expand Down
4 changes: 2 additions & 2 deletions components/com_users/views/profile/tmpl/default_core.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@
<?php echo JText::_('COM_USERS_PROFILE_REGISTERED_DATE_LABEL'); ?>
</dt>
<dd>
<?php echo JHtml::_('date', $this->data->registerDate); ?>
<?php echo JHtml::_('date', $this->data->registerDate, JText::_('DATE_FORMAT_LC1')); ?>
</dd>
<dt>
<?php echo JText::_('COM_USERS_PROFILE_LAST_VISITED_DATE_LABEL'); ?>
</dt>
<?php if ($this->data->lastvisitDate != $this->db->getNullDate()) : ?>
<dd>
<?php echo JHtml::_('date', $this->data->lastvisitDate); ?>
<?php echo JHtml::_('date', $this->data->lastvisitDate, JText::_('DATE_FORMAT_LC1')); ?>
</dd>
<?php else : ?>
<dd>
Expand Down

0 comments on commit ba45527

Please sign in to comment.