Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions resources/lang/de/cachet.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@
'open_source_status_page' => 'Die Open-Source-Statusseite.',
'all_times_shown_in' => 'Alle Zeiten werden angezeigt in *:timezone*.',
'rss_feed' => ':name RSS-Feed',
'and' => 'und',
];
1 change: 1 addition & 0 deletions resources/lang/de/metric.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
'form' => [
'name_label' => 'Name',
'suffix_label' => 'Suffix',
'suffix_placeholder' => 'z. B. ms, %, usw.',
'description_label' => 'Beschreibung',
'default_view_label' => 'Standardansicht',
'default_value_label' => 'Standardwert',
Expand Down
20 changes: 20 additions & 0 deletions resources/lang/de/update.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php

return [
'resource_label' => 'Update|Updates',
'list' => [
'headers' => [
'message' => 'Nachricht',
'status' => 'Status',
'user' => 'Benutzer',
'created_at' => 'Erstellt am',
'updated_at' => 'Aktualisiert am',
],
],
'form' => [
'message_label' => 'Nachricht',
'user_label' => 'Benutzer',
'user_helper' => 'Benutzer, welcher den Vorfall gemeldet hat.',
'status_label' => 'Status',
],
];
1 change: 1 addition & 0 deletions resources/lang/de_AT/cachet.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@
'open_source_status_page' => 'Die Open-Source-Statusseite.',
'all_times_shown_in' => 'Alle Zeiten werden angezeigt in *:timezone*.',
'rss_feed' => ':name RSS-Feed',
'and' => 'und',
];
1 change: 1 addition & 0 deletions resources/lang/de_AT/metric.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
'form' => [
'name_label' => 'Name',
'suffix_label' => 'Suffix',
'suffix_placeholder' => 'z. B. ms, %, usw.',
'description_label' => 'Beschreibung',
'default_view_label' => 'Standardansicht',
'default_value_label' => 'Standardwert',
Expand Down
20 changes: 20 additions & 0 deletions resources/lang/de_AT/update.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php

return [
'resource_label' => 'Update|Updates',
'list' => [
'headers' => [
'message' => 'Nachricht',
'status' => 'Status',
'user' => 'Benutzer',
'created_at' => 'Erstellt am',
'updated_at' => 'Aktualisiert am',
],
],
'form' => [
'message_label' => 'Nachricht',
'user_label' => 'Benutzer',
'user_helper' => 'Benutzer, welcher den Vorfall gemeldet hat.',
'status_label' => 'Status',
],
];
1 change: 1 addition & 0 deletions resources/lang/de_CH/cachet.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@
'open_source_status_page' => 'Die Open-Source-Statusseite.',
'all_times_shown_in' => 'Alle Zeiten werden angezeigt in *:timezone*.',
'rss_feed' => ':name RSS-Feed',
'and' => 'und',
];
1 change: 1 addition & 0 deletions resources/lang/de_CH/metric.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
'form' => [
'name_label' => 'Name',
'suffix_label' => 'Suffix',
'suffix_placeholder' => 'z. B. ms, %, usw.',
'description_label' => 'Beschreibung',
'default_view_label' => 'Standardansicht',
'default_value_label' => 'Standardwert',
Expand Down
20 changes: 20 additions & 0 deletions resources/lang/de_CH/update.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php

return [
'resource_label' => 'Update|Updates',
'list' => [
'headers' => [
'message' => 'Nachricht',
'status' => 'Status',
'user' => 'Benutzer',
'created_at' => 'Erstellt am',
'updated_at' => 'Aktualisiert am',
],
],
'form' => [
'message_label' => 'Nachricht',
'user_label' => 'Benutzer',
'user_helper' => 'Benutzer, welcher den Vorfall gemeldet hat.',
'status_label' => 'Status',
],
];
1 change: 1 addition & 0 deletions resources/lang/en/cachet.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@
'open_source_status_page' => 'The open source status page.',
'all_times_shown_in' => 'All times are shown in *:timezone*.',
'rss_feed' => ':name RSS feed',
'and' => 'and',
];
1 change: 1 addition & 0 deletions resources/lang/en/metric.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
'form' => [
'name_label' => 'Name',
'suffix_label' => 'Suffix',
'suffix_placeholder' => 'e.g. ms, %, etc.',
'description_label' => 'Description',
'default_view_label' => 'Default view',
'default_value_label' => 'Default value',
Expand Down
20 changes: 20 additions & 0 deletions resources/lang/en/update.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php

return [
'resource_label' => 'Update|Updates',
'list' => [
'headers' => [
'message' => 'Message',
'status' => 'Status',
'user' => 'User',
'created_at' => 'Created at',
'updated_at' => 'Updated at',
],
],
'form' => [
'message_label' => 'Message',
'user_label' => 'User',
'user_helper' => 'The user who reported the incident.',
'status_label' => 'Status',
],
];
8 changes: 4 additions & 4 deletions resources/views/components/incident.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class="text-zinc-400 transition hover:text-zinc-700 dark:text-zinc-500 dark:hove

@if ($incident->components->isNotEmpty())
<div data-slot="affected-components" class="text-xs text-zinc-500 dark:text-zinc-400">
{{ __('Affected Components') }}: {{ $incident->components->pluck('name')->join(', ', ' and ') }}
{{ __('cachet::incident.affected_components_header') }}: {{ $incident->components->pluck('name')->join(', ', ' '.__('cachet::cachet.and').' ') }}
</div>
@endif
</div>
Expand Down Expand Up @@ -82,9 +82,9 @@ class="text-zinc-400 transition hover:text-zinc-700 dark:text-zinc-500 dark:hove
@php($reportStatus = $incident->updates->isEmpty() ? $incident->status : null)
<x-cachet::incident-update-status :status="$reportStatus ?? IncidentStatusEnum::unknown" />
@if ($headingLevel === 1)
<h2 class="text-sm font-semibold tracking-tight text-zinc-900 dark:text-zinc-100 sm:text-base">{{ $reportStatus?->getLabel() ?? __('Reported') }}</h2>
<h2 class="text-sm font-semibold tracking-tight text-zinc-900 dark:text-zinc-100 sm:text-base">{{ $reportStatus?->getLabel() ?? __('cachet::incident.status.reported') }}</h2>
@else
<h3 class="text-sm font-semibold tracking-tight text-zinc-900 dark:text-zinc-100 sm:text-base">{{ $reportStatus?->getLabel() ?? __('Reported') }}</h3>
<h3 class="text-sm font-semibold tracking-tight text-zinc-900 dark:text-zinc-100 sm:text-base">{{ $reportStatus?->getLabel() ?? __('cachet::incident.status.reported') }}</h3>
@endif
<span class="text-xs text-zinc-500 dark:text-zinc-400">
<x-cachet::timestamp :timestamp="$incident->timestamp" />
Expand Down Expand Up @@ -122,7 +122,7 @@ class="group relative rounded-lg bg-white shadow-sm ring-1 ring-zinc-900/10 dark

@if ($schedule->components->isNotEmpty())
<div data-slot="affected-components" class="text-xs text-zinc-500 dark:text-zinc-400">
{{ __('Affected Components') }}: {{ $schedule->components->pluck('name')->join(', ', ' and ') }}
{{ __('cachet::incident.affected_components_header') }}: {{ $schedule->components->pluck('name')->join(', ', ' '.__('cachet::cachet.and').' ') }}
</div>
@endif

Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/schedule.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

@if ($schedule->components->isNotEmpty())
<div data-slot="affected-components" class="text-xs text-zinc-500 dark:text-zinc-400">
{{ __('Affected Components') }}: {{ $schedule->components->pluck('name')->join(', ', ' and ') }}
{{ __('cachet::incident.affected_components_header') }}: {{ $schedule->components->pluck('name')->join(', ', ' '.__('cachet::cachet.and').' ') }}
</div>
@endif

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class ComponentsRelationManager extends RelationManager

public static function getTitle(Model $ownerRecord, string $pageClass): string
{
return __('Components');
return trans_choice('cachet::component.resource_label', 2);
}

public function form(Schema $schema): Schema
Expand Down
2 changes: 1 addition & 1 deletion src/Filament/Resources/Incidents/IncidentResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public static function form(Schema $schema): Schema
->default(ResourceVisibilityEnum::guest)
->required(),
Select::make('user_id')
->label(__('User'))
->label(__('cachet::incident.form.user_label'))
->helperText(__('cachet::incident.form.user_helper'))
->relationship('user', 'name')
->default(auth()->id())
Expand Down
2 changes: 1 addition & 1 deletion src/Filament/Resources/Metrics/MetricResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public static function form(Schema $schema): Schema
->label(__('cachet::metric.form.suffix_label'))
->required()
->maxLength(255)
->placeholder('e.g. ms, %, etc.'),
->placeholder(__('cachet::metric.form.suffix_placeholder')),
MarkdownEditor::make('description')
->label(__('cachet::metric.form.description_label'))
->maxLength(255)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,36 +27,36 @@ public function form(Schema $schema): Schema
return $schema
->components([
MarkdownEditor::make('message')
->label(__('Message'))
->label(__('cachet::update.form.message_label'))
->required()
->minHeight('200px')
->maxHeight('300px')
->columnSpanFull(),
Select::make('user_id')
->label(__('User'))
->hint(__('The user who reported the incident.'))
->label(__('cachet::update.form.user_label'))
->hint(__('cachet::update.form.user_helper'))
->relationship('user', 'name')
->searchable()
->preload()
->createOptionForm([
TextInput::make('name')
->label(__('Name'))
->label(__('cachet::user.form.name_label'))
->required()
->maxLength(255),
TextInput::make('email')
->label(__('Email'))
->label(__('cachet::user.form.email_label'))
->required()
->email()
->maxLength(255),
TextInput::make('password')
->label(__('Password'))
->label(__('cachet::user.form.password_label'))
->required()
->password()
->confirmed()
->minLength(8),
]),
ToggleButtons::make('status')
->label(__('Status'))
->label(__('cachet::update.form.status_label'))
->inline()
->columnSpanFull()
->options(IncidentStatusEnum::class)
Expand All @@ -69,36 +69,36 @@ public function table(Table $table): Table
{
return $table
->recordTitleAttribute('message')
->modelLabel(__('Update'))
->pluralModelLabel(__('Updates'))
->modelLabel(trans_choice('cachet::update.resource_label', 1))
->pluralModelLabel(trans_choice('cachet::update.resource_label', 2))
->columns([
TextColumn::make('message')
->label(__('Message'))
->label(__('cachet::update.list.headers.message'))
->searchable()
->limit(80)
->wrap(),
TextColumn::make('status')
->label(__('Status'))
->label(__('cachet::update.list.headers.status'))
->badge()
->sortable()
->visible(fn (): bool => $this->getOwnerRecord() instanceof Incident),
TextColumn::make('user.name')
->label(__('User'))
->label(__('cachet::update.list.headers.user'))
->sortable(),
TextColumn::make('created_at')
->label(__('Created at'))
->label(__('cachet::update.list.headers.created_at'))
->dateTime()
->sortable(),
TextColumn::make('updated_at')
->label(__('Updated at'))
->label(__('cachet::update.list.headers.updated_at'))
->dateTime()
->sortable()
->toggleable(isToggledHiddenByDefault: true),
])
->defaultSort('created_at', 'desc')
->filters([
SelectFilter::make('status')
->label(__('Status'))
->label(__('cachet::update.list.headers.status'))
->options(IncidentStatusEnum::class)
->visible(fn (): bool => $this->getOwnerRecord() instanceof Incident),
])
Expand Down
16 changes: 16 additions & 0 deletions tests/Feature/Filament/Resources/IncidentResourceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use Cachet\Enums\IncidentStatusEnum;
use Cachet\Enums\ResourceVisibilityEnum;
use Cachet\Filament\Components\ComponentOptions;
use Cachet\Filament\Resources\Components\RelationManagers\ComponentsRelationManager;
use Cachet\Filament\Resources\Incidents\IncidentResource;
use Cachet\Filament\Resources\Incidents\Pages\CreateIncident;
use Cachet\Filament\Resources\Incidents\Pages\EditIncident;
Expand All @@ -18,6 +19,7 @@
use Cachet\Notifications\NewIncidentNotification;
use Cachet\Settings\MailSettings;
use Filament\Facades\Filament;
use Filament\Tables\Columns\TextColumn;
use Illuminate\Support\Facades\Notification;
use Workbench\App\User;

Expand Down Expand Up @@ -185,6 +187,20 @@
->assertTableColumnStateSet('message', $update->message, $update);
});

it('translates the update and component relation managers', function () {
app()->setLocale('de');
$incident = Incident::factory()->create();

livewire(UpdatesRelationManager::class, [
'ownerRecord' => $incident,
'pageClass' => EditIncident::class,
])
->assertTableColumnExists('message', fn (TextColumn $column): bool => $column->getLabel() === 'Nachricht')
->assertTableColumnExists('created_at', fn (TextColumn $column): bool => $column->getLabel() === 'Erstellt am');

expect(ComponentsRelationManager::getTitle($incident, EditIncident::class))->toBe('Komponenten');
});

it('excludes already attached components from the attach action options', function () {
$incident = Incident::factory()->create();
$attached = Component::factory()->create(['name' => 'Already Attached']);
Expand Down
21 changes: 21 additions & 0 deletions tests/Feature/StatusPage/SchedulePageTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@

namespace Tests\Feature\StatusPage;

use Cachet\Enums\ComponentStatusEnum;
use Cachet\Enums\IncidentStatusEnum;
use Cachet\Models\Component;
use Cachet\Models\Schedule;
use Cachet\Models\Update;
use Cachet\Settings\AppSettings;

use function Pest\Laravel\get;

Expand All @@ -27,6 +30,24 @@
->assertSee('Maintenance window confirmed.');
});

it('translates the affected components label', function () {
$settings = app(AppSettings::class);
$settings->locale = 'de';
$settings->save();

$database = Component::factory()->create(['name' => 'Database']);
$website = Component::factory()->create(['name' => 'Website']);
$schedule = Schedule::factory()->create(['scheduled_at' => now()->addDay()]);
$schedule->components()->attach([$database->id, $website->id], [
'component_status' => ComponentStatusEnum::under_maintenance,
]);

get(route('cachet.status-page.schedule', ['schedule' => $schedule]))
->assertOk()
->assertSee('Betroffene Komponenten: Database und Website')
->assertDontSee('Affected Components');
});

it('links to schedules from the status page', function () {
$schedule = Schedule::factory()->create(['scheduled_at' => now()->addDay()]);

Expand Down
Loading
Loading