bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #8134 from nupplaphil/task/di_l10n

Browse source 
Cleanup L10n namespace
This commit is contained in:
Hypolite Petovan 2020-01-19 11:30:19 -05:00 • committed by GitHub
commit 1bc4b2e078
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
206 changed files with 8453 additions and 6111 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Protocol/Diaspora.php
View file

@ -15,7 +15,6 @@ use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\Markdown;
use Friendica\Core\Cache\Duration;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
@ -3574,7 +3573,7 @@ class Diaspora
if ($item["attach"]) {
$cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism', $item["attach"], $matches, PREG_SET_ORDER);
if ($cnt) {
$body .= "\n".L10n::t("Attachments:")."\n";
$body .= "\n".DI::l10n()->t("Attachments:")."\n";
foreach ($matches as $mtch) {
$body .= "[".$mtch[3]."](".$mtch[1].")\n";
}

15
src/Protocol/OStatus.php
View file

@ -10,7 +10,6 @@ use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
use Friendica\Core\Cache\Duration;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Database\DBA;
@ -1270,14 +1269,14 @@ class OStatus
$selfUri = '/feed/' . $owner["nick"] . '/';
switch ($filter) {
case 'activity':
$title = L10n::t('%s\'s timeline', $owner['name']);
$title = DI::l10n()->t('%s\'s timeline', $owner['name']);
$selfUri .= $filter;
break;
case 'posts':
$title = L10n::t('%s\'s posts', $owner['name']);
$title = DI::l10n()->t('%s\'s posts', $owner['name']);
break;
case 'comments':
$title = L10n::t('%s\'s comments', $owner['name']);
$title = DI::l10n()->t('%s\'s comments', $owner['name']);
$selfUri .= $filter;
break;
}
@ -1832,12 +1831,12 @@ class OStatus
}
if ($item['verb'] == Activity::FOLLOW) {
$message = L10n::t('%s is now following %s.');
$title = L10n::t('following');
$message = DI::l10n()->t('%s is now following %s.');
$title = DI::l10n()->t('following');
$action = "subscription";
} else {
$message = L10n::t('%s stopped following %s.');
$title = L10n::t('stopped following');
$message = DI::l10n()->t('%s stopped following %s.');
$title = DI::l10n()->t('stopped following');
$action = "unfollow";
}