X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FDirectory.php;h=54fbb01ac86bd7343ad3434995998c63186c000e;hb=8e2910976f126ee7c728ba4716f317ac496f377b;hp=f24c0665074d4f4f942c9aad427edd76e0ad45a9;hpb=91ba4bb2aba53d74e5dc6d11dea6ad73b5e4fafe;p=friendica.git

diff --git a/src/Module/Directory.php b/src/Module/Directory.php
index f24c066507..54fbb01ac8 100644
--- a/src/Module/Directory.php
+++ b/src/Module/Directory.php
@@ -7,9 +7,9 @@ use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Content\Widget;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Session;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Network\HTTPException;
@@ -23,17 +23,17 @@ class Directory extends BaseModule
 {
 	public static function content(array $parameters = [])
 	{
-		$app = self::getApp();
-		$config = $app->getConfig();
+		$app = DI::app();
+		$config = DI::config();
 
 		if (($config->get('system', 'block_public') && !Session::isAuthenticated()) ||
 			($config->get('system', 'block_local_dir') && !Session::isAuthenticated())) {
-			throw new HTTPException\ForbiddenException(L10n::t('Public access denied.'));
+			throw new HTTPException\ForbiddenException(DI::l10n()->t('Public access denied.'));
 		}
 
 		if (local_user()) {
-			$app->page['aside'] .= Widget::findPeople();
-			$app->page['aside'] .= Widget::follow();
+			DI::page()['aside'] .= Widget::findPeople();
+			DI::page()['aside'] .= Widget::follow();
 		}
 
 		$output = '';
@@ -51,12 +51,12 @@ class Directory extends BaseModule
 			$gDirPath = Profile::zrl($dirURL, true);
 		}
 
-		$pager = new Pager($app->query_string, 60);
+		$pager = new Pager(DI::args()->getQueryString(), 60);
 
 		$profiles = Profile::searchProfiles($pager->getStart(), $pager->getItemsPerPage(), $search);
 
 		if ($profiles['total'] === 0) {
-			info(L10n::t('No entries (some entries may be hidden).') . EOL);
+			info(DI::l10n()->t('No entries (some entries may be hidden).') . EOL);
 		} else {
 			if (in_array('small', $app->argv)) {
 				$photo = 'thumb';
@@ -73,15 +73,15 @@ class Directory extends BaseModule
 
 		$output .= Renderer::replaceMacros($tpl, [
 			'$search'     => $search,
-			'$globaldir'  => L10n::t('Global Directory'),
+			'$globaldir'  => DI::l10n()->t('Global Directory'),
 			'$gDirPath'   => $gDirPath,
-			'$desc'       => L10n::t('Find on this site'),
+			'$desc'       => DI::l10n()->t('Find on this site'),
 			'$contacts'   => $entries,
-			'$finding'    => L10n::t('Results for:'),
+			'$finding'    => DI::l10n()->t('Results for:'),
 			'$findterm'   => (strlen($search) ? $search : ""),
-			'$title'      => L10n::t('Site Directory'),
+			'$title'      => DI::l10n()->t('Site Directory'),
 			'$search_mod' => 'directory',
-			'$submit'     => L10n::t('Find'),
+			'$submit'     => DI::l10n()->t('Find'),
 			'$paginate'   => $pager->renderFull($profiles['total']),
 		]);
 
@@ -132,20 +132,19 @@ class Directory extends BaseModule
 			|| !empty($profile['postal-code'])
 			|| !empty($profile['country-name'])
 		) {
-			$location = L10n::t('Location:');
+			$location = DI::l10n()->t('Location:');
 		} else {
 			$location = '';
 		}
 
-		$gender =   (!empty($profile['gender'])   ? L10n::t('Gender:')   : false);
-		$marital =  (!empty($profile['marital'])  ? L10n::t('Status:')   : false);
-		$homepage = (!empty($profile['homepage']) ? L10n::t('Homepage:') : false);
-		$about =    (!empty($profile['about'])    ? L10n::t('About:')    : false);
+		$marital =  (!empty($profile['marital'])  ? DI::l10n()->t('Status:')   : false);
+		$homepage = (!empty($profile['homepage']) ? DI::l10n()->t('Homepage:') : false);
+		$about =    (!empty($profile['about'])    ? DI::l10n()->t('About:')    : false);
 
 		$location_e = $location;
 
 		$photo_menu = [
-			'profile' => [L10n::t("View Profile"), Contact::magicLink($profile_link)]
+			'profile' => [DI::l10n()->t("View Profile"), Contact::magicLink($profile_link)]
 		];
 
 		$entry = [
@@ -160,7 +159,6 @@ class Directory extends BaseModule
 			'profile'      => $profile,
 			'location'     => $location_e,
 			'tags'         => $contact['pub_keywords'],
-			'gender'       => $gender,
 			'pdesc'        => $pdesc,
 			'marital'      => $marital,
 			'homepage'     => $homepage,