Merge branch 'develop' into develop

P3D-Legacy · Mar 25, 2022 · c9902d4 · c9902d4
2 parents 02badce + eb9a91a
commit c9902d4
Show file tree

Hide file tree

Showing 33 changed files with 78 additions and 100 deletions.
diff --git a/app/Achievements/User/AssociatedGamejolt.php b/app/Achievements/User/AssociatedGamejolt.php
@@ -19,7 +19,7 @@ class AssociatedGamejolt extends Achievement
     /*
      * A small description for the achievement
      */
-    public $description = 'User associated their account with Gamejolt';
+    public $description = 'User associated their account with Game Jolt';
 
     /*
      * The amount of "points" this user need to obtain in order to complete this achievement

diff --git a/app/Http/Controllers/API/v1/GamejoltAccountBanController.php b/app/Http/Controllers/API/v1/GamejoltAccountBanController.php
@@ -10,9 +10,9 @@
 use Illuminate\Http\Request;
 
 /**
- * @group Ban Gamejolt Account
+ * @group Ban Game Jolt Account
  *
- * APIs for getting, creating, updating and deleting Gamejolt Account Bans.
+ * APIs for getting, creating, updating and deleting Game Jolt Account Bans.
  */
 class GamejoltAccountBanController extends Controller
 {
@@ -40,10 +40,10 @@ public function index(Request $request)
     /**
      * Store a newly created resource in storage.
      *
-     * @bodyParam gamejoltaccount_id int required The ID of the Gamejolt Account. Example: 123456
+     * @bodyParam gamejoltaccount_id int required The ID of the Game Jolt Account. Example: 123456
      * @bodyParam reason_id int required The ID of the Ban Reason. Example: 3
-     * @bodyParam banned_by_id int optional The ID of the Gamejolt Account, default will be owner of token. Cannot be used with banned_by_gamejoltaccount_id. Example: 123456
-     * @bodyParam banned_by_gamejoltaccount_id int optional The ID of the Gamejolt Account. Cannot be used with banned_by_id. Example: 123456
+     * @bodyParam banned_by_id int optional The ID of the Game Jolt Account, default will be owner of token. Cannot be used with banned_by_gamejoltaccount_id. Example: 123456
+     * @bodyParam banned_by_gamejoltaccount_id int optional The ID of the Game Jolt Account. Cannot be used with banned_by_id. Example: 123456
      * @bodyParam expires_at string optional The expiry of the ban. Example: 2020-01-01
      *
      * @response 201 {
@@ -81,7 +81,7 @@ public function store(Request $request)
             $gja = GamejoltAccount::where('id', $request->banned_by_gamejoltaccount_id)->first();
             if (!$gja) {
                 return response()->json([
-                    'error' => 'Gamejolt Account not found with banned_by_gamejoltaccount_id!',
+                    'error' => 'Game Jolt Account not found with banned_by_gamejoltaccount_id!',
                 ]);
             }
             $banned_by_id = $gja->user->id;
@@ -108,7 +108,7 @@ public function store(Request $request)
     /**
      * Display the specified resource.
      *
-     * @urlParam id int required The ID of the Gamejolt Account.
+     * @urlParam id int required The ID of the Game Jolt Account.
      *
      * @response {
      *    "data": [

diff --git a/app/Http/Controllers/API/v1/GamejoltAccountController.php b/app/Http/Controllers/API/v1/GamejoltAccountController.php
@@ -8,9 +8,9 @@
 use Illuminate\Http\Request;
 
 /**
- * @group Gamejolt Account
+ * @group Game Jolt Account
  *
- * APIs for getting Gamejolt Accounts.
+ * APIs for getting Game Jolt Accounts.
  */
 class GamejoltAccountController extends Controller
 {
@@ -22,7 +22,7 @@ public function __construct()
     /**
      * Display the specified resource.
      *
-     * @urlParam id int required The ID of the Gamejolt Account.
+     * @urlParam id int required The ID of the Game Jolt Account.
      *
      * @response {
      *        "data": {

diff --git a/app/Http/Livewire/Login/GameJolt.php b/app/Http/Livewire/Login/GameJolt.php
@@ -22,7 +22,7 @@ public function mount()
     }
 
     /**
-     * Update the user's GameJolt Account credentials.
+     * Update the user's Game Jolt Account credentials.
      *
      * @return void
      */
@@ -60,14 +60,14 @@ public function save()
         $gamejoltaccount = GamejoltAccount::where('username', $this->username)->first();
 
         if (!$gamejoltaccount) {
-            $this->addError('error', 'This Gamejolt Account is not associated with a P3D account yet.');
+            $this->addError('error', 'This Game Jolt Account is not associated with a P3D account yet.');
             return;
         }
 
         $user = $gamejoltaccount->user()->first();
 
         if (!$user) {
-            $this->addError('error', 'Could\'t find the user associated with this Gamejolt Account.');
+            $this->addError('error', 'Could\'t find the user associated with this Game Jolt Account.');
             return;
         }
 

diff --git a/app/Http/Livewire/Login/Xenforo.php b/app/Http/Livewire/Login/Xenforo.php
@@ -20,7 +20,7 @@ public function mount()
     }
 
     /**
-     * Update the user's GameJolt Account credentials.
+     * Update the user's Xenforo Account credentials.
      *
      * @return void
      */

diff --git a/app/Http/Livewire/Profile/ConnectGamejoltAccount.php b/app/Http/Livewire/Profile/ConnectGamejoltAccount.php
@@ -33,7 +33,7 @@ public function mount()
     }
 
     /**
-     * Update the user's GameJolt Account credentials.
+     * Update the user's Game Jolt Account credentials.
      *
      * @return void
      */
