Skip to content

[4.0] Fix Untranslated tip #27174

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

Merged
wilsonge merged 11 commits into from
Dec 4, 2019
Merged

[4.0] Fix Untranslated tip #27174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
19195bc
[4.0] Fix Untranslated tip
infograf768 Nov 28, 2019
867de44
rather using Text
infograf768 Nov 29, 2019
24d59bc
moving around Text translation
infograf768 Dec 3, 2019
49c4df5
also for only-icon
infograf768 Dec 3, 2019
14a2373
oops
infograf768 Dec 3, 2019
0dc06d6
more...
infograf768 Dec 3, 2019
18a1654
same modif for featured button
infograf768 Dec 3, 2019
4c89c16
more stuff
infograf768 Dec 3, 2019
0318b14
Merge branch '4.0-dev' into 4.0_untranslated_stage_string
infograf768 Dec 3, 2019
13314e2
Merge branch '4.0-dev' into 4.0_untranslated_stage_string
infograf768 Dec 4, 2019
519ce2f
Merge branch '4.0-dev' into 4.0_untranslated_stage_string
infograf768 Dec 4, 2019
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
8 changes: 4 additions & 4 deletions administrator/components/com_content/tmpl/articles/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,10 +249,10 @@
->removeState(1)
->removeState(2)
->removeState(-2)
->addState(ContentComponent::CONDITION_PUBLISHED, '', 'publish', 'COM_CONTENT_CHANGE_STAGE', ['tip_title' => 'JPUBLISHED'])
->addState(ContentComponent::CONDITION_UNPUBLISHED, '', 'unpublish', 'COM_CONTENT_CHANGE_STAGE', ['tip_title' => 'JUNPUBLISHED'])
->addState(ContentComponent::CONDITION_ARCHIVED, '', 'archive', 'COM_CONTENT_CHANGE_STAGE', ['tip_title' => 'JARCHIVED'])
->addState(ContentComponent::CONDITION_TRASHED, '', 'trash', 'COM_CONTENT_CHANGE_STAGE', ['tip_title' => 'JTRASHED'])
->addState(ContentComponent::CONDITION_PUBLISHED, '', 'publish', Text::_('COM_CONTENT_CHANGE_STAGE'), ['tip_title' => Text::_('JPUBLISHED')])
->addState(ContentComponent::CONDITION_UNPUBLISHED, '', 'unpublish', Text::_('COM_CONTENT_CHANGE_STAGE'), ['tip_title' => Text::_('JUNPUBLISHED')])
->addState(ContentComponent::CONDITION_ARCHIVED, '', 'archive', Text::_('COM_CONTENT_CHANGE_STAGE'), ['tip_title' => Text::_('JARCHIVED')])
->addState(ContentComponent::CONDITION_TRASHED, '', 'trash', Text::_('COM_CONTENT_CHANGE_STAGE'), ['tip_title' => Text::_('JTRASHED')])
->setLayout('joomla.button.transition-button')
->render($item->stage_condition, $i, $options, $item->publish_up, $item->publish_down);
?>
Expand Down
8 changes: 4 additions & 4 deletions administrator/components/com_content/tmpl/featured/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,10 +233,10 @@
->removeState(1)
->removeState(2)
->removeState(-2)
->addState(ContentComponent::CONDITION_PUBLISHED, '', 'publish', 'COM_CONTENT_CHANGE_STAGE', ['tip_title' => 'JPUBLISHED'])
->addState(ContentComponent::CONDITION_UNPUBLISHED, '', 'unpublish', 'COM_CONTENT_CHANGE_STAGE', ['tip_title' => 'JUNPUBLISHED'])
->addState(ContentComponent::CONDITION_ARCHIVED, '', 'archive', 'COM_CONTENT_CHANGE_STAGE', ['tip_title' => 'JARCHIVED'])
->addState(ContentComponent::CONDITION_TRASHED, '', 'trash', 'COM_CONTENT_CHANGE_STAGE', ['tip_title' => 'JTRASHED'])
->addState(ContentComponent::CONDITION_PUBLISHED, '', 'publish', Text::_('COM_CONTENT_CHANGE_STAGE'), ['tip_title' => Text::_('JPUBLISHED')])
->addState(ContentComponent::CONDITION_UNPUBLISHED, '', 'unpublish', Text::_('COM_CONTENT_CHANGE_STAGE'), ['tip_title' => Text::_('JUNPUBLISHED')])
->addState(ContentComponent::CONDITION_ARCHIVED, '', 'archive', Text::_('COM_CONTENT_CHANGE_STAGE'), ['tip_title' => Text::_('JARCHIVED')])
->addState(ContentComponent::CONDITION_TRASHED, '', 'trash', Text::_('COM_CONTENT_CHANGE_STAGE'), ['tip_title' => Text::_('JTRASHED')])
->setLayout('joomla.button.transition-button')
->render($item->stage_condition, $i, $options, $item->publish_up, $item->publish_down);
?>
Expand Down
7 changes: 3 additions & 4 deletions layouts/joomla/button/action-button.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
*/

