Review sprintf

remove more sprintf calls
This commit is contained in:
Adam Magness 2018-01-23 21:59:16 -05:00
commit 208a149a7b
32 changed files with 205 additions and 188 deletions

View file

@ -99,7 +99,7 @@ function allfriends_content(App $a)
$tpl = get_markup_template('viewcontact_template.tpl');
$o .= replace_macros($tpl, [
//'$title' => sprintf(L10n::t('Friends of %s'), htmlentities($c[0]['name'])),
//'$title' => L10n::t('Friends of %s', htmlentities($c[0]['name'])),
'$tab_str' => $tab_str,
'$contacts' => $entries,
'$paginate' => paginate($a),

View file

@ -117,7 +117,7 @@ function dfrn_poll_init(App $a)
$_SESSION['visitor_handle'] = $r[0]['addr'];
$_SESSION['visitor_visiting'] = $r[0]['uid'];
if (!$quiet) {
info(sprintf(L10n::t('%1$s welcomes %2$s'), $r[0]['username'], $r[0]['name']) . EOL);
info(L10n::t('%1$s welcomes %2$s', $r[0]['username'], $r[0]['name']) . EOL);
}
// Visitors get 1 day session.
@ -537,7 +537,7 @@ function dfrn_poll_content(App $a)
$_SESSION['visitor_home'] = $r[0]['url'];
$_SESSION['visitor_visiting'] = $r[0]['uid'];
if (!$quiet) {
info(sprintf(L10n::t('%1$s welcomes %2$s'), $r[0]['username'], $r[0]['name']) . EOL);
info(L10n::t('%1$s welcomes %2$s', $r[0]['username'], $r[0]['name']) . EOL);
}
// Visitors get 1 day session.

View file

@ -117,7 +117,7 @@ function dfrn_request_post(App $a)
}
$invalid = Probe::validDfrn($parms);
if ($invalid) {
notice(sprintf(L10n::tt("%d required parameter was not found at the given location", "%d required parameters were not found at the given location", $invalid), $invalid) . EOL);
notice(L10n::tt("%d required parameter was not found at the given location", "%d required parameters were not found at the given location", $invalid) . EOL);
return;
}
}
@ -242,7 +242,7 @@ function dfrn_request_post(App $a)
intval($uid)
);
if (DBM::is_result($r) && count($r) > $maxreq) {
notice(sprintf(L10n::t('%s has received too many connection requests today.'), $a->profile['name']) . EOL);
notice(L10n::t('%s has received too many connection requests today.', $a->profile['name']) . EOL);
notice(L10n::t('Spam protection measures have been invoked.') . EOL);
notice(L10n::t('Friends are advised to please try again in 24 hours.') . EOL);
return;
@ -313,7 +313,7 @@ function dfrn_request_post(App $a)
notice(L10n::t('You have already introduced yourself here.') . EOL);
return;
} elseif ($ret[0]['rel'] == CONTACT_IS_FRIEND) {
notice(sprintf(L10n::t('Apparently you are already friends with %s.'), $a->profile['name']) . EOL);
notice(L10n::t('Apparently you are already friends with %s.', $a->profile['name']) . EOL);
return;
} else {
$contact_record = $ret[0];
@ -364,7 +364,7 @@ function dfrn_request_post(App $a)
}
$invalid = Probe::validDfrn($parms);
if ($invalid) {
notice(sprintf(L10n::tt("%d required parameter was not found at the given location", "%d required parameters were not found at the given location", $invalid), $invalid) . EOL);
notice(L10n::tt("%d required parameter was not found at the given location", "%d required parameters were not found at the given location", $invalid) . EOL);
return;
}
@ -524,8 +524,8 @@ function dfrn_request_content(App $a)
'$hidethem' => L10n::t('Hide this contact'),
'$hidechecked' => '',
'$confirm_key' => $confirm_key,
'$welcome' => sprintf(L10n::t('Welcome home %s.'), $a->user['username']),
'$please' => sprintf(L10n::t('Please confirm your introduction/connection request to %s.'), $dfrn_url),
'$welcome' => L10n::t('Welcome home %s.', $a->user['username']),
'$please' => L10n::t('Please confirm your introduction/connection request to %s.', $dfrn_url),
'$submit' => L10n::t('Confirm'),
'$uid' => $_SESSION['uid'],
'$nickname' => $a->user['nickname'],
@ -647,13 +647,13 @@ function dfrn_request_content(App $a)
'$header' => L10n::t('Friend/Connection Request'),
'$desc' => L10n::t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de'),
'$pls_answer' => L10n::t('Please answer the following:'),
'$does_know_you' => ['knowyou', sprintf(L10n::t('Does %s know you?'), $a->profile['name']), false, '', [L10n::t('No'), L10n::t('Yes')]],
'$does_know_you' => ['knowyou', L10n::t('Does %s know you?', $a->profile['name']), false, '', [L10n::t('No'), L10n::t('Yes')]],
'$add_note' => L10n::t('Add a personal note:'),
'$page_desc' => $page_desc,
'$friendica' => L10n::t('Friendica'),
'$statusnet' => L10n::t('GNU Social (Pleroma, Mastodon)'),
'$diaspora' => L10n::t('Diaspora (Socialhome, Hubzilla)'),
'$diasnote' => sprintf(L10n::t(' - please do not use this form. Instead, enter %s into your Diaspora search bar.'), $target_addr),
'$diasnote' => L10n::t(' - please do not use this form. Instead, enter %s into your Diaspora search bar.', $target_addr),
'$your_address' => L10n::t('Your Identity Address:'),
'$invite_desc' => $invite_desc,
'$submit' => L10n::t('Submit Request'),

