Fix merge conflicts

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v0.1.11 - 2023-10-12
+
+### What's Changed
+
+- Bump locale collection package
+
 ## v0.1.0 - 2023-08-18
 
 ### What's Changed

src/Facades/TranslateRouteParts.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Codedor\TranslatableRoutes\Facades;
+
+use Illuminate\Support\Facades\Facade;
+
+class TranslateRouteParts extends Facade
+{
+    protected static function getFacadeAccessor()
+    {
+        return \Codedor\TranslatableRoutes\TranslateRouteParts::class;
+    }
+}

src/Providers/TranslatableRoutesServiceProvider.php

@@ -6,6 +6,7 @@
 use Codedor\LocaleCollection\Locale;
 use Codedor\LocaleCollection\LocaleCollection;
 use Codedor\TranslatableRoutes\TranslateRoute;
+use Codedor\TranslatableRoutes\TranslateRouteParts;
 use Codedor\TranslatableRoutes\View\Components\HrefLangTags;
 use Illuminate\Routing\Route as RoutingRoute;
 use Illuminate\Support\Facades\Blade;
@@ -64,6 +65,10 @@ public function packageBooted(): void
         parent::packageBooted();
 
         $this->registerBladeComponents();
+
+        $this->app->bind(TranslateRouteParts::class, function () {
+            return new TranslateRouteParts;
+        });
     }
 
     protected function registerBladeComponents()

src/TranslateRoute.php

@@ -5,6 +5,7 @@
 use Codedor\LocaleCollection\Facades\LocaleCollection;
 use Codedor\LocaleCollection\Locale;
 use Codedor\LocaleCollection\LocaleCollection as TranslatableRoutesLocaleCollection;
+use Codedor\TranslatableRoutes\Facades\TranslateRouteParts;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Routing\Exceptions\UrlGenerationException;
@@ -83,6 +84,7 @@ public static function translateParts(string $uri, string $locale)
             }
 
             $key = "routes.$part";
+            TranslateRouteParts::put($key, $key);
 
             if (app('translator')->has($key, $locale)) {
                 $translatedUri[] = app('translator')->get($key, [], $locale);

src/TranslateRouteParts.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Codedor\TranslatableRoutes;
+
+use Illuminate\Support\Collection;
+
+class TranslateRouteParts extends Collection
+{
+}

src/helpers.php

@@ -45,6 +45,6 @@ function is_filament_livewire_route($request): bool
 if (! function_exists('is_livewire_route')) {
     function is_livewire_route($request): bool
     {
-        return (Str::startsWith($request->path(), 'livewire/') || $request->headers->has('X-LIVEWIRE'));
+        return Str::startsWith($request->path(), 'livewire/') || $request->headers->has('X-LIVEWIRE');
     }
 }