diff --git a/include/conversation.php b/include/conversation.php index bcc0b855f5..91a835837e 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -7,6 +7,7 @@ use Friendica\Content\ContactSelector; use Friendica\Content\Feature; use Friendica\Core\Addon; use Friendica\Core\Config; +use Friendica\Core\L10n; use Friendica\Core\PConfig; use Friendica\Core\System; use Friendica\Database\DBM; @@ -1668,19 +1669,19 @@ function get_response_button_text($v, $count) { switch ($v) { case 'like': - $return = tt('Like', 'Likes', $count); + $return = L10n::tt('Like', 'Likes', $count); break; case 'dislike': - $return = tt('Dislike', 'Dislikes', $count); + $return = L10n::tt('Dislike', 'Dislikes', $count); break; case 'attendyes': - $return = tt('Attending', 'Attending', $count); + $return = L10n::tt('Attending', 'Attending', $count); break; case 'attendno': - $return = tt('Not Attending', 'Not Attending', $count); + $return = L10n::tt('Not Attending', 'Not Attending', $count); break; case 'attendmaybe': - $return = tt('Undecided', 'Undecided', $count); + $return = L10n::tt('Undecided', 'Undecided', $count); break; } diff --git a/include/text.php b/include/text.php index 8de31043ef..89e9e871d4 100644 --- a/include/text.php +++ b/include/text.php @@ -952,10 +952,10 @@ function contact_block() { dbesc(implode(",", $contacts))); if (DBM::is_result($r)) { - $contacts = sprintf(tt('%d Contact','%d Contacts', $total),$total); + $contacts = sprintf(L10n::tt('%d Contact', '%d Contacts', $total), $total); $micropro = []; foreach ($r as $rr) { - $micropro[] = micropro($rr,true,'mpfriend'); + $micropro[] = micropro($rr, true, 'mpfriend'); } } } diff --git a/mod/admin.php b/mod/admin.php index be24dea0af..756f4fe949 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -387,7 +387,7 @@ function admin_page_contactblock_post(App $a) foreach ($contacts as $uid) { Contact::unblock($uid); } - notice(tt("%s contact unblocked", "%s contacts unblocked", count($contacts))); + notice(L10n::tt("%s contact unblocked", "%s contacts unblocked", count($contacts))); } goaway('admin/contactblock'); return; // NOTREACHED @@ -435,7 +435,7 @@ function admin_page_contactblock(App $a) '$baseurl' => System::baseUrl(true), '$contacts' => $contacts, - '$total_contacts' => tt('%s total blocked contact', '%s total blocked contacts', $total), + '$total_contacts' => L10n::tt('%s total blocked contact', '%s total blocked contacts', $total), '$paginate' => paginate($a), '$contacturl' => ['contact_url', L10n::t("Profile URL"), '', L10n::t("URL of the remote contact to block.")], ]); @@ -1516,13 +1516,13 @@ function admin_page_users_post(App $a) q("UPDATE `user` SET `blocked` = 1-`blocked` WHERE `uid` = %s", intval($uid) ); } - notice(tt("%s user blocked/unblocked", "%s users blocked/unblocked", count($users))); + notice(L10n::tt("%s user blocked/unblocked", "%s users blocked/unblocked", count($users))); } if (x($_POST, 'page_users_delete')) { foreach ($users as $uid) { User::remove($uid); } - notice(tt("%s user deleted", "%s users deleted", count($users))); + notice(L10n::tt("%s user deleted", "%s users deleted", count($users))); } if (x($_POST, 'page_users_approve')) { diff --git a/mod/contacts.php b/mod/contacts.php index abfda5ef6a..49c6e710ff 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -143,7 +143,7 @@ function contacts_batch_actions(App $a) } } if ($count_actions > 0) { - info(tt("%d contact edited.", "%d contacts edited.", $count_actions)); + info(L10n::tt("%d contact edited.", "%d contacts edited.", $count_actions)); } if (x($_SESSION, 'return_url')) { diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 473543b66e..e3d8e66862 100644 --- 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(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(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); return; } } @@ -364,7 +364,7 @@ function dfrn_request_post(App $a) } $invalid = Probe::validDfrn($parms); if ($invalid) { - notice(sprintf(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(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); return; } diff --git a/mod/invite.php b/mod/invite.php index 40e54ec4a5..49f62cf0f8 100644 --- a/mod/invite.php +++ b/mod/invite.php @@ -91,11 +91,11 @@ function invite_post(App $a) { return; } } else { - notice( sprintf( t('%s : Message delivery failed.'), $recip) . EOL); + notice(sprintf(L10n::t('%s : Message delivery failed.'), $recip) . EOL); } } - notice( sprintf( tt("%d message sent.", "%d messages sent.", $total) , $total) . EOL); + notice(sprintf(L10n::tt("%d message sent.", "%d messages sent.", $total), $total) . EOL); return; } diff --git a/mod/message.php b/mod/message.php index 0fc9b627c8..79b4ce0cec 100644 --- a/mod/message.php +++ b/mod/message.php @@ -499,7 +499,7 @@ function render_messages(array $msg, $t) '$date' => datetime_convert('UTC', date_default_timezone_get(), $rr['mailcreated'], t('D, d M Y - g:i A')), '$ago' => relative_date($rr['mailcreated']), '$seen' => $rr['mailseen'], - '$count' => tt('%d message', '%d messages', $rr['count']), + '$count' => L10n::tt('%d message', '%d messages', $rr['count']), ]); } diff --git a/mod/network.php b/mod/network.php index 9fdad257bf..447d8c4759 100644 --- a/mod/network.php +++ b/mod/network.php @@ -541,7 +541,7 @@ function networkThreadedView(App $a, $update = 0) if ($gid) { if (($t = Contact::getOStatusCountByGroupId($gid)) && !PConfig::get(local_user(), 'system', 'nowarn_insecure')) { - notice(tt("Warning: This group contains %s member from a network that doesn't allow non public messages.", + notice(L10n::tt("Warning: This group contains %s member from a network that doesn't allow non public messages.", "Warning: This group contains %s members from a network that doesn't allow non public messages.", $t) . EOL); notice(L10n::t("Messages in this group won't be send to these receivers.").EOL); diff --git a/src/Content/Widget.php b/src/Content/Widget.php index 156e9e3593..00a24b4505 100644 --- a/src/Content/Widget.php +++ b/src/Content/Widget.php @@ -8,6 +8,7 @@ use Friendica\Content\ContactSelector; use Friendica\Content\Feature; use Friendica\Core\Addon; use Friendica\Core\Config; +use Friendica\Core\L10n; use Friendica\Core\PConfig; use Friendica\Core\System; use Friendica\Database\DBM; @@ -48,7 +49,7 @@ class Widget $x = PConfig::get(local_user(), 'system', 'invites_remaining'); if ($x || is_site_admin()) { $a->page['aside'] .= '' . $inv; } } @@ -302,7 +303,7 @@ class Widget } return replace_macros(get_markup_template('remote_friends_common.tpl'), array( - '$desc' => tt("%d contact in common", "%d contacts in common", $t), + '$desc' => L10n::tt("%d contact in common", "%d contacts in common", $t), '$base' => System::baseUrl(), '$uid' => $profile_uid, '$cid' => (($cid) ? $cid : '0'), diff --git a/src/Core/L10n.php b/src/Core/L10n.php index 7e079ea6d7..88697a2a2c 100644 --- a/src/Core/L10n.php +++ b/src/Core/L10n.php @@ -174,7 +174,7 @@ class L10n * @param int $count * @return string */ - function tt($singular, $plural, $count) + public static function tt($singular, $plural, $count) { global $lang; $a = get_app(); diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php index ef2679b55c..2409b76da5 100644 --- a/src/Core/UserImport.php +++ b/src/Core/UserImport.php @@ -231,7 +231,7 @@ class UserImport } } if ($errorcount > 0) { - notice(sprintf(tt("%d contact not imported", "%d contacts not imported", $errorcount), $errorcount)); + notice(sprintf(L10n::tt("%d contact not imported", "%d contacts not imported", $errorcount), $errorcount)); } foreach ($account['group'] as &$group) { diff --git a/src/Object/Post.php b/src/Object/Post.php index 59258a0aec..ee557273d3 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -8,6 +8,7 @@ use Friendica\BaseObject; use Friendica\Content\ContactSelector; use Friendica\Content\Feature; use Friendica\Core\Addon; +use Friendica\Core\L10n; use Friendica\Core\PConfig; use Friendica\Database\DBM; use Friendica\Model\Contact; @@ -420,9 +421,9 @@ class Post extends BaseObject // Collapse if (($nb_children > 2) || ($thread_level > 1)) { $result['children'][0]['comment_firstcollapsed'] = true; - $result['children'][0]['num_comments'] = tt('%d comment', '%d comments', $total_children); + $result['children'][0]['num_comments'] = L10n::tt('%d comment', '%d comments', $total_children); $result['children'][0]['hidden_comments_num'] = $total_children; - $result['children'][0]['hidden_comments_text'] = tt('comment', 'comments', $total_children); + $result['children'][0]['hidden_comments_text'] = L10n::tt('comment', 'comments', $total_children); $result['children'][0]['hide_text'] = t('show more'); if ($thread_level > 1) { $result['children'][$nb_children - 1]['comment_lastcollapsed'] = true; @@ -434,7 +435,7 @@ class Post extends BaseObject if ($this->isToplevel()) { $result['total_comments_num'] = "$total_children"; - $result['total_comments_text'] = tt('comment', 'comments', $total_children); + $result['total_comments_text'] = L10n::tt('comment', 'comments', $total_children); } $result['private'] = $item['private']; diff --git a/util/README b/util/README index eecf85b842..a6efd938b6 100644 --- a/util/README +++ b/util/README @@ -61,7 +61,7 @@ e.g. Plural -The tt() function supports plural form. Script extract.php write this in +The L10n::tt() function supports plural form. Script extract.php write this in strings.php as an array, one string for every plural form language supports: $a->string["%d message sent"] = Array( @@ -79,7 +79,7 @@ More info at http://www.gnu.org/software/hello/manual/gettext/Plural-forms.html Xgettext and .po workflow 1. Run util/run_xgettext.sh script (on *unix sistems, with GNU xgettext installed) - This script runs xgettext on source tree, extracting strings from t() and tt() + This script runs xgettext on source tree, extracting strings from L10n::t() and L10n::tt() functions, and creates a util/messages.po file. $ cd util; ./run_xgettext.sh