diff --git a/administrator/components/com_templates/src/Model/StyleModel.php b/administrator/components/com_templates/src/Model/StyleModel.php index 3bade8432b4f3..edfb1725f048a 100644 --- a/administrator/components/com_templates/src/Model/StyleModel.php +++ b/administrator/components/com_templates/src/Model/StyleModel.php @@ -396,9 +396,12 @@ protected function preprocessForm(Form $form, $data, $group = 'content') $formFile = Path::clean($client->path . '/templates/' . $template . '/templateDetails.xml'); // Load the core and/or local language file(s). + // Default to using parent template language constants + $lang->load('tpl_' . $data->parent, $client->path) + || $lang->load('tpl_' . $data->parent, $client->path . '/templates/' . $data->parent); + + // Apply any, optional, overrides for child template language constants $lang->load('tpl_' . $template, $client->path) - || (!empty($data->parent) && $lang->load('tpl_' . $data->parent, $client->path)) - || (!empty($data->parent) && $lang->load('tpl_' . $data->parent, $client->path . '/templates/' . $data->parent)) || $lang->load('tpl_' . $template, $client->path . '/templates/' . $template); if (file_exists($formFile)) {