View file

@ -44,7 +44,7 @@ function dirfind_content(App $a, $prefix = "") {
if (strpos($search,'@') === 0) {
$search = substr($search,1);
$header = sprintf(L10n::t('People Search - %s'), $search);
$header = L10n::t('People Search - %s', $search);
if ((valid_email($search) && validate_email($search)) ||
(substr(normalise_link($search), 0, 7) == "http://")) {
$user_data = Probe::uri($search);
@ -55,7 +55,7 @@ function dirfind_content(App $a, $prefix = "") {
if (strpos($search,'!') === 0) {
$search = substr($search,1);
$community = true;
$header = sprintf(L10n::t('Forum Search - %s'), $search);
$header = L10n::t('Forum Search - %s', $search);
}
$o = '';

View file

@ -102,7 +102,7 @@ function fbrowser_content(App $a)
'$files' => $files,
'$cancel' => L10n::t('Cancel'),
'$nickname' => $a->user['nickname'],
'$upload' => L10n::t('Upload')
'$upload' => L10n::t('Upload')
]);
break;
@ -133,7 +133,7 @@ function fbrowser_content(App $a)
'$files' => $files,
'$cancel' => L10n::t('Cancel'),
'$nickname' => $a->user['nickname'],
'$upload' => L10n::t('Upload')
'$upload' => L10n::t('Upload')
]);
}

View file