@@ -56,7 +56,7 @@ public function save()
         ]);
 
         if (!$this->username && !$this->token) {
-            $this->errorBag->add('success', 'Your GameJolt account has now been unlinked.');
+            $this->errorBag->add('success', 'Your Game Jolt account has now been unlinked.');
             $user->gamejolt->delete();
             $this->updated_at = null;
             $this->verified_at = null;
@@ -106,7 +106,7 @@ public function save()
             $gamejolt = GamejoltAccount::firstOrCreate($data);
         }
 
-        // Update the user's (and other user's) GameJolt Account skin link.
+        // Update the user's (and other user's) Game Jolt Account skin link.
         Artisan::call('p3d:skinuserupdate');
 
         // Unlock achievement
@@ -121,7 +121,7 @@ public function save()
     }
 
     /**
-     * Update the user's GameJolt Account credentials.
+     * Update the user's Game Jolt Account credentials.
      *
      * @return void
      */

diff --git a/app/Http/Livewire/Profile/DiscordAccount.php b/app/Http/Livewire/Profile/DiscordAccount.php
@@ -24,7 +24,7 @@ public function mount()
     }
 
     /**
-     * Update the user's GameJolt Account credentials.
+     * Update the user's Discord Account credentials.
      *
      * @return void
      */

diff --git a/app/Http/Livewire/Profile/FacebookAccount.php b/app/Http/Livewire/Profile/FacebookAccount.php
@@ -21,7 +21,7 @@ public function mount()
     }
 
     /**
-     * Update the user's GameJolt Account credentials.
+     * Update the user's Facebook Account credentials.
      *
      * @return void
      */

diff --git a/app/Http/Livewire/Profile/TwitchAccount.php b/app/Http/Livewire/Profile/TwitchAccount.php
@@ -24,7 +24,7 @@ public function mount()
     }
 
     /**
-     * Update the user's GameJolt Account credentials.
+     * Update the user's Twitch Account credentials.
      *
      * @return void
      */

diff --git a/app/Http/Livewire/Profile/TwitterAccount.php b/app/Http/Livewire/Profile/TwitterAccount.php
@@ -24,7 +24,7 @@ public function mount()
     }
 
     /**
-     * Update the user's GameJolt Account credentials.
+     * Update the user's Twitter Account credentials.
      *
      * @return void
      */

