diff --git a/.gitignore b/.gitignore index 98e49a0b..4eaa6587 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ rr /docker/dbdata frankenphp /public/frankenphp-worker.php +.DS_Store \ No newline at end of file diff --git a/app/Filament/Pages/Colors.php b/app/Filament/Pages/Colors.php index d73d8b2e..81159123 100644 --- a/app/Filament/Pages/Colors.php +++ b/app/Filament/Pages/Colors.php @@ -94,9 +94,10 @@ function (TemporaryUploadedFile $file): string { ->label(trans('theme.font-family')) ->placeholder('e.g. Roboto') ->required() - ->helperText(new HtmlString('Choose a font family from Bunny Fonts (e.g. \'Roboto\')')), + ->helperText(new HtmlString(trans('theme.font-family-helper-text'))), + ColorPicker::make('primary') - ->label('theme.primary-color') + ->label(trans('theme.primary-color')) ->default('#2563EB'), ] diff --git a/app/Filament/Pages/Settings.php b/app/Filament/Pages/Settings.php index 1abb35f6..0c130f67 100644 --- a/app/Filament/Pages/Settings.php +++ b/app/Filament/Pages/Settings.php @@ -120,8 +120,8 @@ public function form(Form $form): Form ->hidden(fn (Get $get) => $get('select_project_when_creating_item') === false), Toggle::make('select_board_when_creating_item') - ->label(trans('settings.general.general.select-board-creat-item')) - ->helperText(trans('settings.general.general.select-board-creat-item-helper-text')) + ->label(trans('settings.general.select-board-creat-item')) + ->helperText(trans('settings.general.select-project-creating-item-helper-text')) ->reactive(), Toggle::make('board_required_when_creating_item') diff --git a/app/Filament/Resources/CommentResource.php b/app/Filament/Resources/CommentResource.php index cb717f34..bc30a973 100644 --- a/app/Filament/Resources/CommentResource.php +++ b/app/Filament/Resources/CommentResource.php @@ -97,8 +97,7 @@ public static function table(Table $table): Table TextColumn::make('created_at') ->label(trans('resources.created-at')) ->dateTime() - ->sortable() - ->label('Date'), + ->sortable(), ] ) ->filters( diff --git a/app/Filament/Resources/CommentResource/Pages/EditComment.php b/app/Filament/Resources/CommentResource/Pages/EditComment.php index c71d649d..1a7f09a5 100644 --- a/app/Filament/Resources/CommentResource/Pages/EditComment.php +++ b/app/Filament/Resources/CommentResource/Pages/EditComment.php @@ -15,9 +15,10 @@ public function getHeaderActions(): array { return [ Action::make('view_public') - ->color('gray') - ->openUrlInNewTab() - ->url(fn () => route('items.show', $this->record->item) . '#comment-' . $this->record->id), + ->label(trans('resources.item.view-public')) + ->color('gray') + ->openUrlInNewTab() + ->url(fn () => route('items.show', $this->record->item) . '#comment-' . $this->record->id), DeleteAction::make(), ]; } diff --git a/lang/af/af.json b/lang/af.json similarity index 100% rename from lang/af/af.json rename to lang/af.json diff --git a/lang/ar/ar.json b/lang/ar.json similarity index 100% rename from lang/ar/ar.json rename to lang/ar.json diff --git a/lang/az/az.json b/lang/az.json similarity index 100% rename from lang/az/az.json rename to lang/az.json diff --git a/lang/be/be.json b/lang/be.json similarity index 100% rename from lang/be/be.json rename to lang/be.json diff --git a/lang/bg/bg.json b/lang/bg.json similarity index 100% rename from lang/bg/bg.json rename to lang/bg.json diff --git a/lang/bn/bn.json b/lang/bn.json similarity index 100% rename from lang/bn/bn.json rename to lang/bn.json diff --git a/lang/bs/bs.json b/lang/bs.json similarity index 100% rename from lang/bs/bs.json rename to lang/bs.json diff --git a/lang/ca/ca.json b/lang/ca.json similarity index 100% rename from lang/ca/ca.json rename to lang/ca.json diff --git a/lang/cs/cs.json b/lang/cs.json similarity index 100% rename from lang/cs/cs.json rename to lang/cs.json diff --git a/lang/cy/cy.json b/lang/cy.json similarity index 100% rename from lang/cy/cy.json rename to lang/cy.json diff --git a/lang/da/da.json b/lang/da.json similarity index 100% rename from lang/da/da.json rename to lang/da.json diff --git a/lang/de/de.json b/lang/de.json similarity index 100% rename from lang/de/de.json rename to lang/de.json diff --git a/lang/de_CH/de_CH.json b/lang/de_CH.json similarity index 100% rename from lang/de_CH/de_CH.json rename to lang/de_CH.json diff --git a/lang/el/el.json b/lang/el.json similarity index 100% rename from lang/el/el.json rename to lang/el.json diff --git a/lang/en/auth.php b/lang/en/auth.php index 243c4d0e..a3a569ae 100644 --- a/lang/en/auth.php +++ b/lang/en/auth.php @@ -2,13 +2,20 @@ return [ 'login' => 'Log in', + 'verify' => 'Verify', 'verify-email' => 'Verify email', + 'verify-email-helper-text' => 'You have not verified your email yet, please verify your email.', 'register' => 'Register', 'profile' => 'Profile', 'register_for_free' => 'Or register for free.', 'not_new' => 'Not new here?', 'password_protected' => 'Password protected', + 'verify-new-success' => 'A fresh verification link has been sent to your email address.', + 'verify-notice' => 'Before proceeding, please check your email for a verification link.', + 'verify-if-not-received' => 'If you did not receive the email', + 'verify-request-new' => 'click here to request another', + 'name' => 'Name', 'email' => 'Email address', 'email_placeholder' => 'name@yourcompany.com', diff --git a/lang/en/general.php b/lang/en/general.php index d77f6456..dab0bc39 100644 --- a/lang/en/general.php +++ b/lang/en/general.php @@ -9,4 +9,6 @@ 'close' => 'Close', 'save' => 'Save', + + 'public-user' => 'Public User', ]; diff --git a/lang/en/resources.php b/lang/en/resources.php index 69d114e8..58cdcd0c 100644 --- a/lang/en/resources.php +++ b/lang/en/resources.php @@ -136,4 +136,4 @@ 'project' => 'Project', 'user' => 'User', ] -]; \ No newline at end of file +]; diff --git a/lang/en/theme.php b/lang/en/theme.php index 19b64d1e..058a8b84 100644 --- a/lang/en/theme.php +++ b/lang/en/theme.php @@ -6,5 +6,6 @@ 'logo-helper-text' => 'Make sure your storage is linked (by running php artisan storage:link).', 'favicon' => 'Favicon', 'font-family' => 'Font Family', + 'font-family-helper-text' => 'Choose a font family from Bunny Fonts (e.g. \'Roboto\')', 'primary-color' => 'Primary Color', ]; diff --git a/lang/es/es.json b/lang/es.json similarity index 100% rename from lang/es/es.json rename to lang/es.json diff --git a/lang/et/et.json b/lang/et.json similarity index 100% rename from lang/et/et.json rename to lang/et.json diff --git a/lang/eu/eu.json b/lang/eu.json similarity index 100% rename from lang/eu/eu.json rename to lang/eu.json diff --git a/lang/fa/fa.json b/lang/fa.json similarity index 100% rename from lang/fa/fa.json rename to lang/fa.json diff --git a/lang/fi/fi.json b/lang/fi.json similarity index 100% rename from lang/fi/fi.json rename to lang/fi.json diff --git a/lang/fil/fil.json b/lang/fil.json similarity index 100% rename from lang/fil/fil.json rename to lang/fil.json diff --git a/lang/fr/fr.json b/lang/fr.json similarity index 100% rename from lang/fr/fr.json rename to lang/fr.json diff --git a/lang/gl/gl.json b/lang/gl.json similarity index 100% rename from lang/gl/gl.json rename to lang/gl.json diff --git a/lang/gu/gu.json b/lang/gu.json similarity index 100% rename from lang/gu/gu.json rename to lang/gu.json diff --git a/lang/he/he.json b/lang/he.json similarity index 100% rename from lang/he/he.json rename to lang/he.json diff --git a/lang/hi/hi.json b/lang/hi.json similarity index 100% rename from lang/hi/hi.json rename to lang/hi.json diff --git a/lang/hr/hr.json b/lang/hr.json similarity index 100% rename from lang/hr/hr.json rename to lang/hr.json diff --git a/lang/hu/hu.json b/lang/hu.json similarity index 100% rename from lang/hu/hu.json rename to lang/hu.json diff --git a/lang/hy/hy.json b/lang/hy.json similarity index 100% rename from lang/hy/hy.json rename to lang/hy.json diff --git a/lang/id/id.json b/lang/id.json similarity index 100% rename from lang/id/id.json rename to lang/id.json diff --git a/lang/is/is.json b/lang/is.json similarity index 100% rename from lang/is/is.json rename to lang/is.json diff --git a/lang/it/it.json b/lang/it.json similarity index 100% rename from lang/it/it.json rename to lang/it.json diff --git a/lang/ja/ja.json b/lang/ja.json similarity index 100% rename from lang/ja/ja.json rename to lang/ja.json diff --git a/lang/ka/ka.json b/lang/ka.json similarity index 100% rename from lang/ka/ka.json rename to lang/ka.json diff --git a/lang/kk/kk.json b/lang/kk.json similarity index 100% rename from lang/kk/kk.json rename to lang/kk.json diff --git a/lang/km/km.json b/lang/km.json similarity index 100% rename from lang/km/km.json rename to lang/km.json diff --git a/lang/kn/kn.json b/lang/kn.json similarity index 100% rename from lang/kn/kn.json rename to lang/kn.json diff --git a/lang/ko/ko.json b/lang/ko.json similarity index 100% rename from lang/ko/ko.json rename to lang/ko.json diff --git a/lang/lt/lt.json b/lang/lt.json similarity index 100% rename from lang/lt/lt.json rename to lang/lt.json diff --git a/lang/lv/lv.json b/lang/lv.json similarity index 100% rename from lang/lv/lv.json rename to lang/lv.json diff --git a/lang/mk/mk.json b/lang/mk.json similarity index 100% rename from lang/mk/mk.json rename to lang/mk.json diff --git a/lang/mn/mn.json b/lang/mn.json similarity index 100% rename from lang/mn/mn.json rename to lang/mn.json diff --git a/lang/mr/mr.json b/lang/mr.json similarity index 100% rename from lang/mr/mr.json rename to lang/mr.json diff --git a/lang/ms/ms.json b/lang/ms.json similarity index 100% rename from lang/ms/ms.json rename to lang/ms.json diff --git a/lang/nb/nb.json b/lang/nb.json similarity index 100% rename from lang/nb/nb.json rename to lang/nb.json diff --git a/lang/ne/ne.json b/lang/ne.json similarity index 100% rename from lang/ne/ne.json rename to lang/ne.json diff --git a/lang/nl/nl.json b/lang/nl.json similarity index 100% rename from lang/nl/nl.json rename to lang/nl.json diff --git a/lang/nl/auth.php b/lang/nl/auth.php index b8ffd722..77110548 100644 --- a/lang/nl/auth.php +++ b/lang/nl/auth.php @@ -13,13 +13,19 @@ return [ 'login' => 'Inloggen', + 'verify' => 'Verifiƫren', 'verify-email' => 'Verifieer email', + 'verify-email-helper-text' => 'Je hebt je e-mailadres nog niet geverifieerd, verifieer je e-mailadres.', 'register' => 'Registreren', 'profile' => 'Profiel', 'register_for_free' => 'Of maak een gratis account aan.', 'not_new' => 'Niet nieuw hier?', 'password_protected' => 'Beschermd met een wachtwoord', + 'verify-notice' => 'Voordat je verder gaat, controleer je e-mail voor een verificatielink.', + 'verify-if-not-received' => 'Als je de e-mail niet hebt ontvangen', + 'verify-request-new' => 'klik dan hier om een nieuwe aan te vragen', + 'name' => 'Naam', 'email' => 'E-mailadres', 'email_placeholder' => 'naam@jouwbedrijf.nl', diff --git a/lang/nl/general.php b/lang/nl/general.php index 2b8dd7af..c8083aaa 100644 --- a/lang/nl/general.php +++ b/lang/nl/general.php @@ -9,4 +9,6 @@ 'close' => 'Sluiten', 'save' => 'Opslaan', + + 'public-user' => 'Publieke gebruiker', ]; diff --git a/lang/nl/theme.php b/lang/nl/theme.php index 17a0f8b8..77265914 100644 --- a/lang/nl/theme.php +++ b/lang/nl/theme.php @@ -6,5 +6,6 @@ 'logo-helper-text' => 'Zorg dat je opslag is gelinked (dit kan met de CLI command; php artisan storage:link).', 'favicon' => 'Favicon', 'font-family' => 'Font Familie', + 'font-family-helper-text' => 'Kies een font Familie van Bunny Fonts (bijv; \'Roboto\')', 'primary-color' => 'Primaire Kleur', ]; diff --git a/lang/nn/nn.json b/lang/nn.json similarity index 100% rename from lang/nn/nn.json rename to lang/nn.json diff --git a/lang/oc/oc.json b/lang/oc.json similarity index 100% rename from lang/oc/oc.json rename to lang/oc.json diff --git a/lang/pl/pl.json b/lang/pl.json similarity index 100% rename from lang/pl/pl.json rename to lang/pl.json diff --git a/lang/ps/ps.json b/lang/ps.json similarity index 100% rename from lang/ps/ps.json rename to lang/ps.json diff --git a/lang/pt/pt.json b/lang/pt.json similarity index 100% rename from lang/pt/pt.json rename to lang/pt.json diff --git a/lang/pt_BR/pt_BR.json b/lang/pt_BR.json similarity index 100% rename from lang/pt_BR/pt_BR.json rename to lang/pt_BR.json diff --git a/lang/ro/ro.json b/lang/ro.json similarity index 100% rename from lang/ro/ro.json rename to lang/ro.json diff --git a/lang/ru/ru.json b/lang/ru.json similarity index 100% rename from lang/ru/ru.json rename to lang/ru.json diff --git a/lang/sc/sc.json b/lang/sc.json similarity index 100% rename from lang/sc/sc.json rename to lang/sc.json diff --git a/lang/si/si.json b/lang/si.json similarity index 100% rename from lang/si/si.json rename to lang/si.json diff --git a/lang/sk/sk.json b/lang/sk.json similarity index 100% rename from lang/sk/sk.json rename to lang/sk.json diff --git a/lang/sl/sl.json b/lang/sl.json similarity index 100% rename from lang/sl/sl.json rename to lang/sl.json diff --git a/lang/sq/sq.json b/lang/sq.json similarity index 100% rename from lang/sq/sq.json rename to lang/sq.json diff --git a/lang/sr_Cyrl/sr_Cyrl.json b/lang/sr_Cyrl.json similarity index 100% rename from lang/sr_Cyrl/sr_Cyrl.json rename to lang/sr_Cyrl.json diff --git a/lang/sr_Latn/sr_Latn.json b/lang/sr_Latn.json similarity index 100% rename from lang/sr_Latn/sr_Latn.json rename to lang/sr_Latn.json diff --git a/lang/sr_Latn_ME/sr_Latn_ME.json b/lang/sr_Latn_ME.json similarity index 100% rename from lang/sr_Latn_ME/sr_Latn_ME.json rename to lang/sr_Latn_ME.json diff --git a/lang/sv/sv.json b/lang/sv.json similarity index 100% rename from lang/sv/sv.json rename to lang/sv.json diff --git a/lang/sw/sw.json b/lang/sw.json similarity index 100% rename from lang/sw/sw.json rename to lang/sw.json diff --git a/lang/tg/tg.json b/lang/tg.json similarity index 100% rename from lang/tg/tg.json rename to lang/tg.json diff --git a/lang/th/th.json b/lang/th.json similarity index 100% rename from lang/th/th.json rename to lang/th.json diff --git a/lang/tk/tk.json b/lang/tk.json similarity index 100% rename from lang/tk/tk.json rename to lang/tk.json diff --git a/lang/tl/tl.json b/lang/tl.json similarity index 100% rename from lang/tl/tl.json rename to lang/tl.json diff --git a/lang/tr/tr.json b/lang/tr.json similarity index 100% rename from lang/tr/tr.json rename to lang/tr.json diff --git a/lang/ug/ug.json b/lang/ug.json similarity index 100% rename from lang/ug/ug.json rename to lang/ug.json diff --git a/lang/uk/uk.json b/lang/uk.json similarity index 100% rename from lang/uk/uk.json rename to lang/uk.json diff --git a/lang/ur/ur.json b/lang/ur.json similarity index 100% rename from lang/ur/ur.json rename to lang/ur.json diff --git a/lang/uz_Cyrl/uz_Cyrl.json b/lang/uz_Cyrl.json similarity index 100% rename from lang/uz_Cyrl/uz_Cyrl.json rename to lang/uz_Cyrl.json diff --git a/lang/uz_Latn/uz_Latn.json b/lang/uz_Latn.json similarity index 100% rename from lang/uz_Latn/uz_Latn.json rename to lang/uz_Latn.json diff --git a/lang/vi/vi.json b/lang/vi.json similarity index 100% rename from lang/vi/vi.json rename to lang/vi.json diff --git a/lang/zh_CN/zh_CN.json b/lang/zh_CN.json similarity index 100% rename from lang/zh_CN/zh_CN.json rename to lang/zh_CN.json diff --git a/lang/zh_HK/zh_HK.json b/lang/zh_HK.json similarity index 100% rename from lang/zh_HK/zh_HK.json rename to lang/zh_HK.json diff --git a/lang/zh_TW/zh_TW.json b/lang/zh_TW.json similarity index 100% rename from lang/zh_TW/zh_TW.json rename to lang/zh_TW.json diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 98ec2586..d75fcb11 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -9,9 +9,11 @@ {{ trans('auth.login') }} -