use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Text;

HTMLHelper::_('bootstrap.popover');

Expand All @@ -28,14 +27,14 @@
$tipTitle = $options['tip_title'];
?>
<button type="submit" class="tbody-icon data-state-<?php echo $this->escape($value ?? ''); ?><?php echo $tip ? ' hasPopover' : ''; ?>"
title="<?php echo HTMLHelper::_('tooltipText', Text::_($tipTitle ? : $title), '', 0); ?>"
data-content="<?php echo HTMLHelper::_('tooltipText', Text::_($title), '', 0); ?>"
title="<?php echo HTMLHelper::_('tooltipText', $tipTitle ?: $title, '', 0); ?>"
data-content="<?php echo HTMLHelper::_('tooltipText', $title, '', 0); ?>"
data-placement="top"
<?php echo !empty($disabled) ? 'disabled' : ''; ?>
<?php if (!empty($task) && empty($disabled)) : ?>
onclick="return Joomla.listItemTask('<?php echo $checkboxName . $this->escape($row ?? ''); ?>', '<?php echo $this->escape(isset($task) ? $taskPrefix . $task : ''); ?>')"
<?php endif; ?>
>
<span class="<?php echo $this->escape($icon ?? ''); ?>" aria-hidden="true"></span>
<span class="sr-only"><?php echo Text::_($title); ?></span>
<span class="sr-only"><?php echo $title; ?></span>
</button>
7 changes: 3 additions & 4 deletions layouts/joomla/button/transition-button.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
*/

use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Text;

HTMLHelper::_('bootstrap.popover');

Expand All @@ -31,8 +30,8 @@
<?php if ($only_icon) : ?>
<span class="tbody-icon mr-1">
<span class="<?php echo $this->escape($icon ?? ''); ?> <?php echo $tip ? 'hasPopover' : ''; ?>"
title="<?php echo HTMLHelper::_('tooltipText', Text::_($tipTitle ? : $title), '', 0); ?>"
data-content="<?php echo HTMLHelper::_('tooltipText', Text::_($title), '', 0); ?>"
title="<?php echo HTMLHelper::_('tooltipText', $tipTitle ?: $title, '', 0); ?>"
data-content="<?php echo HTMLHelper::_('tooltipText', $title, '', 0); ?>"
data-placement="top"
></span>
</span>
Expand All @@ -43,7 +42,7 @@
href="javascript://"
<?php endif; ?>

title="<?php echo HTMLHelper::_('tooltipText', Text::_($tipTitle ? : $title), '', 0); ?>"
title="<?php echo HTMLHelper::_('tooltipText', $tipTitle ?: $title, '', 0); ?>"
data-content="<?php echo HTMLHelper::_('tooltipText', $title, '', 0); ?>"
data-placement="top"
onclick="Joomla.toggleAllNextElements(this, 'd-none')"
Expand Down
10 changes: 5 additions & 5 deletions libraries/src/Button/FeaturedButton.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ class FeaturedButton extends ActionButton
*/
protected function preprocess()
{
$this->addState(0, 'articles.featured', 'unfeatured', 'COM_CONTENT_UNFEATURED', ['tip_title' => 'JGLOBAL_TOGGLE_FEATURED']);
$this->addState(1, 'articles.unfeatured', 'featured', 'COM_CONTENT_FEATURED', ['tip_title' => 'JGLOBAL_TOGGLE_FEATURED']);
$this->addState(0, 'articles.featured', 'unfeatured', Text::_('COM_CONTENT_UNFEATURED'), ['tip_title' => Text::_('JGLOBAL_TOGGLE_FEATURED')]);
$this->addState(1, 'articles.unfeatured', 'featured', Text::_('COM_CONTENT_FEATURED'), ['tip_title' => Text::_('JGLOBAL_TOGGLE_FEATURED')]);
}

