Review sprintf

remove more sprintf calls

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 31d074276ffe7c6f9f385f3a76885d485cfa1724..67d10ef38cf3c4238efd93f3b3dd883ed651fd88 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -357,8 +357,7 @@ function populate_acl($user = null, $show_jotnets = false) {
 
                        Addon::callHooks('jot_networks', $jotnets);
                } else {
-                       $jotnets .= sprintf(L10n::t('Connectors disabled, since "%s" is enabled.'),
-                                           L10n::t('Hide your profile details from unknown viewers?'));
+                       $jotnets .= L10n::t('Connectors disabled, since "%s" is enabled.', 'Hide your profile details from unknown viewers?');
                }
        }
 

diff --git a/include/api.php b/include/api.php
index aeab06cf158bb5529fa43550289c6125794a9342..b8f79ce6f66756403aefac631ae1e9ff4ba55390 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -1177,8 +1177,8 @@ function api_statuses_update($type)
 
                        if ($posts_day > $throttle_day) {
                                logger('Daily posting limit reached for user '.api_user(), LOGGER_DEBUG);
-                               // die(api_error($type, sprintf(L10n::t("Daily posting limit of %d posts reached. The post was rejected."), $throttle_day)));
-                               throw new TooManyRequestsException(sprintf(L10n::t("Daily posting limit of %d posts reached. The post was rejected."), $throttle_day));
+                               // die(api_error($type, L10n::t("Daily posting limit of %d posts reached. The post was rejected.", $throttle_day));
+                               throw new TooManyRequestsException(L10n::t("Daily posting limit of %d posts reached. The post was rejected.", $throttle_day));
                        }
                }
 
@@ -1201,8 +1201,8 @@ function api_statuses_update($type)
 
                        if ($posts_week > $throttle_week) {
                                logger('Weekly posting limit reached for user '.api_user(), LOGGER_DEBUG);
-                               // die(api_error($type, sprintf(L10n::t("Weekly posting limit of %d posts reached. The post was rejected."), $throttle_week)));
-                               throw new TooManyRequestsException(sprintf(L10n::t("Weekly posting limit of %d posts reached. The post was rejected."), $throttle_week));
+                               // die(api_error($type, L10n::t("Weekly posting limit of %d posts reached. The post was rejected.", $throttle_week)));
+                               throw new TooManyRequestsException(L10n::t("Weekly posting limit of %d posts reached. The post was rejected.", $throttle_week));
                        }
                }
 
@@ -1225,8 +1225,8 @@ function api_statuses_update($type)
 
                        if ($posts_month > $throttle_month) {
                                logger('Monthly posting limit reached for user '.api_user(), LOGGER_DEBUG);
-                               // die(api_error($type, sprintf(L10n::t("Monthly posting limit of %d posts reached. The post was rejected."), $throttle_month)));
-                               throw new TooManyRequestsException(sprintf(L10n::t("Monthly posting limit of %d posts reached. The post was rejected."), $throttle_month));
+                               // die(api_error($type, L10n::t("Monthly posting limit of %d posts reached. The post was rejected.", $throttle_month));
+                               throw new TooManyRequestsException(L10n::t("Monthly posting limit of %d posts reached. The post was rejected.", $throttle_month));
                        }
                }
 

diff --git a/include/datetime.php b/include/datetime.php
index a8320d33216a448fd70647f3eda112384052dcc6..cbfc9b6d232a363f0d14a41b4fa9da27c3d9033c 100644 (file)
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -611,8 +611,8 @@ function update_contact_birthdays() {
                                continue;
                        }
 
