brian/laravel-stubs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

updating user and language models

Browse Source
This commit is contained in:
Brian 2022-12-07 11:42:36 -07:00
parent fdba9f1ae7
commit 64d4d326b7
Signed by: brian
GPG Key ID: DE1A5390A3B84CD8
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/Http/Middleware/HandleInertiaRequests.php
View File

@ -42,18 +42,18 @@ class HandleInertiaRequests extends Middleware
*/
public function share(Request $request): array
{
$localeFields = ['locale', 'iso_code', 'name', 'localized_name'];
$localeFields = ['locale_name', 'iso_code', 'name', 'localized_name'];
$currentLocale = $request->session()->get('locale', null);
if (is_null($currentLocale)) {
$currentLocale = Language::where(['locale' => 'en', 'iso_code' => 'en_US'])->get($localeFields)[0]->toArray();
$currentLocale = Language::where(['locale_name' => 'en', 'iso_code' => 'en_US'])->get($localeFields)[0]->toArray();
$request->session()->put('locale', [
'locale' => $currentLocale['locale'],
'locale_name' => $currentLocale['locale_name'],
'iso_code' => $currentLocale['iso_code'],
'name' => $currentLocale['name'],
'localized_name' => $currentLocale['localized_name'],
]);
}
$localeFilePath = base_path("lang/{$currentLocale['locale']}.json");
$localeFilePath = base_path("lang/{$currentLocale['locale_name']}.json");
$notifications = [];
$notificationsCount = count($notifications);

4
src/app/Models/Language.php
View File

@ -7,18 +7,20 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Prunable;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\SoftDeletes;
class Language extends Model
{
use HasFactory;
use Prunable;
use SoftDeletes;
/** @var string */
protected $table = 'languages';
/** @var array<int,string> */
protected $fillable = [
'locale',
'locale_name',
'iso_code',
'name',
'localized_name',

2
src/database/factories/UserFactory.php
View File

@ -32,7 +32,7 @@ class UserFactory extends Factory
'email' => $this->faker->unique()->safeEmail(),
'email_verified_at' => now(),
'timezone_name' => $this->faker->timezone(),
'timezone_name' => Language::all()->random()->id,
'language_id' => Language::all()->random()->id,
'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
'remember_token' => Str::random(10),
];

2
src/database/migrations/0000_00_00_000000_create_languages_table.php
View File

@ -15,7 +15,7 @@ return new class extends Migration
{
Schema::create('languages', function (Blueprint $table) {
$table->id();
$table->string('locale')->index();
$table->string('locale_name')->index();
$table->string('iso_code')->unique();
$table->string('name');
$table->string('localized_name');