Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Date format localise #19690

Merged
merged 3 commits into from
Mar 17, 2018
Merged

Date format localise #19690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2672c13
Add new date format LC6
brianteeman Feb 15, 2018
d45dbe8
LC6
brianteeman Feb 15, 2018
ba45527
commit 2
brianteeman Feb 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion administrator/components/com_banners/views/tracks/tmpl/default.php
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions administrator/components/com_contenthistory/models/compare.php
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions administrator/components/com_contenthistory/models/preview.php
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion administrator/components/com_contenthistory/views/history/tmpl/modal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
<td>
<a class="save-date" onclick="window.open(this.href,'win2','width=800,height=600,resizable=yes,scrollbars=yes'); return false;"
href="<?php echo JRoute::_('index.php?option=com_contenthistory&view=preview&layout=preview&tmpl=component&' . JSession::getFormToken() . '=1&version_id=' . $item->version_id); ?>">
<?php echo JHtml::_('date', $item->save_date, 'Y-m-d H:i:s'); ?>
<?php echo JHtml::_('date', $item->save_date, JText::_('DATE_FORMAT_LC6')); ?>
</a>
<?php if ($item->sha1_hash == $hash) : ?>
<span class="icon-featured" aria-hidden="true"><span class="element-invisible"><?php echo JText::_('JFEATURED'); ?></span></span>&nbsp;
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_messages/views/message/tmpl/default.php
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion administrator/components/com_users/views/notes/tmpl/modal.php
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions administrator/components/com_users/views/users/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,13 @@
</td>
<td class="hidden-phone hidden-tablet">
<?php if ($item->lastvisitDate != $this->db->getNullDate()) : ?>
<?php echo JHtml::_('date', $item->lastvisitDate, 'Y-m-d H:i:s'); ?>
<?php echo JHtml::_('date', $item->lastvisitDate, JText::_('DATE_FORMAT_LC6')); ?>
<?php else : ?>
<?php echo JText::_('JNEVER'); ?>
<?php endif; ?>
</td>
<td class="hidden-phone hidden-tablet">
<?php echo JHtml::_('date', $item->registerDate, 'Y-m-d H:i:s'); ?>
<?php echo JHtml::_('date', $item->registerDate, JText::_('DATE_FORMAT_LC6')); ?>
</td>
<td class="hidden-phone">
<?php echo (int) $item->id; ?>
Expand Down
1 change: 1 addition & 0 deletions administrator/language/en-GB/en-GB.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,6 +963,7 @@ DATE_FORMAT_LC2="l, d F Y H:i"
DATE_FORMAT_LC3="d F Y"
DATE_FORMAT_LC4="Y-m-d"
DATE_FORMAT_LC5="Y-m-d H:i"
DATE_FORMAT_LC6="Y-m-d H:i:s"
DATE_FORMAT_JS1="y-m-d"
DATE_FORMAT_CALENDAR_DATE="%Y-%m-%d"
DATE_FORMAT_CALENDAR_DATETIME="%Y-%m-%d %H:%M:%S"
Expand Down
2 changes: 1 addition & 1 deletion administrator/templates/hathor/html/com_banners/tracks/default.php
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion administrator/templates/hathor/html/com_contenthistory/history/modal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
<td class="nowrap">
<a class="save-date" onclick="window.open(this.href,'win2','width=800,height=600,resizable=yes,scrollbars=yes'); return false;"
href="<?php echo JRoute::_('index.php?option=com_contenthistory&view=preview&layout=preview&tmpl=component&' . JSession::getFormToken() . '=1&version_id=' . $item->version_id);?>">
<?php echo JHtml::_('date', $item->save_date, 'Y-m-d H:i:s'); ?>
<?php echo JHtml::_('date', $item->save_date, JText::_('DATE_FORMAT_LC6')); ?>
</a>
<?php if ($item->sha1_hash == $hash) :?>
<span class="icon-featured"></span>&nbsp;
Expand Down
4 changes: 2 additions & 2 deletions administrator/templates/hathor/html/com_users/users/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,13 +191,13 @@
</td>
<td class="center">
<?php if ($item->lastvisitDate != $this->db->getNullDate()) : ?>
<?php echo JHtml::_('date', $item->lastvisitDate, 'Y-m-d H:i:s'); ?>
<?php echo JHtml::_('date', $item->lastvisitDate, JText::_('DATE_FORMAT_LC6')); ?>
<?php else:?>
<?php echo JText::_('JNEVER'); ?>
<?php endif;?>
</td>
<td class="center">
<?php echo JHtml::_('date', $item->registerDate, 'Y-m-d H:i:s'); ?>
<?php echo JHtml::_('date', $item->registerDate, JText::_('DATE_FORMAT_LC6')); ?>
</td>
<td class="center">
<?php echo (int) $item->id; ?>
Expand Down
4 changes: 2 additions & 2 deletions components/com_users/views/profile/tmpl/default_core.php
View file
Open in desktop
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
1 change: 1 addition & 0 deletions language/en-GB/en-GB.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ DATE_FORMAT_LC2="l, d F Y H:i"
DATE_FORMAT_LC3="d F Y"
DATE_FORMAT_LC4="Y-m-d"
DATE_FORMAT_LC5="Y-m-d H:i"
DATE_FORMAT_LC6="Y-m-d H:i:s"
DATE_FORMAT_JS1="y-m-d"
DATE_FORMAT_CALENDAR_DATE="%Y-%m-%d"
DATE_FORMAT_CALENDAR_DATETIME="%Y-%m-%d %H:%M:%S"
Expand Down