-                       $bdtext = sprintf(L10n::t('%s\'s birthday'), $rr['name']);
-                       $bdtext2 = sprintf(L10n::t('Happy Birthday %s'), ' [url=' . $rr['url'] . ']' . $rr['name'] . '[/url]') ;
+                       $bdtext = L10n::t('%s\'s birthday', $rr['name']);
+                       $bdtext2 = L10n::t('Happy Birthday %s', ' [url=' . $rr['url'] . ']' . $rr['name'] . '[/url]');
 
                        q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`,`adjust`)
                                VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%d' ) ",

diff --git a/include/dba.php b/include/dba.php
index d3b26c807252daa06c8491345d6550ed2c1746a0..154217a4c50a06049d82cb77e759ccb0365e4bb5 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -55,7 +55,7 @@ class dba {
                if ($install) {
                        if (strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
                                if (! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
-                                       self::$error = sprintf(L10n::t('Cannot locate DNS info for database server \'%s\''), $server);
+                                       self::$error = L10n::t('Cannot locate DNS info for database server \'%s\'', $server);
                                        self::$connected = false;
                                        self::$db = null;
                                        return false;

diff --git a/include/enotify.php b/include/enotify.php
index 56c2bc5d853dc3f970470e7c28702d6ee1c6e6e6..44fca484cc1f17cea5d582d760b13b0af6386b38 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -35,9 +35,9 @@ function notification($params)
        $thanks = L10n::t('Thank You,');
        $sitename = $a->config['sitename'];
        if (!x($a->config['admin_name'])) {
-           $site_admin = sprintf(L10n::t('%s Administrator'), $sitename);
+               $site_admin = L10n::t('%s Administrator', $sitename);
        } else {
-           $site_admin = sprintf(L10n::t('%1$s, %2$s Administrator'), $a->config['admin_name'], $sitename);
+               $site_admin = L10n::t('%1$s, %2$s Administrator', $a->config['admin_name'], $sitename);
        }
 
        $sender_name = $sitename;
@@ -96,10 +96,10 @@ function notification($params)
        }
 
        if ($params['type'] == NOTIFY_MAIL) {
-               $subject = sprintf(L10n::t('[Friendica:Notify] New mail received at %s'), $sitename);
+               $subject = L10n::t('[Friendica:Notify] New mail received at %s', $sitename);
 
-               $preamble = sprintf(L10n::t('%1$s sent you a new private message at %2$s.'), $params['source_name'], $sitename);
-               $epreamble = sprintf(L10n::t('%1$s sent you %2$s.'), '[url='.$params['source_link'].']'.$params['source_name'].'[/url]', '[url=$itemlink]'.L10n::t('a private message').'[/url]');
+               $preamble = L10n::t('%1$s sent you a new private message at %2$s.', $params['source_name'], $sitename);
+               $epreamble = L10n::t('%1$s sent you %2$s.', '[url='.$params['source_link'].']'.$params['source_name'].'[/url]', '[url=$itemlink]'.L10n::t('a private message').'[/url]');
 
                $sitelink = L10n::t('Please visit %s to view and/or reply to your private messages.');
                $tsitelink = sprintf($sitelink, $siteurl.'/message/'.$params['item']['id']);
@@ -139,26 +139,29 @@ function notification($params)
                $item_post_type = item_post_type($item);
 
                // "a post"
-               $dest_str = sprintf(L10n::t('%1$s commented on [url=%2$s]a %3$s[/url]'),
-                                                               '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
-                                                               $itemlink,
-                                                               $item_post_type);
+               $dest_str = L10n::t('%1$s commented on [url=%2$s]a %3$s[/url]',
+                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
+                       $itemlink,
+                       $item_post_type
+               );
 
                // "George Bull's post"
                if ($item) {
-                       $dest_str = sprintf(L10n::t('%1$s commented on [url=%2$s]%3$s\'s %4$s[/url]'),
-                                               '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
-                                               $itemlink,
-                                               $item['author-name'],
-                                               $item_post_type);
+                       $dest_str = L10n::t('%1$s commented on [url=%2$s]%3$s\'s %4$s[/url]',
+                               '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
+                               $itemlink,
+                               $item['author-name'],
+                               $item_post_type
+                       );
                }
 
                // "your post"
                if (DBM::is_result($item) && $item['owner-name'] == $item['author-name'] && $item['wall']) {
-                       $dest_str = sprintf(L10n::t('%1$s commented on [url=%2$s]your %3$s[/url]'),
-                                                               '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
-                                                               $itemlink,
-                                                               $item_post_type);
+                       $dest_str = L10n::t('%1$s commented on [url=%2$s]your %3$s[/url]',
+                               '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
+                               $itemlink,
+                               $item_post_type
+                       );
                }
 
                // Some mail softwares relies on subject field for threading.
@@ -166,9 +169,9 @@ function notification($params)
                // Before this we have the name of the replier on the subject rendering
                // differents subjects for messages on the same thread.
 
-               $subject = sprintf(L10n::t('[Friendica:Notify] Comment to conversation #%1$d by %2$s'), $parent_id, $params['source_name']);
+               $subject = L10n::t('[Friendica:Notify] Comment to conversation #%1$d by %2$s', $parent_id, $params['source_name']);
 
-               $preamble = sprintf(L10n::t('%s commented on an item/conversation you have been following.'), $params['source_name']);
+               $preamble = L10n::t('%s commented on an item/conversation you have been following.', $params['source_name']);
                $epreamble = $dest_str;
 
                $sitelink = L10n::t('Please visit %s to view and/or reply to the conversation.');
@@ -178,12 +181,13 @@ function notification($params)
        }
 
        if ($params['type'] == NOTIFY_WALL) {
-               $subject = sprintf(L10n::t('[Friendica:Notify] %s posted to your profile wall'), $params['source_name']);
+               $subject = L10n::t('[Friendica:Notify] %s posted to your profile wall', $params['source_name']);
 
-               $preamble = sprintf(L10n::t('%1$s posted to your profile wall at %2$s'), $params['source_name'], $sitename);
-               $epreamble = sprintf(L10n::t('%1$s posted to [url=%2$s]your wall[/url]'),
-                                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
-                                       $params['link']);
+               $preamble = L10n::t('%1$s posted to your profile wall at %2$s', $params['source_name'], $sitename);
+               $epreamble = L10n::t('%1$s posted to [url=%2$s]your wall[/url]',
+                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
+                       $params['link']
+               );
 
                $sitelink = L10n::t('Please visit %s to view and/or reply to the conversation.');
                $tsitelink = sprintf($sitelink, $siteurl);
@@ -192,12 +196,13 @@ function notification($params)
        }
 
        if ($params['type'] == NOTIFY_TAGSELF) {
-               $subject = sprintf(L10n::t('[Friendica:Notify] %s tagged you'), $params['source_name']);
+               $subject = L10n::t('[Friendica:Notify] %s tagged you', $params['source_name']);
 
-               $preamble = sprintf(L10n::t('%1$s tagged you at %2$s'), $params['source_name'], $sitename);
-               $epreamble = sprintf(L10n::t('%1$s [url=%2$s]tagged you[/url].'),
-                                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
-                                       $params['link']);
+               $preamble = L10n::t('%1$s tagged you at %2$s', $params['source_name'], $sitename);
+               $epreamble = L10n::t('%1$s [url=%2$s]tagged you[/url].',
+                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
+                       $params['link']
+               );
 
                $sitelink = L10n::t('Please visit %s to view and/or reply to the conversation.');
                $tsitelink = sprintf($sitelink, $siteurl);
@@ -206,12 +211,13 @@ function notification($params)
        }
 
        if ($params['type'] == NOTIFY_SHARE) {
-               $subject = sprintf(L10n::t('[Friendica:Notify] %s shared a new post'), $params['source_name']);
+               $subject = L10n::t('[Friendica:Notify] %s shared a new post', $params['source_name']);
 
-               $preamble = sprintf(L10n::t('%1$s shared a new post at %2$s'), $params['source_name'], $sitename);
-               $epreamble = sprintf(L10n::t('%1$s [url=%2$s]shared a post[/url].'),
-                                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
-                                       $params['link']);
+               $preamble = L10n::t('%1$s shared a new post at %2$s', $params['source_name'], $sitename);
+               $epreamble = L10n::t('%1$s [url=%2$s]shared a post[/url].',
+                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
+                       $params['link']
+               );
 
                $sitelink = L10n::t('Please visit %s to view and/or reply to the conversation.');
                $tsitelink = sprintf($sitelink, $siteurl);
@@ -220,12 +226,13 @@ function notification($params)
        }
 
        if ($params['type'] == NOTIFY_POKE) {
-               $subject = sprintf(L10n::t('[Friendica:Notify] %1$s poked you'), $params['source_name']);
+               $subject = L10n::t('[Friendica:Notify] %1$s poked you', $params['source_name']);
 
-               $preamble = sprintf(L10n::t('%1$s poked you at %2$s'), $params['source_name'], $sitename);
-               $epreamble = sprintf(L10n::t('%1$s [url=%2$s]poked you[/url].'),
-                                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
-                                       $params['link']);
+               $preamble = L10n::t('%1$s poked you at %2$s', $params['source_name'], $sitename);
+               $epreamble = L10n::t('%1$s [url=%2$s]poked you[/url].',
+                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
+                       $params['link']
+               );
 
                $subject = str_replace('poked', L10n::t($params['activity']), $subject);
                $preamble = str_replace('poked', L10n::t($params['activity']), $preamble);
@@ -238,12 +245,13 @@ function notification($params)
        }
 
        if ($params['type'] == NOTIFY_TAGSHARE) {
-               $subject = sprintf(L10n::t('[Friendica:Notify] %s tagged your post'), $params['source_name']);
+               $subject = L10n::t('[Friendica:Notify] %s tagged your post', $params['source_name']);
 
-               $preamble = sprintf(L10n::t('%1$s tagged your post at %2$s'), $params['source_name'], $sitename);
-               $epreamble = sprintf(L10n::t('%1$s tagged [url=%2$s]your post[/url]'),
-                                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
-                                       $itemlink);
+               $preamble = L10n::t('%1$s tagged your post at %2$s', $params['source_name'], $sitename);
+               $epreamble = L10n::t('%1$s tagged [url=%2$s]your post[/url]',
+                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
+                       $itemlink
+               );
 
                $sitelink = L10n::t('Please visit %s to view and/or reply to the conversation.');
                $tsitelink = sprintf($sitelink, $siteurl);
@@ -252,14 +260,15 @@ function notification($params)
        }
 
        if ($params['type'] == NOTIFY_INTRO) {
-               $subject = sprintf(L10n::t('[Friendica:Notify] Introduction received'));
+               $subject = L10n::t('[Friendica:Notify] Introduction received');
 
-               $preamble = sprintf(L10n::t('You\'ve received an introduction from \'%1$s\' at %2$s'), $params['source_name'], $sitename);
-               $epreamble = sprintf(L10n::t('You\'ve received [url=%1$s]an introduction[/url] from %2$s.'),
-                                       $itemlink,
-                                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]');
+               $preamble = L10n::t('You\'ve received an introduction from \'%1$s\' at %2$s', $params['source_name'], $sitename);
+               $epreamble = L10n::t('You\'ve received [url=%1$s]an introduction[/url] from %2$s.',
+                       $itemlink,
+                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
+               );
 
-               $body = sprintf(L10n::t('You may visit their profile at %s'), $params['source_link']);
+               $body = L10n::t('You may visit their profile at %s', $params['source_link']);
 
                $sitelink = L10n::t('Please visit %s to approve or reject the introduction.');
                $tsitelink = sprintf($sitelink, $siteurl);
@@ -269,21 +278,23 @@ function notification($params)
                switch ($params['verb']) {
                        case ACTIVITY_FRIEND:
                                // someone started to share with user (mostly OStatus)
-                               $subject = sprintf(L10n::t('[Friendica:Notify] A new person is sharing with you'));
+                               $subject = L10n::t('[Friendica:Notify] A new person is sharing with you');
 
-                               $preamble = sprintf(L10n::t('%1$s is sharing with you at %2$s'), $params['source_name'], $sitename);
-                               $epreamble = sprintf(L10n::t('%1$s is sharing with you at %2$s'),
-                                                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
-                                                       $sitename);
+                               $preamble = L10n::t('%1$s is sharing with you at %2$s', $params['source_name'], $sitename);
+                               $epreamble = L10n::t('%1$s is sharing with you at %2$s',
+                                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
+                                       $sitename
+                               );
                                break;
                        case ACTIVITY_FOLLOW:
                                // someone started to follow the user (mostly OStatus)
-                               $subject = sprintf(L10n::t('[Friendica:Notify] You have a new follower'));
+                               $subject = L10n::t('[Friendica:Notify] You have a new follower');
 
-                               $preamble = sprintf(L10n::t('You have a new follower at %2$s : %1$s'), $params['source_name'], $sitename);
-                               $epreamble = sprintf(L10n::t('You have a new follower at %2$s : %1$s'),
-                                                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
-                                                       $sitename);
+                               $preamble = L10n::t('You have a new follower at %2$s : %1$s', $params['source_name'], $sitename);
+                               $epreamble = L10n::t('You have a new follower at %2$s : %1$s',
+                                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
+                                       $sitename
+                               );
                                break;
                        default:
                                // ACTIVITY_REQ_FRIEND is default activity for notifications
@@ -292,17 +303,18 @@ function notification($params)
        }
 
        if ($params['type'] == NOTIFY_SUGGEST) {
-               $subject = sprintf(L10n::t('[Friendica:Notify] Friend suggestion received'));
+               $subject = L10n::t('[Friendica:Notify] Friend suggestion received');
 
-               $preamble = sprintf(L10n::t('You\'ve received a friend suggestion from \'%1$s\' at %2$s'), $params['source_name'], $sitename);
-               $epreamble = sprintf(L10n::t('You\'ve received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s.'),
-                                       $itemlink,
-                                       '[url='.$params['item']['url'].']'.$params['item']['name'].'[/url]',
-                                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]');
+               $preamble = L10n::t('You\'ve received a friend suggestion from \'%1$s\' at %2$s', $params['source_name'], $sitename);
+               $epreamble = L10n::t('You\'ve received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s.',
+                       $itemlink,
+                       '[url='.$params['item']['url'].']'.$params['item']['name'].'[/url]',
+                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
+               );
 
                $body = L10n::t('Name:').' '.$params['item']['name']."\n";
                $body .= L10n::t('Photo:').' '.$params['item']['photo']."\n";
-               $body .= sprintf(L10n::t('You may visit their profile at %s'), $params['item']['url']);
+               $body .= L10n::t('You may visit their profile at %s', $params['item']['url']);
 
                $sitelink = L10n::t('Please visit %s to approve or reject the suggestion.');
                $tsitelink = sprintf($sitelink, $siteurl);
@@ -312,12 +324,13 @@ function notification($params)
 
        if ($params['type'] == NOTIFY_CONFIRM) {
                if ($params['verb'] == ACTIVITY_FRIEND) { // mutual connection
-                       $subject = sprintf(L10n::t('[Friendica:Notify] Connection accepted'));
+                       $subject = L10n::t('[Friendica:Notify] Connection accepted');
 
-                       $preamble = sprintf(L10n::t('\'%1$s\' has accepted your connection request at %2$s'), $params['source_name'], $sitename);
-                       $epreamble = sprintf(L10n::t('%2$s has accepted your [url=%1$s]connection request[/url].'),
-                                               $itemlink,
-                                               '[url='.$params['source_link'].']'.$params['source_name'].'[/url]');
+                       $preamble = L10n::t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename);
+                       $epreamble = L10n::t('%2$s has accepted your [url=%1$s]connection request[/url].',
+                               $itemlink,
+                               '[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
+                       );
 
                        $body =  L10n::t('You are now mutual friends and may exchange status updates, photos, and email without restriction.');
 
@@ -326,16 +339,17 @@ function notification($params)
                        $hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
                        $itemlink =  $params['link'];
                } else { // ACTIVITY_FOLLOW
-                       $subject = sprintf(L10n::t('[Friendica:Notify] Connection accepted'));
+                       $subject = L10n::t('[Friendica:Notify] Connection accepted');
 
-                       $preamble = sprintf(L10n::t('\'%1$s\' has accepted your connection request at %2$s'), $params['source_name'], $sitename);
-                       $epreamble = sprintf(L10n::t('%2$s has accepted your [url=%1$s]connection request[/url].'),
-                                               $itemlink,
-                                               '[url='.$params['source_link'].']'.$params['source_name'].'[/url]');
+                       $preamble = L10n::t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename);
+                       $epreamble = L10n::t('%2$s has accepted your [url=%1$s]connection request[/url].',
+                               $itemlink,
+                               '[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
+                       );
 
-                       $body =  sprintf(L10n::t('\'%1$s\' has chosen to accept you a "fan", which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically.'), $params['source_name']);
+                       $body =  L10n::t('\'%1$s\' has chosen to accept you a "fan", which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically.', $params['source_name']);
                        $body .= "\n\n";
-                       $body .= sprintf(L10n::t('\'%1$s\' may choose to extend this into a two-way or more permissive relationship in the future.'), $params['source_name']);
+                       $body .= L10n::t('\'%1$s\' may choose to extend this into a two-way or more permissive relationship in the future.', $params['source_name']);
 
                        $sitelink = L10n::t('Please visit %s  if you wish to make any changes to this relationship.');
                        $tsitelink = sprintf($sitelink, $siteurl);
@@ -347,15 +361,19 @@ function notification($params)
        if ($params['type'] == NOTIFY_SYSTEM) {
                switch($params['event']) {
                        case "SYSTEM_REGISTER_REQUEST":
-                               $subject = sprintf(L10n::t('[Friendica System:Notify] registration request'));
+                               $subject = L10n::t('[Friendica System:Notify] registration request');
 
-                               $preamble = sprintf(L10n::t('You\'ve received a registration request from \'%1$s\' at %2$s'), $params['source_name'], $sitename);
-                               $epreamble = sprintf(L10n::t('You\'ve received a [url=%1$s]registration request[/url] from %2$s.'),
-                                                       $itemlink,
-                                                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]');
-
-                               $body = sprintf(L10n::t('Full Name:     %1$s\nSite Location:    %2$s\nLogin Name:       %3$s (%4$s)'),
-                                                                       $params['source_name'], $siteurl, $params['source_mail'], $params['source_nick']);
+                               $preamble = L10n::t('You\'ve received a registration request from \'%1$s\' at %2$s', $params['source_name'], $sitename);
+                               $epreamble = L10n::t('You\'ve received a [url=%1$s]registration request[/url] from %2$s.',
+                                       $itemlink,
+                                       '[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
+                               );
+
+                               $body = L10n::t('Full Name:     %1$s\nSite Location:    %2$s\nLogin Name:       %3$s (%4$s)',
+                                       $params['source_name'],
+                                       $siteurl, $params['source_mail'],
+                                       $params['source_nick']
+                               );
 
                                $sitelink = L10n::t('Please visit %s to approve or reject the request.');
                                $tsitelink = sprintf($sitelink, $params['link']);

diff --git a/mod/allfriends.php b/mod/allfriends.php
index 7840699a8e7c668c929647403ad3e1e6d605a997..bf852419d21f5cf27cb7dbcada9129ebad56853f 100644 (file)
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -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),

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index f0d98dab7f668c1d0d9584407222e090fccde5ca..01477fd434b506261bbc932f85ac2f7bf5039a78 100644 (file)
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -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.

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 158794791825718a2b2b4f8db0ed7a139d0cc8b5..5c9a0693b179863557f0b92e59a47fed51a8d582 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -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'),

diff --git a/mod/dirfind.php b/mod/dirfind.php
index 36ba714fac666fe7b66313c5ae4415a4b4d6b286..f1119a297998d1276114a7a6d99369deae69f759 100644 (file)
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -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 = '';

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index d25e485b4817ba6c4b6e783f20e582fe948c7e98..631888d7e462f181571d12391957b9e044abd4da 100644 (file)
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -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')
                                ]);
                        }
 

diff --git a/mod/follow.php b/mod/follow.php
index 75cb8dfdef90bbf92517630f041880e5b7bee52d..a3270e30dd610ed8f6e128243748de6a43510c48 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -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"]);

diff --git a/mod/fsuggest.php b/mod/fsuggest.php
index f442695b0b907fece52d53aedfbf2782c1abffd6..99a7f7d525d775b373349c7073e39074c4715ce3 100644 (file)
--- a/mod/fsuggest.php
+++ b/mod/fsuggest.php
@@ -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" >';
 

diff --git a/mod/home.php b/mod/home.php
index b1d00b000f556acf52b41773c205e1a4902128ef..206a1827ea1d67eb4a0a575b2c39f2cdebdc8cea 100644 (file)
--- a/mod/home.php
+++ b/mod/home.php
@@ -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";

diff --git a/mod/invite.php b/mod/invite.php
index 2f3dda092b9f77a9c8ef76b7e3093cfcd8349866..2caba92efc4151ddc5dd15c7a585c7358cd94be6 100644 (file)
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -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.'));
                }
        }

diff --git a/mod/item.php b/mod/item.php
index ac796a24aea2a633f75de654c6643719f9a91ea4..caa8dd835d8524638f26e446b350f6f6ca6141b7 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -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);

diff --git a/mod/localtime.php b/mod/localtime.php
index 9a98abec43b98f30f23487f68664bb536a071c31..f7129656f4dbbd5eb4bed678812045e99ffacf6b 100644 (file)
--- a/mod/localtime.php
+++ b/mod/localtime.php
@@ -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>';
        }
 
 

diff --git a/mod/notifications.php b/mod/notifications.php
index 765a2499b4cd063e247b5932720decee6d3f22e2..64fb52742e3717e32362ce6625a75efd07bd8661 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -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, [

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index ddb53fcdf31d654757820e79bda4eb2a0e054cae..8b4d8076db4157b9943be60f8f51c9fa9f4f7d1c 100644 (file)
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -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;
                }

diff --git a/mod/profiles.php b/mod/profiles.php
index 86fc2a9594a73532884c061cb9dac11585c36a9b..4ae946e6a27003938a1b42e7782b24e4ba42d4a7 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -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 “%3$s”'), $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 “%3$s”', $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);
        }
 
 

diff --git a/mod/regmod.php b/mod/regmod.php
index 0600095c9c6d63fd63a7f79fb65d47f0a80f38d5..89e348d5098124e0ba7f72c76e85d18cdea61a81 100644 (file)
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -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;
 }
 

diff --git a/mod/search.php b/mod/search.php
index 57b65df1c4bcc011e8c9b9fe9336065f06061b8c..b48fafe7854ae295d92478f94a8fa754bbcbbf14 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -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

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index 3b81171d7a2968fa6da1180b2ce6ee76f5795806..b45980fec3f6dea1eb68b029269c296af819d15a 100644 (file)
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -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)),

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 8116bbcf4edf47a5354265b3befeb0cad308e698..57d7b2e95279b22d53b3be4d8f3508e9f4d69145 100644 (file)
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -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 {

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 17c48188839cf3d079ad05291045780df99703f1..821fdc2a958a7564904f448330095a248dc44393 100644 (file)
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -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 {

diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index cbebdb779cfba4d401e8168e45540d67bad7de33..250b7d70d0aebc57d48ccd5d259bfcea57ea27dd 100644 (file)
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -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'],

diff --git a/src/Core/L10n.php b/src/Core/L10n.php
index 3e9ba3859f27d765f95a0c64ec651d58bcd07bb0..215c6f6fb11c1c9a682a22c473d4618a145fecdd 100644 (file)
--- a/src/Core/L10n.php
+++ b/src/Core/L10n.php
@@ -132,9 +132,9 @@ class L10n
         * string interpolation (sprintf) with additional optional arguments.
         *
         * Usages:
-        * - t('This is an example')
-        * - t('URL %s returned no result', $url)
-        * - t('Current version: %s, new version: %s', $current_version, $new_version)
+        * - L10n::t('This is an example')
+        * - L10n::t('URL %s returned no result', $url)
+        * - L10n::t('Current version: %s, new version: %s', $current_version, $new_version)
         *
         * @param string $s
         * @return string
@@ -165,8 +165,8 @@ class L10n
         * is performed using the count as parameter.
         *
         * Usages:
-        * - tt('Like', 'Likes', $count)
-        * - tt("%s user deleted", "%s users deleted", count($users))
+        * - L10n::tt('Like', 'Likes', $count)
+        * - L10n::tt("%s user deleted", "%s users deleted", count($users))
         *
         * @global type $lang
         * @param string $singular

diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php
index 196fd1eedc9955d281c5c686a22d35f5cb8648ab..e88b4218b5523182c7ec9ac31bfcc977b5105b49 100644 (file)
--- a/src/Core/NotificationsManager.php
+++ b/src/Core/NotificationsManager.php
@@ -251,7 +251,7 @@ class NotificationsManager extends BaseObject
                                                $default_item_link = System::baseUrl(true) . '/display/' . $it['pguid'];
                                                $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO);
                                                $default_item_url = $it['author-link'];
-                                               $default_item_text = sprintf(L10n::t("%s commented on %s's post"), $it['author-name'], $it['pname']);
+                                               $default_item_text = L10n::t("%s commented on %s's post", $it['author-name'], $it['pname']);
                                                $default_item_when = datetime_convert('UTC', date_default_timezone_get(), $it['created'], 'r');
                                                $default_item_ago = relative_date($it['created']);
                                                break;
@@ -262,8 +262,8 @@ class NotificationsManager extends BaseObject
                                                $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO);
                                                $default_item_url = $it['author-link'];
                                                $default_item_text = (($it['id'] == $it['parent'])
-                                                                       ? sprintf(L10n::t("%s created a new post"), $it['author-name'])
-                                                                       : sprintf(L10n::t("%s commented on %s's post"), $it['author-name'], $it['pname']));
+                                                                       ? L10n::t("%s created a new post", $it['author-name'])
+                                                                       : L10n::t("%s commented on %s's post", $it['author-name'], $it['pname']));
                                                $default_item_when = datetime_convert('UTC', date_default_timezone_get(), $it['created'], 'r');
                                                $default_item_ago = relative_date($it['created']);
                                }
@@ -276,7 +276,7 @@ class NotificationsManager extends BaseObject
                                                        'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
                                                        'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
                                                        'url' => $it['author-link'],
-                                                       'text' => sprintf(L10n::t("%s liked %s's post"), $it['author-name'], $it['pname']),
+                                                       'text' => L10n::t("%s liked %s's post", $it['author-name'], $it['pname']),
                                                        'when' => $default_item_when,
                                                        'ago' => $default_item_ago,
                                                        'seen' => $it['seen']
@@ -289,7 +289,7 @@ class NotificationsManager extends BaseObject
                                                        'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
                                                        'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
                                                        'url' => $it['author-link'],
-                                                       'text' => sprintf(L10n::t("%s disliked %s's post"), $it['author-name'], $it['pname']),
+                                                       'text' => L10n::t("%s disliked %s's post", $it['author-name'], $it['pname']),
                                                        'when' => $default_item_when,
                                                        'ago' => $default_item_ago,
                                                        'seen' => $it['seen']
@@ -302,7 +302,7 @@ class NotificationsManager extends BaseObject
                                                        'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
                                                        'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
                                                        'url' => $it['author-link'],
-                                                       'text' => sprintf(L10n::t("%s is attending %s's event"), $it['author-name'], $it['pname']),
+                                                       'text' => L10n::t("%s is attending %s's event", $it['author-name'], $it['pname']),
                                                        'when' => $default_item_when,
                                                        'ago' => $default_item_ago,
                                                        'seen' => $it['seen']
@@ -315,7 +315,7 @@ class NotificationsManager extends BaseObject
                                                        'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
                                                        'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
                                                        'url' => $it['author-link'],
-                                                       'text' => sprintf(L10n::t("%s is not attending %s's event"), $it['author-name'], $it['pname']),
+                                                       'text' => L10n::t("%s is not attending %s's event", $it['author-name'], $it['pname']),
                                                        'when' => $default_item_when,
                                                        'ago' => $default_item_ago,
                                                        'seen' => $it['seen']
@@ -328,7 +328,7 @@ class NotificationsManager extends BaseObject
                                                        'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
                                                        'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
                                                        'url' => $it['author-link'],
-                                                       'text' => sprintf(L10n::t("%s may attend %s's event"), $it['author-name'], $it['pname']),
+                                                       'text' => L10n::t("%s may attend %s's event", $it['author-name'], $it['pname']),
                                                        'when' => $default_item_when,
                                                        'ago' => $default_item_ago,
                                                        'seen' => $it['seen']
@@ -345,7 +345,7 @@ class NotificationsManager extends BaseObject
                                                        'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
                                                        'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
                                                        'url' => $it['author-link'],
-                                                       'text' => sprintf(L10n::t("%s is now friends with %s"), $it['author-name'], $it['fname']),
+                                                       'text' => L10n::t("%s is now friends with %s", $it['author-name'], $it['fname']),
                                                        'when' => $default_item_when,
                                                        'ago' => $default_item_ago,
                                                        'seen' => $it['seen']

diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index 96491e27b63b3a8f4365478a338e2cfe78cc4b4c..582f4d0c3b429a326cabfea7c565eb456c30b9ad 100644 (file)
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -120,7 +120,7 @@ class UserImport
                }
 
                if (DBM::is_result($r) > 0) {
-                       notice(sprintf(L10n::t("User '%s' already exists on this server!"), $account['user']['nickname']));
+                       notice(L10n::t("User '%s' already exists on this server!", $account['user']['nickname']));
                        return;
                }
 
@@ -133,7 +133,7 @@ class UserImport
                }
 
                if (DBM::is_result($r) > 0) {
-                       notice(sprintf(L10n::t("User '%s' already exists on this server!"), $account['user']['nickname']));
+                       notice(L10n::t("User '%s' already exists on this server!", $account['user']['nickname']));
                        return;
                }
 
@@ -231,7 +231,7 @@ class UserImport
                        }
                }
                if ($errorcount > 0) {
-                       notice(sprintf(L10n::tt("%d contact not imported", "%d contacts not imported", $errorcount), $errorcount));
+                       notice(L10n::tt("%d contact not imported", "%d contacts not imported", $errorcount));
                }
 
                foreach ($account['group'] as &$group) {

diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 083a47646ef4d46651e3dae14149b9b222adeb5d..d569f358aa729a0380b49b7372c720f8457fd280 100644 (file)
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -188,7 +188,7 @@ class DBStructure
         * @return string Error message
         */
        private static function printUpdateError($message) {
-               echo sprintf(L10n::t("\nError %d occurred during database update:\n%s\n"),
+               echo L10n::t("\nError %d occurred during database update:\n%s\n",
                        dba::errorNo(), dba::errorMessage());
 
                return L10n::t('Errors encountered performing database changes: ').$message.EOL;
@@ -206,7 +206,7 @@ class DBStructure
        public static function update($verbose, $action, array $tables = null, array $definition = null) {
                if ($action) {
                        Config::set('system', 'maintenance', 1);
-                       Config::set('system', 'maintenance_reason', sprintf(L10n::t(': Database update'), DBM::date().' '.date('e')));
+                       Config::set('system', 'maintenance_reason', L10n::t(': Database update', DBM::date().' '.date('e')));
                }
 
                $errors = '';
@@ -456,7 +456,7 @@ class DBStructure
                                }
 
                                if ($action) {
-                                       Config::set('system', 'maintenance_reason', sprintf(L10n::t('%s: updating %s table.'), DBM::date().' '.date('e'), $name));
+                                       Config::set('system', 'maintenance_reason', L10n::t('%s: updating %s table.', DBM::date().' '.date('e'), $name));
 
                                        // Ensure index conversion to unique removes duplicates
                                        if ($is_unique && ($temp_name != $name)) {

diff --git a/src/Model/User.php b/src/Model/User.php
index 6bd1173ee0ae99029085850285a9786c18ba1210..b4171de9567bb7ee8099a19b0d3ad54f8b47a9a5 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -532,7 +532,7 @@ class User
                return notification([
                        'type' => SYSTEM_EMAIL,
                        'to_email' => $email,
-                       'subject'=> sprintf(L10n::t('Registration at %s'), $sitename),
+                       'subject'=> L10n::t('Registration at %s', $sitename),
                        'body' => $body]);
        }
 
@@ -586,7 +586,7 @@ class User
                return notification([
                        'type' => SYSTEM_EMAIL,
                        'to_email' => $email,
-                       'subject'=> sprintf(L10n::t('Registration details for %s'), $sitename),
+                       'subject'=> L10n::t('Registration details for %s', $sitename),
                        'preamble'=> $preamble,
                        'body' => $body]);
        }

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 1324ff67f7424016cd202aee31e69bbb00567bbd..7b76ddc711d95434b6384adcd10c3dbb91500f73 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -1394,8 +1394,8 @@ class DFRN
 
                logger("updating birthday: ".$birthday." for contact ".$contact["id"]);
 
-               $bdtext = sprintf(L10n::t("%s\'s birthday"), $contact["name"]);
-               $bdtext2 = sprintf(L10n::t("Happy Birthday %s"), " [url=".$contact["url"]."]".$contact["name"]."[/url]");
+               $bdtext = L10n::t("%s\'s birthday", $contact["name"]);
+               $bdtext2 = L10n::t("Happy Birthday %s", " [url=".$contact["url"]."]".$contact["name"]."[/url]");
 
                $r = q(
                        "INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`)

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 815ab24cdd441d1d98e001d06bcdaa3d6fc0c264..d27f05c2a2a55cef4de5b9178aa18bbb1b7457b3 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -2406,7 +2406,7 @@ class Diaspora
                                $A = "[url=".$self[0]["url"]."]".$self[0]["name"]."[/url]";
                                $B = "[url=".$contact["url"]."]".$contact["name"]."[/url]";
                                $BPhoto = "[url=".$contact["url"]."][img]".$contact["thumb"]."[/img][/url]";
-                               $arr["body"] = sprintf(L10n::t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$BPhoto;
+                               $arr["body"] = L10n::t('%1$s is now friends with %2$s', $A, $B)."\n\n\n".$BPhoto;
 
                                $arr["object"] = self::constructNewFriendObject($contact);