- {!! trans('auth.register_for_free', ['route' => route('register')]) !!} -

+ @if( ! app(\App\Settings\GeneralSettings::class)->disable_user_registration ) +

+ {!! trans('auth.register_for_free', ['route' => route('register')]) !!} +

+ @endif @if ($errors->any())
diff --git a/resources/views/auth/verify-email.blade.php b/resources/views/auth/verify-email.blade.php index be65f503..4ed5c7fa 100644 --- a/resources/views/auth/verify-email.blade.php +++ b/resources/views/auth/verify-email.blade.php @@ -11,16 +11,16 @@ @if (session('resent')) @endif
- {{ __('Before proceeding, please check your email for a verification link.') }} - {{ __('If you did not receive the email') }}, + {{ trans('auth.verify-notice') }} + {{ trans('auth.verify-if-not-received') }},
@csrf - . + .
diff --git a/resources/views/auth/verify.blade.php b/resources/views/auth/verify.blade.php index 9f8c1bc0..4bd377bd 100644 --- a/resources/views/auth/verify.blade.php +++ b/resources/views/auth/verify.blade.php @@ -10,15 +10,15 @@
@if (session('resent')) @endif - {{ __('Before proceeding, please check your email for a verification link.') }} - {{ __('If you did not receive the email') }}, + {{ trans('auth.verify-notice') }} + {{ trans('auth.verify-if-not-received') }},
@csrf - . + .
diff --git a/resources/views/changelog.blade.php b/resources/views/changelog.blade.php index 85a917b9..a7dd455e 100644 --- a/resources/views/changelog.blade.php +++ b/resources/views/changelog.blade.php @@ -4,7 +4,7 @@ @section('canonical', request()->routeIs('changelog.show') ? route('changelog.show', $changelogs->first()) : route('changelog'))@show
diff --git a/resources/views/components/app.blade.php b/resources/views/components/app.blade.php index 2d054392..1e20178e 100644 --- a/resources/views/components/app.blade.php +++ b/resources/views/components/app.blade.php @@ -38,9 +38,9 @@

