feat: Allow to localize image tags

StarCitizenWiki · Dec 22, 2023 · 1442f87 · 1442f87
1 parent 695bc42
commit 1442f87
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 8 deletions.
diff --git a/app/Http/Controllers/Api/V2/AbstractApiV2Controller.php b/app/Http/Controllers/Api/V2/AbstractApiV2Controller.php
@@ -181,6 +181,7 @@ protected function setLocale(string $localeCode): void
     {
         if (in_array($localeCode, config('language.codes'), true)) {
             $this->localeCode = $localeCode;
+            app()->setLocale(substr($localeCode, 0, 2));
         }
     }
 

diff --git a/app/Http/Controllers/Api/V2/Rsi/CommLink/ImageController.php b/app/Http/Controllers/Api/V2/Rsi/CommLink/ImageController.php
@@ -5,6 +5,7 @@
 namespace App\Http\Controllers\Api\V2\Rsi\CommLink;
 
 use App\Http\Controllers\Api\V2\AbstractApiV2Controller;
+use App\Http\Filters\ImageTagFilter;
 use App\Http\Resources\AbstractBaseResource;
 use App\Http\Resources\Rsi\CommLink\CommLinkResource;
 use App\Http\Resources\Rsi\CommLink\Image\ImageResource;
@@ -44,7 +45,7 @@ public function index(Request $request): AnonymousResourceCollection
     {
         $query = QueryBuilder::for(Image::class, $request)
             ->allowedFilters([
-                AllowedFilter::partial('tags', 'tags.name'),
+                AllowedFilter::custom('tags', new ImageTagFilter()),
             ])
             ->orderByDesc('id')
             ->paginate($this->limit)

diff --git a/app/Http/Controllers/Web/User/Rsi/CommLink/Image/ImageController.php b/app/Http/Controllers/Web/User/Rsi/CommLink/Image/ImageController.php
@@ -73,12 +73,14 @@ function (Builder $query) use ($request) {
      *
      * @return Factory|View
      */
-    public function indexByTag(Tag $tag)
+    public function indexByTag(Request $request)
     {
+        $tag = Tag::query()->where('name', $request->tag)->orWhere('name_en', $request->tag)->first();
+
         return view(
             'user.rsi.comm_links.images.index',
             [
-                'images' => $tag->images,
+                'images' => optional($tag)->images ?? [],
             ]
         );
     }

diff --git a/app/Http/Filters/ImageTagFilter.php b/app/Http/Filters/ImageTagFilter.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+use Spatie\QueryBuilder\Filters\Filter;
+
+class ImageTagFilter implements Filter
+{
+    /**
+     * @inheritDoc
+     */
+    public function __invoke(Builder $query, $value, string $property)
+    {
+        $query->whereRelation('tags', 'name', $value)
+            ->orWhereRelation('tags', 'name_en', $value);
+    }
+}
diff --git a/app/Http/Resources/Rsi/CommLink/Image/ImageResource.php b/app/Http/Resources/Rsi/CommLink/Image/ImageResource.php
@@ -60,7 +60,7 @@ public function toArray($request): array
                 'average_hash' => $this->hash->average_hash,
             ]),
             $this->mergeWhen($this->whenLoaded('tags'), [
-                'tags' => $this->tags->map(fn ($tag) => $tag->name)
+                'tags' => $this->tags->map(fn ($tag) => $tag->translated_name)
             ]),
             'similar_url' => $this->makeApiUrl(static::COMM_LINK_IMAGES_SIMILAR, $this->getRouteKey() . '/similar')
         ];

diff --git a/app/Models/Rsi/CommLink/Image/Tag.php b/app/Models/Rsi/CommLink/Image/Tag.php
@@ -25,6 +25,7 @@ class Tag extends Model
 
     protected $fillable = [
         'name',
+        'name_en',
     ];
 
     protected $withCount = [
@@ -46,4 +47,17 @@ public function images(): BelongsToMany
     {
         return $this->belongsToMany(Image::class, 'comm_link_image_tag');
     }
+
+    /**
+     * @return mixed
+     */
+    public function getTranslatedNameAttribute()
+    {
+        $locale = app()->getLocale();
+        if ($locale === 'en' && !empty($this["name_$locale"])) {
+            return $this["name_$locale"];
+        }
+
+        return $this->name;
+    }
 }
