joomla/Component-Builder
39
25
Fork 11
Code Issues 75 Pull Requests Projects 4 Wiki Activity

Improved how the filters in the langauge translation are behave when no language is found. gh-651

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2021-01-18 19:37:05 +02:00
parent 3357f2cb40
commit 30cb1a531a
5 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
admin/models/language_translations.php
View File

@ -69,11 +69,20 @@ class ComponentbuilderModelLanguage_translations extends JModelList
'type' => 'list',
'onchange' => 'this.form.submit();',
);
// no languages found notice
$options = array(
'' => '- ' . JText::_('COM_COMPONENTBUILDER_TRANSLATED_IN') . ' -',
'all' => JText::_('COM_COMPONENTBUILDER_EVERY_LANGUAGE')
'' => '- ' . JText::_('COM_COMPONENTBUILDER_NO_LANGUAGES_FOUND') . ' -'
);
$options = array_merge($options, ComponentbuilderHelper::getAvailableLanguages());
// check if we have languages set
if (($languages = ComponentbuilderHelper::getAvailableLanguages()) !== false)
{
$options = array(
'' => '- ' . JText::_('COM_COMPONENTBUILDER_TRANSLATED_IN') . ' -',
'all' => JText::_('COM_COMPONENTBUILDER_EVERY_LANGUAGE')
);
$options = array_merge($options, $languages);
}
$form->setField(ComponentbuilderHelper::getFieldXML($attributes, $options),'filter');
$form->setValue(
@ -89,11 +98,20 @@ class ComponentbuilderModelLanguage_translations extends JModelList
'type' => 'list',
'onchange' => 'this.form.submit();',
);
// no languages found notice
$options = array(
'' => '- ' . JText::_('COM_COMPONENTBUILDER_NOT_TRANSLATED_IN') . ' -',
'none' => JText::_('COM_COMPONENTBUILDER_ANY_LANGUAGE')
'' => '- ' . JText::_('COM_COMPONENTBUILDER_NO_LANGUAGES_FOUND') . ' -'
);
$options = array_merge($options, ComponentbuilderHelper::getAvailableLanguages());
// check if we have languages set
if ($languages)
{
$options = array(
'' => '- ' . JText::_('COM_COMPONENTBUILDER_NOT_TRANSLATED_IN') . ' -',
'none' => JText::_('COM_COMPONENTBUILDER_ANY_LANGUAGE')
);
$options = array_merge($options, $languages);
}
$form->setField(ComponentbuilderHelper::getFieldXML($attributes, $options),'filter');
$form->setValue(