friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Update function and sprintf 

Update variable to static function and remove sprintf wrappers
This commit is contained in:
Adam Magness 2018-01-23 12:47:30 -05:00
parent 7158aa7ded
commit f7e9b74dca
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -781,7 +781,7 @@ function run_update_function($x)
//send the administrator an e-mail //send the administrator an e-mail
DBStructure::updateFail( DBStructure::updateFail(
$x, $x,
sprintf(L10n::t('Update %s failed. See error logs.'), $x) L10n::t('Update %s failed. See error logs.', $x)
); );
return false; return false;
} else { } else {

6
include/text.php
View File

@ -952,7 +952,7 @@ function contact_block() {
dbesc(implode(",", $contacts))); dbesc(implode(",", $contacts)));
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$contacts = sprintf(L10n::tt('%d Contact', '%d Contacts', $total), $total); $contacts = L10n::tt('%d Contact', '%d Contacts', $total);
$micropro = []; $micropro = [];
foreach ($r as $rr) { foreach ($r as $rr) {
$micropro[] = micropro($rr, true, 'mpfriend'); $micropro[] = micropro($rr, true, 'mpfriend');
@ -1411,7 +1411,7 @@ function prepare_body(&$item, $attach = false, $preview = false) {
while ((strpos($s, $spoilersearch) !== false)) { while ((strpos($s, $spoilersearch) !== false)) {
$pos = strpos($s, $spoilersearch); $pos = strpos($s, $spoilersearch);
$rnd = random_string(8); $rnd = random_string(8);
$spoilerreplace = '<br /> <span id="spoiler-wrap-' . $rnd . '" class="spoiler-wrap fakelink" onclick="openClose(\'spoiler-' . $rnd . '\');">' . sprintf(L10n::t('Click to open/close')) . '</span>'. $spoilerreplace = '<br /> <span id="spoiler-wrap-' . $rnd . '" class="spoiler-wrap fakelink" onclick="openClose(\'spoiler-' . $rnd . '\');">' . L10n::t('Click to open/close') . '</span>'.
'<blockquote class="spoiler" id="spoiler-' . $rnd . '" style="display: none;">'; '<blockquote class="spoiler" id="spoiler-' . $rnd . '" style="display: none;">';
$s = substr($s, 0, $pos) . $spoilerreplace . substr($s, $pos + strlen($spoilersearch)); $s = substr($s, 0, $pos) . $spoilerreplace . substr($s, $pos + strlen($spoilersearch));
} }
@ -1422,7 +1422,7 @@ function prepare_body(&$item, $attach = false, $preview = false) {
while ((strpos($s, $authorsearch) !== false)) { while ((strpos($s, $authorsearch) !== false)) {
$pos = strpos($s, $authorsearch); $pos = strpos($s, $authorsearch);
$rnd = random_string(8); $rnd = random_string(8);
$authorreplace = '<br /> <span id="author-wrap-' . $rnd . '" class="author-wrap fakelink" onclick="openClose(\'author-' . $rnd . '\');">' . sprintf(L10n::t('Click to open/close')) . '</span>'. $authorreplace = '<br /> <span id="author-wrap-' . $rnd . '" class="author-wrap fakelink" onclick="openClose(\'author-' . $rnd . '\');">' . L10n::t('Click to open/close') . '</span>'.
'<blockquote class="author" id="author-' . $rnd . '" style="display: block;">'; '<blockquote class="author" id="author-' . $rnd . '" style="display: block;">';
$s = substr($s, 0, $pos) . $authorreplace . substr($s, $pos + strlen($authorsearch)); $s = substr($s, 0, $pos) . $authorreplace . substr($s, $pos + strlen($authorsearch));
} }

9
src/Core/L10n.php
View File

@ -115,12 +115,12 @@ class L10n
while ($p = dba::fetch($addons)) { while ($p = dba::fetch($addons)) {
$name = $p['name']; $name = $p['name'];
if (file_exists("addon/$name/lang/$lang/strings.php")) { if (file_exists("addon/$name/lang/$lang/strings.php")) {
include("addon/$name/lang/$lang/strings.php"); include "addon/$name/lang/$lang/strings.php";
} }
} }
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";
} }
} }
@ -184,9 +184,10 @@ class L10n
if (is_array($t)) { if (is_array($t)) {
$plural_function = 'string_plural_select_' . str_replace('-', '_', $lang); $plural_function = 'string_plural_select_' . str_replace('-', '_', $lang);
if (function_exists($plural_function)) { if (function_exists($plural_function)) {
$plural_function = 'stringPluralSelectDefault'; $i = $plural_function($count);
} else {
$i = self::stringPluralSelectDefault($count);
} }
$i = $plural_function($count);
$s = $t[$i]; $s = $t[$i];
} else { } else {
$s = $t; $s = $t;