diff --git a/...ase_structure/rsi/comm_link/image/2023_12_20_173125_create_comm_link_image_tags_table.php b/...ase_structure/rsi/comm_link/image/2023_12_20_173125_create_comm_link_image_tags_table.php
@@ -16,6 +16,7 @@ public function up(): void
         Schema::create('comm_link_image_tags', static function (Blueprint $table) {
             $table->id();
             $table->string('name');
+            $table->string('name_en')->nullable();
             $table->timestamps();
         });
     }

diff --git a/resources/views/user/rsi/comm_links/components/image_info_card.blade.php b/resources/views/user/rsi/comm_links/components/image_info_card.blade.php
@@ -4,7 +4,7 @@
             <div style="position: relative;" class="comm-link-card-image">
                 @unless($image->tags->isEmpty())
                     <a href="{{ route('web.user.rsi.comm-links.images.index-by-tag', $image->tags->first()->getRouteKey()) }}" class="first-tag badge badge-secondary">
-                        {{ $image->tags->first()->name }}
+                        {{ $image->tags->first()->translated_name }}
                     </a>
                 @endunless
                 <span class="file-type badge badge-{{ $image->metadata->mime_class }}">{{ $image->metadata->mime }}</span>
@@ -16,7 +16,7 @@
         <div style="position: relative;" class="comm-link-card-image">
             @unless($image->tags->isEmpty())
                 <a href="{{ route('web.user.rsi.comm-links.images.index-by-tag', $image->tags->first()->getRouteKey()) }}" class="first-tag badge badge-secondary">
-                    {{ $image->tags->first()->name }}
+                    {{ $image->tags->first()->translated_name }}
                 </a>
             @endunless
             <span class="file-type badge badge-{{ $image->metadata->mime_class }}">{{ $image->metadata->mime }}</span>
@@ -91,7 +91,7 @@ class="card-img-top"
         <div class="tag-container">
             @foreach($image->tags as $tag)
                 <a class="badge badge-secondary m-0" href="{{ route('web.user.rsi.comm-links.images.index-by-tag', $tag->getRouteKey()) }}" title="{{ $tag->images_count }} @lang('Bilder mit diesem Tag')">
-                    {{ $tag->name }}
+                    {{ $tag->translated_name }}
                 </a>
             @endforeach
         </div>

diff --git a/resources/views/user/rsi/comm_links/tags/edit.blade.php b/resources/views/user/rsi/comm_links/tags/edit.blade.php
@@ -22,7 +22,7 @@
                         <span class="help-block d-block mb-2">@lang('Neue Einträge können durch Tippen in der Auswahl hinzugefügt werden.')</span>
                         <select class="form-select custom-select form-control" multiple size="15" name="tags[]" id="tags">
                             @foreach($tags as $tag)
-                                <option value="id:{{ $tag->id }}" @php if ($image_tags->contains($tag->name)) echo "selected"; @endphp>{{ $tag->name }}</option>
+                                <option value="id:{{ $tag->id }}" @php if ($image_tags->contains($tag->name)) echo "selected"; @endphp>{{ $tag->translated_name }}</option>
                             @endforeach
                         </select>
                     </div>

diff --git a/resources/views/user/rsi/comm_links/tags/index.blade.php b/resources/views/user/rsi/comm_links/tags/index.blade.php
@@ -27,6 +27,7 @@
                     <tr>
                         <th>@lang('ID')</th>
                         <th>@lang('Name')</th>
+                        <th>@lang('Englisch') @lang('Name')</th>
                         <th>@lang('Bilder')</th>
                         <th data-orderable="false"></th>
                     </tr>
@@ -40,6 +41,9 @@
                         <td>
                             <a href="{{ route('web.user.rsi.comm-links.images.index-by-tag', $tag->getRouteKey()) }}">{{ $tag->name }}</a>
                         </td>
+                        <td>
+                            {{ $tag->name_en }}
+                        </td>
                         <td>
                             {{ $tag->images_count }}
                         </td>
-Original file line number
+Diff line change
@@ Expand Up / @@ -181,6 +181,7 @@ protected function setLocale(string $localeCode): void @@
         {
             if (in_array($localeCode, config('language.codes'), true)) {
                 $this->localeCode = $localeCode;
+                app()->setLocale(substr($localeCode, 0, 2));
             }
         }
@@ Expand Down @@