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

Fixed gh-434 to add the missing table path if not set. Resolved gh-427 to allow numbers in the name of a field. Impoved the compiler by adding a method to set the Lang Content array.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2019-07-05 01:53:54 +02:00
parent b9c758b800
commit 9e6233c64f
27 changed files with 790 additions and 681 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
admin/helpers/compiler/a_Get.php
View File

@ -1581,6 +1581,29 @@ class Get
return $component;
}
/**
* set the language content values to language content array
*
* @param string $target The target area for the language string
* @param string $language The language key string
* @param string $string The language string
* @param boolean $addPrefix The switch to add langPrefix
*
* @return void
*
*/
public function setLangContent($target, $language, $string, $addPrefix = false)
{
if ($addPrefix && !isset($this->langContent[$target][$this->langPrefix . '_' . $language]))
{
$this->langContent[$target][$this->langPrefix . '_' . $language] = trim($string);
}
elseif (!isset($this->langContent[$target][$language]))
{
$this->langContent[$target][$language] = trim($string);
}
}
/**
* Get all Admin View Data
*
@ -1708,7 +1731,7 @@ class Get
$tab['name'] = (isset($tab['name']) && ComponentbuilderHelper::checkString($tab['name'])) ? $tab['name'] : 'Tab';
// set lang
$tab['lang'] = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($tab['view'], 'U') . '_' . ComponentbuilderHelper::safeString($tab['name'], 'U');
$this->langContent['both'][$tab['lang']] = trim($tab['name']);
$this->setLangContent('both', $tab['lang'], $tab['name']);
// set code name
$tab['code'] = ComponentbuilderHelper::safeString($tab['name']);
// check if the permissions for the tab should be added
@ -1747,8 +1770,8 @@ class Get
$tab['lang_permission'] = $tab['lang'] . '_TAB_PERMISSION';
$tab['lang_permission_desc'] = $tab['lang'] . '_TAB_PERMISSION_DESC';
$tab['lang_permission_title'] = $this->placeholders[$this->hhh . 'Views' . $this->hhh] . ' View ' . $tab['name'] . ' Tab';
$this->langContent['both'][$tab['lang_permission']] = $tab['lang_permission_title'];
$this->langContent['both'][$tab['lang_permission_desc']] = 'Allow the users in this group to view ' . $tab['name'] . ' Tab of ' . $this->placeholders[$this->hhh . 'views' . $this->hhh];
$this->setLangContent('both', $tab['lang_permission'], $tab['lang_permission_title']);
$this->setLangContent('both', $tab['lang_permission_desc'], 'Allow the users in this group to view ' . $tab['name'] . ' Tab of ' . $this->placeholders[$this->hhh . 'views' . $this->hhh]);
// set the sort key
$tab['sortKey'] = ComponentbuilderHelper::safeString($tab['lang_permission_title']);
}
@ -2036,7 +2059,7 @@ class Get
if ('default' !== $check_column_name)
{
$column_name_lang = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($name_list, 'U') . '_' . ComponentbuilderHelper::safeString($relationsValue['column_name'], 'U');
$this->langContent['admin'][$column_name_lang] = trim($relationsValue['column_name']);
$this->setLangContent('admin', $column_name_lang, $relationsValue['column_name']);
$this->listHeadOverRide[$name_list][(int) $relationsValue['listfield']] = $column_name_lang;
}
}
@ -4369,12 +4392,11 @@ class Get
{
return false;
}
// only load if string is not already set
// build lang key
$keyLang = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($string, 'U');
if (!isset($this->langContent[$this->lang][$keyLang]))
{
$this->langContent[$this->lang][$keyLang] = trim($string);
}
// set the language string
$this->setLangContent($this->lang, $keyLang, $string);
return $keyLang;
}
@ -6334,12 +6356,10 @@ class Get
{
continue;
}
// only load if string is not already set
// build lang key
$keyLang = $this->langPrefix . '_' . $_keyLang;
if (!isset($this->langContent[$this->lang][$keyLang]))
{
$this->langContent[$this->lang][$keyLang] = trim($lang);
}
// set lang content string
$this->setLangContent($this->lang, $keyLang, $lang);
// reverse the placeholders
foreach ($langStringTargets as $langStringTarget)
{