diff --git a/app/Http/Livewire/Profile/XenforoAccount.php b/app/Http/Livewire/Profile/XenforoAccount.php
@@ -28,7 +28,7 @@ public function mount()
     }
 
     /**
-     * Update the user's GameJolt Account credentials.
+     * Update the user's Xenforo Account credentials.
      *
      * @return void
      */
@@ -86,7 +86,7 @@ public function save()
     }
 
     /**
-     * Update the user's GameJolt Account credentials.
+     * Update the user's Xenforo Account credentials.
      *
      * @return void
      */

diff --git a/app/Http/Middleware/GamejoltAccount.php b/app/Http/Middleware/GamejoltAccount.php
@@ -20,7 +20,7 @@ public function handle(Request $request, Closure $next)
             $request->session()->flash('flash.bannerStyle', 'info');
             $request
                 ->session()
-                ->flash('flash.banner', __('You need to link your Gamejolt account before accessing this page.'));
+                ->flash('flash.banner', __('You need to link your Game Jolt account before accessing this page.'));
             return redirect()->route('profile.show');
         }
 

diff --git a/app/Http/Middleware/GamejoltAdmin.php b/app/Http/Middleware/GamejoltAdmin.php
@@ -20,7 +20,7 @@ public function handle(Request $request, Closure $next)
         if (!env('GAMEJOLT_GAME_ID') || !env('GAMEJOLT_GAME_PRIVATE_KEY')) {
             redirect()
                 ->route('gj-login')
-                ->with('error', 'Gamejolt API keys is not set by the admin!');
+                ->with('error', 'Game Jolt API keys is not set by the admin!');
         }
         $user = GJUser::where('gjid', $request->session()->get('gjid'))->first();
         if ($user) {

diff --git a/app/Http/Middleware/GamejoltAuth.php b/app/Http/Middleware/GamejoltAuth.php
@@ -19,7 +19,7 @@ public function handle(Request $request, Closure $next)
         if (!env('GAMEJOLT_GAME_ID') || !env('GAMEJOLT_GAME_PRIVATE_KEY')) {
             redirect()
                 ->route('gj-login')
-                ->with('error', 'Gamejolt API keys is not set by the admin!');
+                ->with('error', 'Game Jolt API keys is not set by the admin!');
         }
         if (!$request->session()->get('gju')) {
             return redirect()->route('gj-login');

diff --git a/app/Http/Middleware/GamejoltGuest.php b/app/Http/Middleware/GamejoltGuest.php
@@ -19,7 +19,7 @@ public function handle(Request $request, Closure $next)
         if (!env('GAMEJOLT_GAME_ID') || !env('GAMEJOLT_GAME_PRIVATE_KEY')) {
             redirect()
                 ->route('gj-login')
-                ->with('error', 'Gamejolt API keys is not set by the admin!');
+                ->with('error', 'Game Jolt API keys is not set by the admin!');
         }
         if ($request->session()->get('gju')) {
             return redirect()->route('skin-home');

diff --git a/app/Http/Middleware/GamejoltSuperAdmin.php b/app/Http/Middleware/GamejoltSuperAdmin.php
@@ -20,7 +20,7 @@ public function handle(Request $request, Closure $next)
         if (!env('GAMEJOLT_GAME_ID') || !env('GAMEJOLT_GAME_PRIVATE_KEY')) {
             redirect()
                 ->route('gj-login')
-                ->with('error', 'Gamejolt API keys is not set by the admin!');
+                ->with('error', 'Game Jolt API keys is not set by the admin!');
         }
         if (!env('GAMEJOLT_USER_ID_SUPERADMIN')) {
             redirect()

diff --git a/database/migrations/2021_08_06_150836_create_gamejolt_account_table.php b/database/migrations/2021_08_06_150836_create_gamejolt_account_table.php
@@ -19,9 +19,9 @@ public function up()
                 ->bigInteger('id')
                 ->unsigned()
                 ->unique()
-                ->comment('GameJolt Account ID');
-            $table->text('username')->comment('GameJolt Username');
-            $table->string('token')->comment('GameJolt Token');
+                ->comment('Game Jolt Account ID');
+            $table->text('username')->comment('Game Jolt Username');
+            $table->string('token')->comment('Game Jolt Token');
             $table->timestamp('verified_at')->nullable();
             $table->unsignedBigInteger('user_id');
             $table->timestamps();

diff --git a/database/migrations/2021_12_13_210552_create_gamejolt_account_trophies_table.php b/database/migrations/2021_12_13_210552_create_gamejolt_account_trophies_table.php
@@ -15,16 +15,16 @@ public function up()
         Schema::create('gamejolt_account_trophies', function (Blueprint $table) {
             $table->increments('aid');
             $table->uuid('uuid')->unique();
-            $table->unsignedBigInteger('id')->comment('Gamejolt Trophy ID');
-            $table->string('title')->comment('Gamejolt Trophy Title');
-            $table->string('difficulty')->comment('Gamejolt Trophy Difficulty');
-            $table->string('description')->comment('GameJolt Trophy Description');
-            $table->text('image_url')->comment('GameJolt Trophy Image URL');
+            $table->unsignedBigInteger('id')->comment('Game Jolt Trophy ID');
+            $table->string('title')->comment('Game Jolt Trophy Title');
+            $table->string('difficulty')->comment('Game Jolt Trophy Difficulty');
+            $table->string('description')->comment('Game Jolt Trophy Description');
+            $table->text('image_url')->comment('Game Jolt Trophy Image URL');
             $table
                 ->boolean('achieved')
                 ->default(false)
-                ->comment('GameJolt Trophy Achieved By User');
-            $table->unsignedBigInteger('gamejolt_account_id')->comment('GameJolt Account ID');
+                ->comment('Game Jolt Trophy Achieved By User');
+            $table->unsignedBigInteger('gamejolt_account_id')->comment('Game Jolt Account ID');
             $table->timestamps();
         });
     }

diff --git a/resources/lang/cs.json b/resources/lang/cs.json
@@ -4,7 +4,7 @@
     ":game has wonderful documentation covering every aspect of the game. Whether you're new to the game or have previous experience, we recommend reading all of the documentation from beginning to end.": ":game has wonderful documentation covering every aspect of the game. Whether you're new to the game or have previous experience, we recommend reading all of the documentation from beginning to end.",
     ":game is a video game originally created by :author. It is heavily inspired by Minecraft, and the Pokémon series.": ":game is a video game originally created by :author. It is heavily inspired by Minecraft, and the Pokémon series.",
     ":game is not affiliated with": ":game is not affiliated with",
-    ":game will have support for all generations of Pokémon in the future and all regions will be accessible in the game.": ":game will have support for all generations of Pokémon in the future and all regions will be accessible in the game.",
+    ":game will have support for all generations of Pokémon in the future and all 2D regions will be accessible in the game.": ":game will have support for all generations of Pokémon in the future and all 2D regions will be accessible in the game.",
     ":item deleted successfully.": ":item deleted successfully.",
     "A New Experience": "A New Experience",
     "A new verification link has been sent to the email address you provided during registration.": "Na e-mailovou adresu, kterou jste uvedli při registraci, byl zaslán nový ověřovací odkaz.",
@@ -74,10 +74,8 @@
     "Do you want your server to be listed for other players to see?": "Do you want your server to be listed for other players to see?",
     "Documentation": "Documentation",
     "Done.": "Hotovo.",
-    "Donwloads": "Donwloads",
     "Download": "Download",
     "Downloads": "Downloads",
-    "downloads": "downloads",
     "Draft": "Draft",
     "Edit": "Edit",
     "Edit Permission": "Edit Permission",
@@ -141,7 +139,7 @@
     "Liked": "Liked",
     "Likes": "Likes",
     "likes": "likes",
-    "Link your account with GameJolt to be able to edit your skins for in-game use, and more features to come.": "Link your account with GameJolt to be able to edit your skins for in-game use, and more features to come.",
+    "Link your account with Game Jolt to be able to edit your skins for in-game use, and for more features to come.": "Link your account with Game Jolt to be able to edit your skins for in-game use, and for more features to come.",
     "Link your account with your :account account.": "Link your account with your :account account.",
     "Location": "Location",
     "Log in": "Přihlásit",
@@ -313,7 +311,7 @@
     "You may delete any of your existing tokens if they are no longer needed.": "Můžete odstranit některý z vašich stávajících žetonů, pokud již nejsou potřeba.",
     "You need to be older than :age years old": "You need to be older than :age years old",
     "You need to be younger than :age years old": "You need to be younger than :age years old",
-    "You need to link your Gamejolt account before accessing this page.": "You need to link your Gamejolt account before accessing this page.",
+    "You need to link your Game Jolt account before accessing this page.": "You need to link your Game Jolt account before accessing this page.",
     "Your browser does not support the video tag.": "Your browser does not support the video tag.",
     "Your review of this game": "Your review of this game",
     "Your review of this resource": "Your review of this resource",

diff --git a/resources/lang/el.json b/resources/lang/el.json
@@ -4,7 +4,7 @@
     ":game has wonderful documentation covering every aspect of the game. Whether you're new to the game or have previous experience, we recommend reading all of the documentation from beginning to end.": ":game has wonderful documentation covering every aspect of the game. Whether you're new to the game or have previous experience, we recommend reading all of the documentation from beginning to end.",
     ":game is a video game originally created by :author. It is heavily inspired by Minecraft, and the Pokémon series.": ":game is a video game originally created by :author. It is heavily inspired by Minecraft, and the Pokémon series.",
     ":game is not affiliated with": ":game is not affiliated with",
-    ":game will have support for all generations of Pokémon in the future and all regions will be accessible in the game.": ":game will have support for all generations of Pokémon in the future and all regions will be accessible in the game.",
+    ":game will have support for all generations of Pokémon in the future and all 2D regions will be accessible in the game.": ":game will have support for all generations of Pokémon in the future and all 2D regions will be accessible in the game.",
     ":item deleted successfully.": ":item deleted successfully.",
     "A New Experience": "A New Experience",
     "A new verification link has been sent to the email address you provided during registration.": "Ένας νέος σύνδεσμος επαλήθευσης έχει σταλεί στη διεύθυνση ηλεκτρονικού ταχυδρομείου που δώσατε κατά την εγγραφή σας.",
@@ -74,10 +74,8 @@
     "Do you want your server to be listed for other players to see?": "Do you want your server to be listed for other players to see?",
     "Documentation": "Documentation",
     "Done.": "Ολοκληρώθηκε.",
-    "Donwloads": "Donwloads",
     "Download": "Download",
     "Downloads": "Downloads",
-    "downloads": "downloads",
     "Draft": "Draft",
     "Edit": "Επεξεργασία",
     "Edit Permission": "Edit Permission",
@@ -141,7 +139,7 @@
     "Liked": "Liked",
     "Likes": "Likes",
     "likes": "likes",
-    "Link your account with GameJolt to be able to edit your skins for in-game use, and more features to come.": "Link your account with GameJolt to be able to edit your skins for in-game use, and more features to come.",
+    "Link your account with Game Jolt to be able to edit your skins for in-game use, and for more features to come.": "Link your account with Game Jolt to be able to edit your skins for in-game use, and for more features to come.",
     "Link your account with your :account account.": "Link your account with your :account account.",
     "Location": "Location",
     "Log in": "Συνδεθείτε",
@@ -313,7 +311,7 @@
     "You may delete any of your existing tokens if they are no longer needed.": "Μπορείτε να διαγράψετε οποιαδήποτε από τις υπάρχουσες μάρκες σας, αν δεν χρειάζονται πλέον.",
     "You need to be older than :age years old": "You need to be older than :age years old",
     "You need to be younger than :age years old": "You need to be younger than :age years old",
-    "You need to link your Gamejolt account before accessing this page.": "You need to link your Gamejolt account before accessing this page.",
+    "You need to link your Game Jolt account before accessing this page.": "You need to link your Game Jolt account before accessing this page.",
     "Your browser does not support the video tag.": "Your browser does not support the video tag.",
     "Your review of this game": "Your review of this game",
     "Your review of this resource": "Your review of this resource",