- You have not verified your email yet, please verify your email. + {{ trans('auth.verify-email-helper-text') }} - Verify {{ trans('auth.verify') }}

diff --git a/resources/views/edit-item.blade.php b/resources/views/edit-item.blade.php index 1f684d9a..0f67a353 100644 --- a/resources/views/edit-item.blade.php +++ b/resources/views/edit-item.blade.php @@ -4,7 +4,7 @@ @section('canonical', route('items.edit', $item))
diff --git a/resources/views/item.blade.php b/resources/views/item.blade.php index df986fbe..20776660 100644 --- a/resources/views/item.blade.php +++ b/resources/views/item.blade.php @@ -8,7 +8,7 @@ $board ? ['title' => $board->title, 'url' => route('projects.boards.show', [$project, $board])] : [], ['title' => $item->title, 'url' => route('projects.items.show', [$project, $item])] ]: [ -['title' => 'Dashboard', 'url' => route('home')], +['title' => trans( 'general.dashboard' ), 'url' => route('home')], ['title' => $item->title, 'url' => route('items.show', $item)], ]">
diff --git a/resources/views/livewire/modals/items/create.blade.php b/resources/views/livewire/modals/items/create.blade.php index 9d9f37a9..48c0208c 100644 --- a/resources/views/livewire/modals/items/create.blade.php +++ b/resources/views/livewire/modals/items/create.blade.php @@ -36,11 +36,11 @@ class="border-b border-brand-500 border-dotted text-brand-500 hover:text-brand-7 {{ $this->form }} @else
- {{ __('Before proceeding, please check your email for a verification link.') }} - {{ __('If you did not receive the email') }}, + {{ trans('auth.verify-notice') }} + {{ trans('auth.verify-if-not-received') }},
@csrf - . + .
@endif diff --git a/resources/views/public-user.blade.php b/resources/views/public-user.blade.php index 525ddd25..f19cc708 100644 --- a/resources/views/public-user.blade.php +++ b/resources/views/public-user.blade.php @@ -1,7 +1,7 @@ @section('title', $user->username)

We still need to think of a nice view for the public user pages. šŸ¤“