keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix L10n path after move

Browse source
This commit is contained in:
nupplaPhil 2020-01-19 17:11:48 +01:00
parent 174129af94
commit 8138b05032
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Core/L10n.php
View file

@ -115,13 +115,13 @@ class L10n
$addons = $this->dba->select('addon', ['name'], ['installed' => true]); $addons = $this->dba->select('addon', ['name'], ['installed' => true]);
while ($p = $this->dba->fetch($addons)) { while ($p = $this->dba->fetch($addons)) {
$name = Strings::sanitizeFilePathItem($p['name']); $name = Strings::sanitizeFilePathItem($p['name']);
if (file_exists("addon/$name/lang/$lang/strings.php")) { if (file_exists(__DIR__ . "/../../addon/$name/lang/$lang/strings.php")) {
include __DIR__ . "/../../../addon/$name/lang/$lang/strings.php"; include __DIR__ . "/../../addon/$name/lang/$lang/strings.php";
} }
} }
if (file_exists(__DIR__ . "/../../../view/lang/$lang/strings.php")) { if (file_exists(__DIR__ . "/../../view/lang/$lang/strings.php")) {
include __DIR__ . "/../../../view/lang/$lang/strings.php"; include __DIR__ . "/../../view/lang/$lang/strings.php";
} }
$this->lang = $lang; $this->lang = $lang;
@ -191,8 +191,8 @@ class L10n
while (count($lang_code)) { while (count($lang_code)) {
// try to mix them so we can get double-code parts too // try to mix them so we can get double-code parts too
$match_lang = strtolower(join('-', $lang_code)); $match_lang = strtolower(join('-', $lang_code));
if (file_exists(__DIR__ . "/../../../view/lang/$match_lang") && if (file_exists(__DIR__ . "/../../view/lang/$match_lang") &&
is_dir(__DIR__ . "/../../../view/lang/$match_lang")) { is_dir(__DIR__ . "/../../view/lang/$match_lang")) {
if ($lang_quality > $current_q) { if ($lang_quality > $current_q) {
$current_lang = $match_lang; $current_lang = $match_lang;
$current_q = $lang_quality; $current_q = $lang_quality;

2
tests/src/Core/L10n/L10nTest.php → tests/src/Core/L10nTest.php
View file

@ -1,6 +1,6 @@
<?php <?php
namespace src\Core\L10n; namespace Friendica\Test\src\Core\L10n;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Test\MockedTest; use Friendica\Test\MockedTest;