X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FBaseSettingsModule.php;h=225f5ed4aefb09ddb55e907f34c3793eb759b062;hb=855e970606edad0749ec461c45024efb6dc9fc79;hp=4b5e9bf9150c997efe5f1444449baf8cc9c45d6b;hpb=9f215fc33b55b58348091ef0f08327074226dbdb;p=friendica.git

diff --git a/src/Module/BaseSettingsModule.php b/src/Module/BaseSettingsModule.php
index 4b5e9bf915..225f5ed4ae 100644
--- a/src/Module/BaseSettingsModule.php
+++ b/src/Module/BaseSettingsModule.php
@@ -4,46 +4,46 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Content\Feature;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 
 class BaseSettingsModule extends BaseModule
 {
-	public static function content()
+	public static function content(array $parameters = [])
 	{
-		$a = self::getApp();
+		$a = DI::app();
 
 		$tpl = Renderer::getMarkupTemplate('settings/head.tpl');
-		$a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
-			'$ispublic' => L10n::t('everybody')
+		DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
+			'$ispublic' => DI::l10n()->t('everybody')
 		]);
 
 		$tabs = [];
 
 		$tabs[] = [
-			'label' => L10n::t('Account'),
+			'label' => DI::l10n()->t('Account'),
 			'url' => 'settings',
 			'selected' => (($a->argc == 1) && ($a->argv[0] === 'settings') ? 'active' : ''),
 			'accesskey' => 'o',
 		];
 
 		$tabs[] = [
-			'label' => L10n::t('Two-factor authentication'),
+			'label' => DI::l10n()->t('Two-factor authentication'),
 			'url' => 'settings/2fa',
 			'selected' => (($a->argc > 1) && ($a->argv[1] === '2fa') ? 'active' : ''),
 			'accesskey' => 'o',
 		];
 
 		$tabs[] = [
-			'label' => L10n::t('Profiles'),
-			'url' => 'profiles',
-			'selected' => (($a->argc == 1) && ($a->argv[0] === 'profiles') ? 'active' : ''),
+			'label' => DI::l10n()->t('Profile'),
+			'url' => 'settings/profile',
+			'selected' => (($a->argc > 1) && ($a->argv[1] === 'profile') ? 'active' : ''),
 			'accesskey' => 'p',
 		];
 
 		if (Feature::get()) {
 			$tabs[] = [
-				'label' => L10n::t('Additional features'),
+				'label' => DI::l10n()->t('Additional features'),
 				'url' => 'settings/features',
 				'selected' => (($a->argc > 1) && ($a->argv[1] === 'features') ? 'active' : ''),
 				'accesskey' => 't',
@@ -51,49 +51,49 @@ class BaseSettingsModule extends BaseModule
 		}
 
 		$tabs[] = [
-			'label' => L10n::t('Display'),
+			'label' => DI::l10n()->t('Display'),
 			'url' => 'settings/display',
 			'selected' => (($a->argc > 1) && ($a->argv[1] === 'display') ? 'active' : ''),
 			'accesskey' => 'i',
 		];
 
 		$tabs[] = [
-			'label' => L10n::t('Social Networks'),
+			'label' => DI::l10n()->t('Social Networks'),
 			'url' => 'settings/connectors',
 			'selected' => (($a->argc > 1) && ($a->argv[1] === 'connectors') ? 'active' : ''),
 			'accesskey' => 'w',
 		];
 
 		$tabs[] = [
-			'label' => L10n::t('Addons'),
+			'label' => DI::l10n()->t('Addons'),
 			'url' => 'settings/addon',
 			'selected' => (($a->argc > 1) && ($a->argv[1] === 'addon') ? 'active' : ''),
 			'accesskey' => 'l',
 		];
 
 		$tabs[] = [
-			'label' => L10n::t('Delegations'),
+			'label' => DI::l10n()->t('Delegations'),
 			'url' => 'settings/delegation',
 			'selected' => (($a->argc > 1) && ($a->argv[1] === 'delegation') ? 'active' : ''),
 			'accesskey' => 'd',
 		];
 
 		$tabs[] = [
-			'label' => L10n::t('Connected apps'),
+			'label' => DI::l10n()->t('Connected apps'),
 			'url' => 'settings/oauth',
 			'selected' => (($a->argc > 1) && ($a->argv[1] === 'oauth') ? 'active' : ''),
 			'accesskey' => 'b',
 		];
 
 		$tabs[] = [
-			'label' => L10n::t('Export personal data'),
+			'label' => DI::l10n()->t('Export personal data'),
 			'url' => 'settings/userexport',
 			'selected' => (($a->argc > 1) && ($a->argv[1] === 'userexport') ? 'active' : ''),
 			'accesskey' => 'e',
 		];
 
 		$tabs[] = [
-			'label' => L10n::t('Remove account'),
+			'label' => DI::l10n()->t('Remove account'),
 			'url' => 'removeme',
 			'selected' => (($a->argc == 1) && ($a->argv[0] === 'removeme') ? 'active' : ''),
 			'accesskey' => 'r',
@@ -101,8 +101,8 @@ class BaseSettingsModule extends BaseModule
 
 
 		$tabtpl = Renderer::getMarkupTemplate("generic_links_widget.tpl");
-		$a->page['aside'] = Renderer::replaceMacros($tabtpl, [
-			'$title' => L10n::t('Settings'),
+		DI::page()['aside'] = Renderer::replaceMacros($tabtpl, [
+			'$title' => DI::l10n()->t('Settings'),
 			'$class' => 'settings-widget',
 			'$items' => $tabs,
 		]);