Merge pull request #45 from Ckrapock/Internationalisation_Issue_34

Internationalisation issue 34
mchev · Feb 26, 2023 · aec7dc5 · aec7dc5
2 parents c176cb4 + c10fba7
commit aec7dc5
Show file tree

Hide file tree

Showing 47 changed files with 341 additions and 222 deletions.
diff --git a/app/Http/Controllers/Admin/AnswerTypeController.php b/app/Http/Controllers/Admin/AnswerTypeController.php
@@ -54,7 +54,7 @@ public function store(Request $request)
             'svg_icon' => Request::get('svg_icon'),
         ]);
 
-        return redirect()->route('admin.answer_types.index')->with('success', 'AnswerType created.');
+        return redirect()->route('admin.answer_types.index')->with('success', __('AnswerType created.'));
     }
 
     /**
@@ -85,7 +85,7 @@ public function update(Request $request, AnswerType $answerType)
             'svg_icon' => ['nullable'],
         ]));
 
-        return redirect()->back()->with('success', 'AnswerType updated.');
+        return redirect()->back()->with('success', __('AnswerType updated.'));
     }
 
     /**
@@ -98,6 +98,6 @@ public function destroy(AnswerType $answerType)
     {
         $answerType->delete();
 
-        return redirect()->route('admin.answer_types.index')->with('success', 'AnswerType deleted.');
+        return redirect()->route('admin.answer_types.index')->with('success', __('AnswerType deleted.'));
     }
-}
+}
diff --git a/app/Http/Controllers/Admin/CategoryController.php b/app/Http/Controllers/Admin/CategoryController.php
@@ -53,7 +53,7 @@ public function store(Request $request)
             'name' => Request::get('name'),
         ]);
 
-        return redirect()->route('admin.categories.index')->with('success', 'Category created.');
+        return redirect()->route('admin.categories.index')->with('success', __('Category created.'));
     }
 
     /**
@@ -86,7 +86,7 @@ public function update(Request $request, Category $category)
             'name' => ['required', 'max:50', Rule::unique('categories')->ignore($category->id)],
         ]));
 
-        return redirect()->back()->with('success', 'Category updated.');
+        return redirect()->back()->with('success', __('Category updated.'));
     }
 
     /**
@@ -99,6 +99,6 @@ public function destroy(Category $category)
     {
         $category->delete();
 
-        return redirect()->route('admin.categories.index')->with('success', 'Category deleted.');
+        return redirect()->route('admin.categories.index')->with('success', __('Category deleted.'));
     }
-}
+}
diff --git a/app/Http/Controllers/Admin/PlaylistController.php b/app/Http/Controllers/Admin/PlaylistController.php
@@ -56,7 +56,7 @@ public function store()
             'is_public' => Request::get('is_public'),
         ]);
 
-        return Redirect::route('admin.playlists.edit', $playlist)->with('success', 'Playlist created.');
+        return Redirect::route('admin.playlists.edit', $playlist)->with('success', __('Playlist created.'));
     }
 
     public function edit(Playlist $playlist)
@@ -105,20 +105,20 @@ public function update(Playlist $playlist)
 
         $playlist->update(Request::only('name', 'description', 'is_public'));
 
-        return Redirect::back()->with('success', 'Playlist updated.');
+        return Redirect::back()->with('success', __('Playlist updated.'));
     }
 
     public function destroy(Playlist $playlist)
     {
         $playlist->delete();
 
-        return Redirect::back()->with('success', 'Playlist deleted.');
+        return Redirect::back()->with('success', __('Playlist deleted.'));
     }
 
     public function restore(Playlist $playlist)
     {
         $playlist->restore();
 
-        return Redirect::back()->with('success', 'Playlist restored.');
+        return Redirect::back()->with('success', __('Playlist restored.'));
     }
-}
+}
diff --git a/app/Http/Controllers/Admin/RoomController.php b/app/Http/Controllers/Admin/RoomController.php
@@ -87,7 +87,7 @@ public function store()
             'photo_path' => Request::file('photo') ? Request::file('photo')->store('rooms') : null,
         ]);
 
-        return Redirect::route('admin.rooms.edit', $room)->with('success', 'Room created.');
+        return Redirect::route('admin.rooms.edit', $room)->with('success', __('Room created.'));
     }
 
     public function edit(Room $room)
@@ -133,21 +133,21 @@ public function update(Room $room)
             $room->update(['password' => Request::get('password')]);
         }
 
-        return Redirect::back()->with('success', 'Room updated.');
+        return Redirect::back()->with('success', __('Room updated.'));
     }
 
     public function destroy(Room $room)
     {
         $room->deletePhoto();
         $room->delete();
 
-        return Redirect::back()->with('success', 'Room deleted.');
+        return Redirect::back()->with('success', __('Room deleted.'));
     }
 
     public function restore(Room $room)
     {
         $room->restore();
 
-        return Redirect::back()->with('success', 'Room restored.');
+        return Redirect::back()->with('success', __('Room restored.'));
     }
-}
+}
diff --git a/app/Http/Controllers/Admin/TeamController.php b/app/Http/Controllers/Admin/TeamController.php
@@ -26,7 +26,7 @@ public function index()
     public function create()
     {
         if (Auth::user()->ownsTeam()) {
-            return redirect()->back()->with('error', 'You already own a team.');
+            return redirect()->back()->with('error', __('You already own a team.'));
         }
 
         return Inertia::render('Admin/Teams/Create');
@@ -46,7 +46,7 @@ public function store()
             'team_id' => $team->id,
         ]);
 
-        return Redirect::route('admin.teams')->with('success', 'Team created.');
+        return Redirect::route('admin.teams')->with('success', __('Team created.'));
     }
 
     public function edit(Team $team)
@@ -77,21 +77,21 @@ public function update(Team $team)
             $team->updatePhoto(Request::file('photo'));
         }
 
-        return Redirect::back()->with('success', 'Team updated.');
+        return Redirect::back()->with('success', __('Team updated.'));
     }
 
     public function destroy(Team $team)
     {
         $team->deletePhoto();
         $team->delete();
 
-        return Redirect::back()->with('success', 'Team deleted.');
+        return Redirect::back()->with('success', __('Team deleted.'));
     }
 
     public function restore(Team $team)
     {
         $team->restore();
 
-        return Redirect::back()->with('success', 'Team restored.');
+        return Redirect::back()->with('success', __('Team restored.'));
     }
-}
+}
diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
@@ -58,7 +58,7 @@ public function store()
             'photo_path' => Request::file('photo') ? Request::file('photo')->store('users') : null,
         ]);
 
-        return Redirect::route('admin.users')->with('success', 'User created.');
+        return Redirect::route('admin.users')->with('success', __('User created.'));
     }
 
     public function edit(User $user)
@@ -79,7 +79,7 @@ public function edit(User $user)
     public function update(User $user)
     {
         if (App::environment('demo') && $user->isDemoUser()) {
-            return Redirect::back()->with('error', 'Updating the demo user is not allowed.');
+            return Redirect::back()->with('error', __('Updating the demo user is not allowed.'));
         }
 
         Request::validate([
@@ -101,24 +101,24 @@ public function update(User $user)
             $user->update(['password' => Request::get('password')]);
         }
 
-        return Redirect::back()->with('success', 'User updated.');
+        return Redirect::back()->with('success', __('User updated.'));
     }
 
     public function destroy(User $user)
     {
         if (App::environment('demo') && $user->isDemoUser()) {
-            return Redirect::back()->with('error', 'Deleting the demo user is not allowed.');
+            return Redirect::back()->with('error', __('Deleting the demo user is not allowed.'));
         }
 
         $user->delete();
 
-        return Redirect::back()->with('success', 'User deleted.');
+        return Redirect::back()->with('success', __('User deleted.'));
     }
 
     public function restore(User $user)
     {
         $user->restore();
 
-        return Redirect::back()->with('success', 'User restored.');
+        return Redirect::back()->with('success', __('User restored.'));
     }
-}
+}
diff --git a/app/Http/Controllers/ModerationController.php b/app/Http/Controllers/ModerationController.php
@@ -63,7 +63,7 @@ public function index()
                         'id' => $ban->id,
                         'comment' => $ban->comment,
                         'created_at' => $ban->created_at->format('d/m/Y H:i:s'),
-                        'expired_at' => $ban->expired_at ? $ban->expired_at->format('d/m/Y H:i:s') : 'Ban permanent',
+                        'expired_at' => $ban->expired_at ? $ban->expired_at->format('d/m/Y H:i:s') : __('Permanent ban'),
                         'banned_by' => User::find($ban->created_by_id)->name,
                     ]),
                 ]),
@@ -83,7 +83,7 @@ public function fetchUserInformations(User $user)
                 'id' => $ban->id,
                 'comment' => $ban->comment,
                 'created_at' => $ban->created_at->format('d/m/Y H:i:s'),
-                'expired_at' => $ban->expired_at ? $ban->expired_at->format('d/m/Y H:i:s') : 'Ban permanent',
+                'expired_at' => $ban->expired_at ? $ban->expired_at->format('d/m/Y H:i:s') : __('Permanent ban'),
                 'banned_by' => User::find($ban->created_by_id)->name,
             ]),
         ];
@@ -104,7 +104,7 @@ public function restoreMessage($id)
         if (Auth::user()->isPublicModerator() || Auth::user()->isAdministrator()) {
             Message::onlyTrashed()->find($id)->restore();
 
-            return redirect()->back()->with('success', 'Message restauré');
+            return redirect()->back()->with('success', __('Message restored'));
         }
     }
 
@@ -118,9 +118,9 @@ public function banUser(User $user)
                     'ip' => $user->ip,
                 ]);
 
-                return redirect()->back()->with('success', $user->name.' a été banni.');
+                return redirect()->back()->with('success', $user->name.__(' has been banned.'));
             } else {
-                return redirect()->back()->with('error', 'Impossible de bannir un modérateur');
+                return redirect()->back()->with('error', __('Impossible to ban a moderator'));
             }
         }
 
@@ -133,4 +133,4 @@ public function unbanUser(User $user)
             $user->unban();
         }
     }
-}
+}
diff --git a/app/Http/Controllers/PlaylistController.php b/app/Http/Controllers/PlaylistController.php
@@ -63,7 +63,7 @@ public function store()
 
         $playlist->moderators()->attach(Auth::user());
 
-        return Redirect::route('playlists.edit', $playlist)->with('success', 'Playlist created.');
+        return Redirect::route('playlists.edit', $playlist)->with('success', __('Playlist created.'));
     }
 
     public function edit(Playlist $playlist)
@@ -106,7 +106,7 @@ public function edit(Playlist $playlist)
             ]);
         }
 
-        return abort(403, 'Unauthorized action.');
+        return abort(403, __('Unauthorized action.'));
     }
 
     public function update(Playlist $playlist)
@@ -120,10 +120,10 @@ public function update(Playlist $playlist)
 
             $playlist->update(Request::only('name', 'description', 'user_id'));
 
-            return Redirect::back()->with('success', 'Playlist updated.');
+            return Redirect::back()->with('success', __('Playlist updated.'));
         }
 
-        return abort(403, 'Unauthorized action.');
+        return abort(403, __('Unauthorized action.'));
     }
 
     public function export(Playlist $playlist)
@@ -137,17 +137,17 @@ public function destroy(Playlist $playlist)
     {
         if (Auth::user()->id === $playlist->owner->id || Auth::user()->isAdministrator()) {
             if ($playlist->is_public && $playlist->has('rooms')) {
-                return Redirect::back()->with('error', 'Impossible de supprimer une playlist qui est publique et qui est associée à une room.');
+                return Redirect::back()->with('error', __('Impossible to delete a playlist that is public and associated to a room.'));
             }
 
             $playlist->moderators()->detach();
             $playlist->tracks()->delete();
             $playlist->delete();
 
-            return Redirect::route('playlists')->with('success', 'Playlist deleted.');
+            return Redirect::route('playlists')->with('success', __('Playlist deleted.'));
         }
 
-        return abort(403, 'Unauthorized action.');
+        return abort(403, __('Unauthorized action.'));
     }
 
     public function findPlaylistByProvider(Playlist $playlist)
@@ -186,6 +186,6 @@ public function importPlaylistFromProvider(Playlist $playlist)
             $count = (new BlinestLikesService)->importPlaylist($playlist);
         }
 
-        return redirect()->route('playlists.edit', $playlist)->with('success', $count.'/'.Request::input('tracks_count').' titres ont été importés.');
+        return redirect()->route('playlists.edit', $playlist)->with('success', $count.'/'.Request::input('tracks_count').__(' tracks have been imported.'));
     }
-}
+}
diff --git a/app/Http/Controllers/PlaylistModeratorController.php b/app/Http/Controllers/PlaylistModeratorController.php
@@ -16,7 +16,7 @@ public function attach(Request $request, Playlist $playlist)
             return redirect()->back();
         }
 
-        abort(403, 'Unauthorized action.');
+        abort(403, __('Unauthorized action.'));
     }
 
     public function detach(Request $request, Playlist $playlist)
@@ -27,6 +27,6 @@ public function detach(Request $request, Playlist $playlist)
             return redirect()->back();
         }
 
-        abort(403, 'Unauthorized action.');
+        abort(403, __('Unauthorized action.'));
     }
-}
+}
diff --git a/app/Http/Controllers/RoomModeratorController.php b/app/Http/Controllers/RoomModeratorController.php
@@ -13,7 +13,7 @@ public function attach(Request $request, Room $room)
         if (Auth::user()->isRoomOwner($room) || Auth::user()->isAdministrator()) {
             $room->moderators()->syncWithoutDetaching($request->user_id);
         } else {
-            abort(403, 'Unauthorized action.');
+            abort(403, __('Unauthorized action.'));
         }
 
         return redirect()->back();
@@ -24,9 +24,9 @@ public function detach(Request $request, Room $room)
         if (Auth::user()->isRoomOwner($room) || Auth::user()->isAdministrator()) {
             $room->moderators()->detach($request->user_id);
         } else {
-            abort(403, 'Unauthorized action.');
+            abort(403, __('Unauthorized action.'));
         }
 
         return redirect()->back();
     }
-}
+}
diff --git a/app/Http/Controllers/RoomPlaylistController.php b/app/Http/Controllers/RoomPlaylistController.php
@@ -19,7 +19,7 @@ public function attach(Request $request, Room $room)
             return redirect()->back();
         }
 
-        return abort(403, 'Unauthorized action.');
+        return abort(403, __('Unauthorized action.'));
     }
 
     public function detach(Request $request, Room $room)
@@ -33,6 +33,6 @@ public function detach(Request $request, Room $room)
             return redirect()->back();
         }
 
-        return abort(403, 'Unauthorized action.');
+        return abort(403, __('Unauthorized action.'));
     }
-}
+}