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

Seems I forgot about empty translated strings

Browse source
This commit is contained in:
Jeroen De Meerleer 2018-12-20 17:43:07 +01:00 committed by Hypolite Petovan
parent c7d4838400
commit 09e44caf71
1 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
update.php
View file

@ -265,37 +265,39 @@ function update_1293()
$success = 0; $success = 0;
$fail = 0; $fail = 0;
foreach ($allGenders as $key => $gender) { foreach ($allGenders as $key => $gender) {
foreach ($allLangs as $key => $lang) { if ($gender['gender'] != '') {
foreach ($allLangs as $key => $lang) {
$a = new \stdClass(); $a = new \stdClass();
$a->strings = []; $a->strings = [];
// First we get the the localizations // First we get the the localizations
if (file_exists("view/lang/$lang/strings.php")) { if (file_exists("view/lang/$lang/strings.php")) {
include "view/lang/$lang/strings.php"; include "view/lang/$lang/strings.php";
} }
if (file_exists("addon/morechoice/lang/$lang/strings.php")) { if (file_exists("addon/morechoice/lang/$lang/strings.php")) {
include "addon/morechoice/lang/$lang/strings.php"; include "addon/morechoice/lang/$lang/strings.php";
}
$localizedStrings = $a->strings;
unset($a);
$key = array_search($gender['gender'], $localizedStrings);
if ($key !== false) {
break;
}
// defaulting to empty string
$key = '';
} }
$localizedStrings = $a->strings; if ($key == '') {
unset($a); $fail++;
} else {
$key = array_search($gender['gender'], $localizedStrings); DBA::update('contact', ['gender' => $key], ['id' => $gender['id']]);
if ($key !== false) { logger::log('Updated contact ' . $gender['id'] . ' to gender ' . $key . ' (was: ' . $gender['gender'] . ')');
break; $success++;
} }
// defaulting to empty string
$key = '';
}
if ($key == '') {
$fail++;
} else {
DBA::update('contact', ['gender' => $key], ['id' => $gender['id']]);
logger::log('Updated contact ' . $gender['id'] . ' to gender ' . $key . ' (was: ' . $gender['gender'] . ')');
$success++;
} }
} }