@ -144,12 +144,12 @@ function follow_content(App $a) {
$header = L10n::t("Connect/Follow");
$o = replace_macros($tpl,[
$o = replace_macros($tpl, [
'$header' => htmlentities($header),
//'$photo' => proxy_url($ret["photo"], false, PROXY_SIZE_SMALL),
'$desc' => "",
'$pls_answer' => L10n::t('Please answer the following:'),
'$does_know_you' => ['knowyou', sprintf(L10n::t('Does %s know you?'),$ret["name"]), false, '', [L10n::t('No'), L10n::t('Yes')]],
'$does_know_you' => ['knowyou', L10n::t('Does %s know you?', $ret["name"]), false, '', [L10n::t('No'), L10n::t('Yes')]],
'$add_note' => L10n::t('Add a personal note:'),
'$page_desc' => "",
'$friendica' => "",
@ -182,8 +182,8 @@ function follow_content(App $a) {
if ($gcontact_id <> 0) {
$o .= replace_macros(get_markup_template('section_title.tpl'),
['$title' => L10n::t('Status Messages and Posts')
]);
['$title' => L10n::t('Status Messages and Posts')]
);
// Show last public posts
$o .= Contact::getPostsFromUrl($ret["url"]);

View file

@ -99,7 +99,7 @@ function fsuggest_content(App $a)
$o = '<h3>' . L10n::t('Suggest Friends') . '</h3>';
$o .= '<div id="fsuggest-desc" >' . sprintf(L10n::t('Suggest a friend for %s'), $contact['name']) . '</div>';
$o .= '<div id="fsuggest-desc" >' . L10n::t('Suggest a friend for %s', $contact['name']) . '</div>';
$o .= '<form id="fsuggest-form" action="fsuggest/' . $contact_id . '" method="post" >';

View file

@ -36,7 +36,7 @@ function home_content(App $a) {
}
$customhome = false;
$defaultheader = '<h1>'.((x($a->config,'sitename')) ? sprintf(L10n::t("Welcome to %s"), $a->config['sitename']) : "").'</h1>';
$defaultheader = '<h1>'.((x($a->config,'sitename')) ? L10n::t("Welcome to %s", $a->config['sitename']) : "").'</h1>';
$homefilepath = $a->basepath . "/home.html";
$cssfilepath = $a->basepath . "/home.css";

View file

@ -12,8 +12,8 @@ use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Protocol\Email;
function invite_post(App $a) {
function invite_post(App $a)
{
if (! local_user()) {
notice(L10n::t('Permission denied.') . EOL);
return;
@ -47,11 +47,10 @@ function invite_post(App $a) {
}
foreach ($recips as $recip) {
$recip = trim($recip);
if (! valid_email($recip)) {
notice(sprintf(L10n::t('%s : Not a valid email address.'), $recip) . EOL);
notice(L10n::t('%s : Not a valid email address.', $recip) . EOL);
continue;
}
@ -91,15 +90,14 @@ function invite_post(App $a) {
return;
}
} else {
notice(sprintf(L10n::t('%s : Message delivery failed.'), $recip) . EOL);
notice(L10n::t('%s : Message delivery failed.', $recip) . EOL);
}
}
notice(sprintf(L10n::tt("%d message sent.", "%d messages sent.", $total), $total) . EOL);
notice(L10n::tt("%d message sent.", "%d messages sent.", $total) . EOL);
return;
}
function invite_content(App $a) {
if (! local_user()) {
@ -122,17 +120,17 @@ function invite_content(App $a) {
$dirloc = Config::get('system', 'directory');
if (strlen($dirloc)) {
if ($a->config['register_policy'] == REGISTER_CLOSED) {
$linktxt = sprintf(L10n::t('Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.'), $dirloc . '/servers');
$linktxt = L10n::t('Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.', $dirloc . '/servers');
} else {
$linktxt = sprintf(L10n::t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), System::baseUrl())
. "\r\n" . "\r\n" . sprintf(L10n::t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join.'), $dirloc . '/servers');
$linktxt = L10n::t('To accept this invitation, please visit and register at %s or any other public Friendica website.', System::baseUrl())
. "\r\n" . "\r\n" . L10n::t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join.', $dirloc . '/servers');
}
} else { // there is no global directory URL defined
if ($a->config['register_policy'] == REGISTER_CLOSED) {
$o = L10n::t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
return $o;
} else {
$linktxt = sprintf(L10n::t('To accept this invitation, please visit and register at %s.'), System::baseUrl()
$linktxt = L10n::t('To accept this invitation, please visit and register at %s.', System::baseUrl()
. "\r\n" . "\r\n" . L10n::t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks.'));
}
}

View file

@ -800,14 +800,14 @@ function item_post(App $a) {
if (!strlen($addr)) {
continue;
}
$disclaimer = '<hr />' . sprintf(L10n::t('This message was sent to you by %s, a member of the Friendica social network.'), $a->user['username'])
$disclaimer = '<hr />' . L10n::t('This message was sent to you by %s, a member of the Friendica social network.', $a->user['username'])
. '<br />';
$disclaimer .= sprintf(L10n::t('You may visit them online at %s'), System::baseUrl() . '/profile/' . $a->user['nickname']) . EOL;
$disclaimer .= L10n::t('You may visit them online at %s', System::baseUrl() . '/profile/' . $a->user['nickname']) . EOL;
$disclaimer .= L10n::t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL;
if (!$datarray['title']=='') {
$subject = Email::encodeHeader($datarray['title'], 'UTF-8');
} else {
$subject = Email::encodeHeader('[Friendica]' . ' ' . sprintf(L10n::t('%s posted an update.'), $a->user['username']), 'UTF-8');
$subject = Email::encodeHeader('[Friendica]' . ' ' . L10n::t('%s posted an update.', $a->user['username']), 'UTF-8');
}
$link = '<a href="' . System::baseUrl() . '/profile/' . $a->user['nickname'] . '"><img src="' . $author['thumb'] . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
$html = prepare_body($datarray);

View file

@ -35,14 +35,14 @@ function localtime_content(App $a)
$o .= '<p>' . sprintf(L10n::t('UTC time: %s'), $t) . '</p>';
$o .= '<p>' . L10n::t('UTC time: %s', $t) . '</p>';
if ($_REQUEST['timezone']) {
$o .= '<p>' . sprintf(L10n::t('Current timezone: %s'), $_REQUEST['timezone']) . '</p>';
$o .= '<p>' . L10n::t('Current timezone: %s', $_REQUEST['timezone']) . '</p>';
}
if (x($a->data, 'mod-localtime')) {
$o .= '<p>' . sprintf(L10n::t('Converted localtime: %s'), $a->data['mod-localtime']) . '</p>';
$o .= '<p>' . L10n::t('Converted localtime: %s', $a->data['mod-localtime']) . '</p>';
}

View file

@ -168,7 +168,7 @@ function notifications_content(App $a) {
'$str_notifytype' => L10n::t('Notification type: '),
'$notify_type' => $it['notify_type'],
'$intro_id' => $it['intro_id'],
'$madeby' => sprintf(L10n::t('suggested by %s'), $it['madeby']),
'$madeby' => L10n::t('suggested by %s', $it['madeby']),
'$contact_id' => $it['contact-id'],
'$photo' => $it['photo'],
'$fullname' => $it['name'],
@ -199,13 +199,13 @@ function notifications_content(App $a) {
$lbl_knowyou = L10n::t('Claims to be known to you: ');
$knowyou = (($it['knowyou']) ? L10n::t('yes') : L10n::t('no'));
$helptext = L10n::t('Shall your connection be bidirectional or not?');
$helptext2 = sprintf(L10n::t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.'), $it['name'], $it['name']);
$helptext3 = sprintf(L10n::t('Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed.'), $it['name']);
$helptext2 = L10n::t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $it['name'], $it['name']);
$helptext3 = L10n::t('Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed.', $it['name']);
} else {
$knowyou = '';
$helptext = L10n::t('Shall your connection be bidirectional or not?');
$helptext2 = sprintf(L10n::t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.'), $it['name'], $it['name']);
$helptext3 = sprintf(L10n::t('Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed.'), $it['name']);
$helptext2 = L10n::t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $it['name'], $it['name']);
$helptext3 = L10n::t('Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed.', $it['name']);
}
}
@ -311,7 +311,7 @@ function notifications_content(App $a) {
// It doesn't make sense to show the Show unread / Show all link visible if the user is on the
// "Show all" page and there are no notifications. So we will hide it.
if($show == 0 || intval($show) && $notifs['total'] > 0) {
if ($show == 0 || intval($show) && $notifs['total'] > 0) {
$notif_show_lnk = [
'href' => ($show ? 'notifications/'.$notifs['ident'] : 'notifications/'.$notifs['ident'].'?show=all' ),
'text' => ($show ? L10n::t('Show unread') : L10n::t('Show all')),
@ -319,8 +319,9 @@ function notifications_content(App $a) {
}
// Output if there aren't any notifications available
if($notifs['total'] == 0)
$notif_nocontent = sprintf(L10n::t('No more %s notifications.'), $notifs['ident']);
if ($notifs['total'] == 0) {
$notif_nocontent = L10n::t('No more %s notifications.', $notifs['ident']);
}
}
$o .= replace_macros($notif_tpl, [

View file

@ -82,7 +82,7 @@ function profile_photo_post(App $a) {
$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'],$base_image['filename'], L10n::t('Profile Photos'), 4, $is_default_profile);
if ($r === false) {
notice(sprintf(L10n::t('Image size reduction [%s] failed.'),"175") . EOL);
notice(L10n::t('Image size reduction [%s] failed.', "175") . EOL);
}
$Image->scaleDown(80);
@ -90,7 +90,7 @@ function profile_photo_post(App $a) {
$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'],$base_image['filename'], L10n::t('Profile Photos'), 5, $is_default_profile);
if ($r === false) {
notice( sprintf(L10n::t('Image size reduction [%s] failed.'),"80") . EOL );
notice(L10n::t('Image size reduction [%s] failed.', "80") . EOL);
}
$Image->scaleDown(48);
@ -98,7 +98,7 @@ function profile_photo_post(App $a) {
$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'],$base_image['filename'], L10n::t('Profile Photos'), 6, $is_default_profile);
if ($r === false) {
notice( sprintf(L10n::t('Image size reduction [%s] failed.'),"48") . EOL );
notice(L10n::t('Image size reduction [%s] failed.', "48") . EOL);
}
// If setting for the default profile, unset the profile photo flag from any other photos I own
@ -160,7 +160,7 @@ function profile_photo_post(App $a) {
$maximagesize = Config::get('system', 'maximagesize');
if (($maximagesize) && ($filesize > $maximagesize)) {
notice(sprintf(L10n::t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL);
notice(L10n::t('Image exceeds size limit of %s', formatBytes($maximagesize)) . EOL);
@unlink($src);
return;
}
@ -325,7 +325,7 @@ function profile_photo_crop_ui_head(App $a, Image $Image) {
$r = Photo::store($Image, local_user(), 0, $hash, $filename, L10n::t('Profile Photos'), 1);
if ($r === false) {
notice(sprintf(L10n::t('Image size reduction [%s] failed.'), "640") . EOL);
notice(L10n::t('Image size reduction [%s] failed.', "640") . EOL);
} else {
$smallest = 1;
}

View file

@ -581,10 +581,10 @@ function profile_activity($changed, $value) {
$prof = '[url=' . $self[0]['url'] . '?tab=profile' . ']' . L10n::t('public profile') . '[/url]';
if ($t == 1 && strlen($value)) {
$message = sprintf(L10n::t('%1$s changed %2$s to &ldquo;%3$s&rdquo;'), $A, $changes, $value);
$message .= "\n\n" . sprintf(L10n::t(' - Visit %1$s\'s %2$s'), $A, $prof);
$message = L10n::t('%1$s changed %2$s to &ldquo;%3$s&rdquo;', $A, $changes, $value);
$message .= "\n\n" . L10n::t(' - Visit %1$s\'s %2$s', $A, $prof);
} else {
$message = sprintf(L10n::t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes);
$message = L10n::t('%1$s has an updated %2$s, changing %3$s.', $A, $prof, $changes);
}

View file

@ -90,7 +90,7 @@ function user_deny($hash)
dba::delete('user', ['uid' => $register[0]['uid']]);
dba::delete('register', ['hash' => $register[0]['hash']]);
notice(sprintf(L10n::t('Registration revoked for %s'), $user[0]['username']) . EOL);
notice(L10n::t('Registration revoked for %s', $user[0]['username']) . EOL);
return true;
}

View file

@ -226,10 +226,11 @@ function search_content(App $a) {
}
if ($tag)
$title = sprintf(L10n::t('Items tagged with: %s'), $search);
else
$title = sprintf(L10n::t('Results for: %s'), $search);
if ($tag) {
$title = L10n::t('Items tagged with: %s', $search);
} else {
$title = L10n::t('Results for: %s', $search);
}
$o .= replace_macros(get_markup_template("section_title.tpl"),[
'$title' => $title

View file

@ -110,7 +110,7 @@ function viewcontacts_content(App $a)
$contacts[] = [
'id' => $rr['id'],
'img_hover' => sprintf(L10n::t('Visit %s\'s profile [%s]'), $contact_details['name'], $rr['url']),
'img_hover' => L10n::t('Visit %s\'s profile [%s]', $contact_details['name'], $rr['url']),
'photo_menu' => Contact::photoMenu($rr),
'thumb' => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
'name' => htmlentities(substr($contact_details['name'], 0, 20)),

View file

@ -109,7 +109,7 @@ function wall_attach_post(App $a) {
}
if(($maxfilesize) && ($filesize > $maxfilesize)) {
$msg = sprintf(L10n::t('File exceeds size limit of %s'), formatBytes($maxfilesize));
$msg = L10n::t('File exceeds size limit of %s', formatBytes($maxfilesize));
if ($r_json) {
echo json_encode(['error'=>$msg]);
} else {

View file

@ -180,7 +180,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
$maximagesize = Config::get('system', 'maximagesize');
if (($maximagesize) && ($filesize > $maximagesize)) {
$msg = sprintf(L10n::t('Image exceeds size limit of %s'), formatBytes($maximagesize));
$msg = L10n::t('Image exceeds size limit of %s', formatBytes($maximagesize));
if ($r_json) {
echo json_encode(['error'=>$msg]);
} else {

View file

@ -46,7 +46,7 @@ function wallmessage_post(App $a) {
);
if ($r[0]['total'] > $user['cntunkmail']) {
notice(sprintf(L10n::t('Number of daily wall messages for %s exceeded. Message failed.', $user['username'])));
notice(L10n::t('Number of daily wall messages for %s exceeded. Message failed.', $user['username']));
return;
}
@ -109,7 +109,7 @@ function wallmessage_content(App $a) {
);
if ($r[0]['total'] > $user['cntunkmail']) {
notice(sprintf(L10n::t('Number of daily wall messages for %s exceeded. Message failed.', $user['username'])));
notice(L10n::t('Number of daily wall messages for %s exceeded. Message failed.', $user['username']));
return;
}
@ -130,7 +130,7 @@ function wallmessage_content(App $a) {
$tpl = get_markup_template('wallmessage.tpl');
$o .= replace_macros($tpl, [
'$header' => L10n::t('Send Private Message'),
'$subheader' => sprintf(L10n::t('If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders.'), $user['username']),
'$subheader' => L10n::t('If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders.', $user['username']),
'$to' => L10n::t('To:'),
'$subject' => L10n::t('Subject:'),
'$recipname' => $user['username'],