Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some more translations #263

Merged
merged 11 commits into from
Jan 16, 2024
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ rr
/docker/dbdata
frankenphp
/public/frankenphp-worker.php
.DS_Store
5 changes: 3 additions & 2 deletions app/Filament/Pages/Colors.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a href="https://fonts.bunny.net" target="_blank" rel="noreferrer">Bunny Fonts</a> (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'),

]
Expand Down
4 changes: 2 additions & 2 deletions app/Filament/Pages/Settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
3 changes: 1 addition & 2 deletions app/Filament/Resources/CommentResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
7 changes: 4 additions & 3 deletions app/Filament/Resources/CommentResource/Pages/EditComment.php
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
];
}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 7 additions & 0 deletions lang/en/auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a class="transition text-brand-600 hover:text-brand-500 focus:outline-none focus:underline" href=":route">register</a> 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',
Expand Down
2 changes: 2 additions & 0 deletions lang/en/general.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@

'close' => 'Close',
'save' => 'Save',

'public-user' => 'Public User',
];
2 changes: 1 addition & 1 deletion lang/en/resources.php
Original file line number Diff line number Diff line change
Expand Up @@ -136,4 +136,4 @@
'project' => 'Project',
'user' => 'User',
]
];
];
1 change: 1 addition & 0 deletions lang/en/theme.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a href="https://fonts.bunny.net" target="_blank" rel="noreferrer">Bunny Fonts</a> (e.g. \'Roboto\')',
'primary-color' => 'Primary Color',
];
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 6 additions & 0 deletions lang/nl/auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a class="transition text-brand-600 hover:text-brand-500 focus:outline-none focus:underline" href=":route">maak een gratis account aan</a>.',
'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',
Expand Down
2 changes: 2 additions & 0 deletions lang/nl/general.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@

'close' => 'Sluiten',
'save' => 'Opslaan',

'public-user' => 'Publieke gebruiker',
];
1 change: 1 addition & 0 deletions lang/nl/theme.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a href="https://fonts.bunny.net" target="_blank" rel="noreferrer">Bunny Fonts</a> (bijv; \'Roboto\')',
'primary-color' => 'Primaire Kleur',
];
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 5 additions & 3 deletions resources/views/auth/login.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
{{ trans('auth.login') }}
</h1>

<p class="mt-1 text-base font-medium text-gray-500">
{!! trans('auth.register_for_free', ['route' => route('register')]) !!}
</p>
@if( ! app(\App\Settings\GeneralSettings::class)->disable_user_registration )
<p class="mt-1 text-base font-medium text-gray-500">
{!! trans('auth.register_for_free', ['route' => route('register')]) !!}
</p>
@endif

@if ($errors->any())
<div class="alert-danger mt-8 overflow-scroll">
Expand Down
8 changes: 4 additions & 4 deletions resources/views/auth/verify-email.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@

@if (session('resent'))
<div class="alert-success" role="alert">
{{ __('A fresh verification link has been sent to your email address.') }}
{{ trans('auth.verify-new-success.') }}
</div>
@endif

<div class="alert-info">
{{ __('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') }},
<form method="POST" action="{{ route('verification.resend') }}">
@csrf
<button type="submit" class="border-b border-dotted border-blue-500 font-semibold">{{ __('click here to request another') }}</button>.
<button type="submit" class="border-b border-dotted border-blue-500 font-semibold">{{ trans('auth.verify-request-new') }}</button>.
</form>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions resources/views/auth/verify.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
<div class="card-body">
@if (session('resent'))
<div class="alert alert-success" role="alert">
{{ __('A fresh verification link has been sent to your email address.') }}
{{ trans('auth.verify-new-success.') }}
</div>
@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') }},
<form class="d-inline" method="POST" action="{{ route('verification.resend') }}">
@csrf
<button type="submit" class="btn btn-link p-0 m-0 align-baseline">{{ __('click here to request another') }}</button>.
<button type="submit" class="btn btn-link p-0 m-0 align-baseline">{{ trans('auth.verify-request-new') }}</button>.
</form>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/changelog.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@section('canonical', request()->routeIs('changelog.show') ? route('changelog.show', $changelogs->first()) : route('changelog'))@show

<x-app :breadcrumbs="collect([
['title' => 'Changelog', 'url' => route('changelog')],
['title' => trans( 'resources.changelog.label' ), 'url' => route('changelog')],
])->when(request()->routeIs('changelog.show'), fn ($collection) => $collection->push(['title' => $changelogs->first()->title, 'url' => route('changelog.show', $changelogs->first())]))->toArray()">
<main class="p-4 h-full flex space-x-10 mx-auto max-w-6xl">
<section class="flex-1 max-h-full">
Expand Down
4 changes: 2 additions & 2 deletions resources/views/components/app.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
<div class="max-w-7xl mx-auto py-3 px-3 sm:px-6 lg:px-8">
<div class="pr-16 sm:text-center sm:px-16">
<p class="font-medium text-white">
<span class="md:inline"> You have not verified your email yet, please verify your email.</span>
<span class="md:inline">{{ trans('auth.verify-email-helper-text') }}</span>
<span class="block sm:ml-2 sm:inline-block">
<a href="{{ route('verification.notice') }}" class="text-white font-bold underline"> Verify <span
<a href="{{ route('verification.notice') }}" class="text-white font-bold underline"> {{ trans('auth.verify') }} <span
aria-hidden="true">&rarr;</span></a>
</span>
</p>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/edit-item.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@section('canonical', route('items.edit', $item))

<x-app :breadcrumbs="[
['title' => 'Dashboard', 'url' => route('home')],
['title' => trans( 'resources.changelog.label' ), 'url' => route('home')],
['title' => $item->title, 'url' => route('items.show', $item)],
]">
<div class="grid grid-cols-1 lg:grid-cols-3 gap-6">
Expand Down
2 changes: 1 addition & 1 deletion resources/views/item.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)],
]">
<div class="grid grid-cols-1 lg:grid-cols-3 gap-6">
Expand Down
6 changes: 3 additions & 3 deletions resources/views/livewire/modals/items/create.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ class="border-b border-brand-500 border-dotted text-brand-500 hover:text-brand-7
{{ $this->form }}
@else
<div class="alert-info">
{{ __('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') }},
<form method="POST" action="{{ route('verification.resend') }}">
@csrf
<button type="submit" class="border-b border-dotted border-blue-500 font-semibold">{{ __('click here to request another') }}</button>.
<button type="submit" class="border-b border-dotted border-blue-500 font-semibold">{{ trans('auth.verify-request-new') }}</button>.
</form>
</div>
@endif
Expand Down
2 changes: 1 addition & 1 deletion resources/views/public-user.blade.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@section('title', $user->username)

<x-app :breadcrumbs="[
['title' => 'Public user', 'url' => route('public-user', $user->username)],
['title' => trans('general.public-user'), 'url' => route('public-user', $user->username)],
['title' => $user->username, 'url' => route('public-user', $user->username)],
]">
<p>We still need to think of a nice view for the public user pages. 🤓</p>
Expand Down
Loading