Skip to content

Commit

Permalink
Merge pull request #12738 from cheesegrits/3.x.lang-export
Browse files Browse the repository at this point in the history
Add download explanation to export action started language.
  • Loading branch information
danharrin committed May 12, 2024
2 parents 26b1948 + e85e4f5 commit e30a8f7
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion packages/actions/resources/lang/en/export.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@

'started' => [
'title' => 'Export started',
'body' => 'Your export has begun and 1 row will be processed in the background.|Your export has begun and :count rows will be processed in the background.',
'body' => 'Your export has begun and 1 row will be processed in the background. You will receive a notification with the download link when it is complete.|Your export has begun and :count rows will be processed in the background. You will receive a notification with the download link when it is complete.',
],

],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
'ring-1 ring-gray-950/10 dark:ring-white/20' => (($color === 'gray') || ($tag === 'label')) && (! $grouped),
'bg-custom-600 text-white hover:bg-custom-500 focus-visible:ring-custom-500/50 dark:bg-custom-500 dark:hover:bg-custom-400 dark:focus-visible:ring-custom-400/50' => ($color !== 'gray') && ($tag !== 'label'),
'[input:checked+&]:bg-custom-600 [input:checked+&]:text-white [input:checked+&]:ring-0 [input:checked+&]:hover:bg-custom-500 dark:[input:checked+&]:bg-custom-500 dark:[input:checked+&]:hover:bg-custom-400 [input:checked:focus-visible+&]:ring-custom-500/50 dark:[input:checked:focus-visible+&]:ring-custom-400/50 [input:focus-visible+&]:z-10 [input:focus-visible+&]:ring-2 [input:focus-visible+&]:ring-gray-950/10 dark:[input:focus-visible+&]:ring-white/20' => ($color !== 'gray') && ($tag === 'label'),
]
]
),
]);
Expand Down
2 changes: 1 addition & 1 deletion packages/tables/src/Columns/Summarizers/Summarizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function (EloquentBuilder $relatedQuery) use ($baseQuery, $query): EloquentBuild
}

$asName = (string) str($query->getModel()->getTable())->afterLast('.');

$query = DB::connection($query->getModel()->getConnectionName())
->table($query->toBase(), $asName);

Expand Down

0 comments on commit e30a8f7

Please sign in to comment.