merge translations with those from theme
This commit is contained in:
parent
6a5f5ce157
commit
7611d218df
|
@ -122,7 +122,8 @@ class OC_L10N{
|
||||||
)
|
)
|
||||||
&& file_exists($i18ndir.$lang.'.php')) {
|
&& file_exists($i18ndir.$lang.'.php')) {
|
||||||
// Include the file, save the data from $CONFIG
|
// Include the file, save the data from $CONFIG
|
||||||
include strip_tags($i18ndir).strip_tags($lang).'.php';
|
$transFile = strip_tags($i18ndir).strip_tags($lang).'.php';
|
||||||
|
include $transFile;
|
||||||
if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)) {
|
if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)) {
|
||||||
$this->translations = $TRANSLATIONS;
|
$this->translations = $TRANSLATIONS;
|
||||||
//merge with translations from theme
|
//merge with translations from theme
|
||||||
|
|
Loading…
Reference in New Issue