r31k
/
bludit
2
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Languages fixes

This commit is contained in:
dignajar 2015-07-15 22:34:16 -03:00
parent 85b9109be1
commit 5fa1fc39cb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/dblanguage.class.php
View File

@ -15,7 +15,7 @@ class dbLanguage extends dbJSON
if(file_exists($filename)) if(file_exists($filename))
{ {
$Tmp = new dbJSON($filename, false); $Tmp = new dbJSON($filename, false);
$this->db += $Tmp->db; $this->db = array_merge($this->db, $Tmp->db);
} }
// User language // User language
@ -23,7 +23,7 @@ class dbLanguage extends dbJSON
if(file_exists($filename)) if(file_exists($filename))
{ {
$Tmp = new dbJSON($filename, false); $Tmp = new dbJSON($filename, false);
$this->db += $Tmp->db; $this->db = array_merge($this->db, $Tmp->db);
} }
$this->data = $this->db['language-data']; $this->data = $this->db['language-data'];
@ -57,7 +57,7 @@ class dbLanguage extends dbJSON
public function add($array) public function add($array)
{ {
$this->db += $array; $this->db = array_merge($this->db, $array);
} }
// Returns the item from plugin-data. // Returns the item from plugin-data.

2
languages/ru_RU.json
View File

@ -77,7 +77,7 @@
"plugins": "Плагины", "plugins": "Плагины",
"install-plugin": "Установить плагин", "install-plugin": "Установить плагин",
"uninstall-plugin": "Удалить плагин", "uninstall-plugin": "Удалить плагин",
"new-password": "Новый пароль, "new-password": "Новый пароль",
"edit-user": "Редактировать пользователя", "edit-user": "Редактировать пользователя",
"publish-now": "Опубликовать сейчас", "publish-now": "Опубликовать сейчас",
"first-name": "Имя", "first-name": "Имя",