mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-10-16 15:16:14 +02:00
Code Issues Releases Wiki Activity

Merge branch 'hotfix1363' into version137

Browse Source
This commit is contained in:
trendschau
2020-05-17 10:26:51 +02:00
parent fa615167a7 8d409f5b88
commit 69718f0343
2 changed files with 195 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
system/Settings.php
View File

@@ -128,7 +128,11 @@ class Settings
$theme_language_file = $language . '.yaml';
if (file_exists($theme_language_folder . $theme_language_file))
{
$theme_labels = $yaml->getYaml($theme_language_folder, $theme_language_file);
$this_theme_labels = $yaml->getYaml($theme_language_folder, $theme_language_file);
if(is_array($this_theme_labels))
{
$theme_labels = $this_theme_labels;
}
}
# loads the plugins strings of the set language
@@ -143,20 +147,20 @@ class Settings
if (file_exists($plugin_language_folder . $plugin_language_file))
{
$plugin_labels[$name] = $yaml->getYaml($plugin_language_folder, $plugin_language_file);
$this_plugin_labels = $yaml->getYaml($plugin_language_folder, $plugin_language_file);
if(is_array($this_plugin_labels))
{
$plugin_labels[$name] = $this_plugin_labels;
}
}
}
foreach($plugin_labels as $key => $value)
{
$plugins_labels = array_merge($plugins_labels, $value);
}
}
# Combines arrays of system languages, themes and plugins
$labels = array_merge($system_labels, $theme_labels, $plugins_labels);
return $labels;
}
}
public function whichLanguage()
{