add nav lang

Controller/BackendController.php

@@ -15,15 +15,16 @@ declare(strict_types=1);
 namespace Modules\ItemManagement\Controller;
 
 use Model\SettingsEnum;
-use Modules\Media\Models\Media;
 use Modules\Admin\Models\LocalizationMapper;
 use Modules\Billing\Models\BillTypeL11n;
 use Modules\Billing\Models\SalesBillMapper;
 use Modules\ItemManagement\Models\ItemAttributeMapper;
 use Modules\ItemManagement\Models\ItemAttributeTypeMapper;
+use Modules\ItemManagement\Models\ItemAttributeValueMapper;
 use Modules\ItemManagement\Models\ItemL11nMapper;
 use Modules\ItemManagement\Models\ItemL11nType;
 use Modules\ItemManagement\Models\ItemMapper;
+use Modules\Media\Models\Media;
 use phpOMS\Asset\AssetType;
 use phpOMS\Contract\RenderableInterface;
 use phpOMS\Localization\Money;
@@ -31,7 +32,6 @@ use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
 use phpOMS\Stdlib\Base\SmartDateTime;
 use phpOMS\Views\View;
-use Modules\ItemManagement\Models\ItemAttributeValueMapper;
 
 /**
  * ItemManagement controller class.
@@ -43,7 +43,6 @@ use Modules\ItemManagement\Models\ItemAttributeValueMapper;
  */
 final class BackendController extends Controller
 {
-
     /**
      * Routing end-point for application behaviour.
      *

Models/ItemAttributeType.php

@@ -68,7 +68,9 @@ class ItemAttributeType implements \JsonSerializable, ArrayableInterface
      *
      * @var ItemAttributeTypeL11n
      */
-    protected string | ItemAttributeTypeL11n $l11n;
+    protected string |
+
+ ItemAttributeTypeL11n $l11n;
 
     /**
      * Possible default attribute values

Theme/Backend/Lang/Navigation.en.lang.php

@@ -13,6 +13,7 @@
 declare(strict_types=1);
 
 return ['Navigation' => [
+<<<<<<< HEAD
     'Article' => 'Article',
     'Analyze' => 'Analyze',
     'Attributes' => 'Attributes',
@@ -20,5 +21,13 @@ return ['Navigation' => [
     'Values' => 'Values',
     'Create'  => 'Create',
     'List'    => 'List',
+=======
+    'Analyze'           => 'Analyze',
+    'Attributes'        => 'Attributes',
+    'Types'             => 'Types',
+    'Values'            => 'Values',
+    'Create'            => 'Create',
+    'List'              => 'List',
+>>>>>>> 48bc5fa4026129886716af1344890676e9c02540
     'ItemManagement'    => 'Item Management',
 ]];

Theme/Backend/attribute-type-list.tpl.php

@@ -12,7 +12,6 @@
  */
 declare(strict_types=1);
 
-use Modules\Media\Models\NullMedia;
 use phpOMS\Uri\UriFactory;
 
 /** @var \phpOMS\Views\View $this */