/**
Expand Down Expand Up @@ -88,17 +88,17 @@ public function render(string $value = null, string $row = null, array $options

$default['title'] = $tip;

$options['tip_title'] = 'JLIB_HTML_FEATURED_ITEM';
$options['tip_title'] = Text::_('JLIB_HTML_FEATURED_ITEM');

if ($featuredUp && $nowDate < $featuredUp->toUnix())
{
$options['tip_title'] = 'JLIB_HTML_FEATURED_PENDING_ITEM';
$options['tip_title'] = Text::_('JLIB_HTML_FEATURED_PENDING_ITEM');
$default['icon'] = 'pending';
}

if ($featuredDown && $nowDate > $featuredDown->toUnix())
{
$options['tip_title'] = 'JLIB_HTML_FEATURED_EXPIRED_ITEM';
$options['tip_title'] = Text::_('JLIB_HTML_FEATURED_EXPIRED_ITEM');
$default['icon'] = 'expired';
}
}
Expand Down
14 changes: 7 additions & 7 deletions libraries/src/Button/PublishedButton.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ class PublishedButton extends ActionButton
*/
protected function preprocess()
{
$this->addState(1, 'unpublish', 'publish', 'JLIB_HTML_UNPUBLISH_ITEM', ['tip_title' => 'JPUBLISHED']);
$this->addState(0, 'publish', 'unpublish', 'JLIB_HTML_PUBLISH_ITEM', ['tip_title' => 'JUNPUBLISHED']);
$this->addState(2, 'unpublish', 'archive', 'JLIB_HTML_UNPUBLISH_ITEM', ['tip_title' => 'JARCHIVED']);
$this->addState(-2, 'publish', 'trash', 'JLIB_HTML_PUBLISH_ITEM', ['tip_title' => 'JTRASHED']);
$this->addState(1, 'unpublish', 'publish', Text::_('JLIB_HTML_UNPUBLISH_ITEM'), ['tip_title' => Text::_('JPUBLISHED')]);
$this->addState(0, 'publish', 'unpublish', Text::_('JLIB_HTML_PUBLISH_ITEM'), ['tip_title' => Text::_('JUNPUBLISHED')]);
$this->addState(2, 'unpublish', 'archive', Text::_('JLIB_HTML_UNPUBLISH_ITEM'), ['tip_title' => Text::_('JARCHIVED')]);
$this->addState(-2, 'publish', 'trash', Text::_('JLIB_HTML_PUBLISH_ITEM'), ['tip_title' => Text::_('JTRASHED')]);
}

/**
Expand Down Expand Up @@ -84,17 +84,17 @@ public function render(string $value = null, string $row = null, array $options

$default['title'] = $tip;

$options['tip_title'] = 'JLIB_HTML_PUBLISHED_ITEM';
$options['tip_title'] = Text::_('JLIB_HTML_PUBLISHED_ITEM');

if ($publishUp && $nowDate < $publishUp->toUnix())
{
$options['tip_title'] = 'JLIB_HTML_PUBLISHED_PENDING_ITEM';
$options['tip_title'] = Text::_('JLIB_HTML_PUBLISHED_PENDING_ITEM');
$default['icon'] = 'pending';
}

if ($publishDown && $nowDate > $publishDown->toUnix())
{
$options['tip_title'] = 'JLIB_HTML_PUBLISHED_EXPIRED_ITEM';
$options['tip_title'] = Text::_('JLIB_HTML_PUBLISHED_EXPIRED_ITEM');
$default['icon'] = 'expired';
}
}
Expand Down