Skip to content

Commit 641d156

Browse files
authored
[5.x] Fix control panel crashes when titles share name with existing translation file (#11578)
1 parent 68c61a9 commit 641d156

File tree

16 files changed

+32
-0
lines changed

16 files changed

+32
-0
lines changed

src/Exceptions/ControlPanelExceptionHandler.php

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
use Statamic\Exceptions\ValidationException as StatamicValidationException;
99
use Throwable;
1010

11+
use function Statamic\trans as __;
12+
1113
class ControlPanelExceptionHandler extends Handler
1214
{
1315
use Concerns\RendersControlPanelExceptions;

src/Fieldtypes/Entries.php

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
use Statamic\Search\Result;
2828
use Statamic\Support\Arr;
2929

30+
use function Statamic\trans as __;
31+
3032
class Entries extends Relationship
3133
{
3234
use QueriesFilters;

src/Fieldtypes/Terms.php

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
use Statamic\Support\Arr;
2727
use Statamic\Support\Str;
2828

29+
use function Statamic\trans as __;
30+
2931
class Terms extends Relationship
3032
{
3133
protected $canEdit = true;

src/Fieldtypes/UserGroups.php

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
use Statamic\Facades\UserGroup;
88
use Statamic\GraphQL\Types\UserGroupType;
99

10+
use function Statamic\trans as __;
11+
1012
class UserGroups extends Relationship
1113
{
1214
protected $canEdit = false;

src/Fieldtypes/UserRoles.php

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
use Statamic\Facades\Scope;
88
use Statamic\GraphQL\Types\RoleType;
99

10+
use function Statamic\trans as __;
11+
1012
class UserRoles extends Relationship
1113
{
1214
protected $canEdit = false;

src/Forms/Email.php

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
use Statamic\Support\Arr;
1515
use Statamic\Support\Str;
1616

17+
use function Statamic\trans as __;
18+
1719
class Email extends Mailable
1820
{
1921
use Queueable, SerializesModels;

src/Forms/Exporters/Exporter.php

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
use Statamic\Facades\File;
88
use Symfony\Component\HttpFoundation\BinaryFileResponse;
99

10+
use function Statamic\trans as __;
11+
1012
abstract class Exporter
1113
{
1214
protected static string $title;

src/Forms/Fieldtype.php

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
use Statamic\Query\ItemQueryBuilder;
1313
use Statamic\Query\Scopes\Filter;
1414

15+
use function Statamic\trans as __;
16+
1517
class Fieldtype extends Relationship
1618
{
1719
protected static $handle = 'form';

src/Http/Controllers/CP/Collections/CollectionsController.php

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
use Statamic\Support\Arr;
2121
use Statamic\Support\Str;
2222

23+
use function Statamic\trans as __;
24+
2325
class CollectionsController extends CpController
2426
{
2527
public function index(Request $request)

src/Http/Controllers/CP/Forms/FormsController.php

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
use Statamic\Rules\Handle;
1515
use Statamic\Support\Str;
1616

17+
use function Statamic\trans as __;
18+
1719
class FormsController extends CpController
1820
{
1921
public function index(Request $request)

src/Http/Controllers/CP/Preferences/Nav/RoleNavController.php

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
use Statamic\Facades\Role;
99
use Statamic\Http\Controllers\Controller;
1010

11+
use function Statamic\trans as __;
12+
1113
class RoleNavController extends Controller
1214
{
1315
use Concerns\HasNavBuilder;

src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
use Statamic\Support\Arr;
2121
use Statamic\Support\Str;
2222

23+
use function Statamic\trans as __;
24+
2325
class TaxonomiesController extends CpController
2426
{
2527
public function index()

src/Http/Controllers/CP/Users/RolesController.php

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
use Statamic\Rules\Handle;
1313
use Statamic\Support\Str;
1414

15+
use function Statamic\trans as __;
16+
1517
class RolesController extends CpController
1618
{
1719
public function __construct()

src/Query/Scopes/Filters/Fields.php

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
use Statamic\Query\Scopes\Filter;
1111
use Statamic\Support\Arr;
1212

13+
use function Statamic\trans as __;
14+
1315
class Fields extends Filter
1416
{
1517
protected $pinned = true;

src/Query/Scopes/Filters/Site.php

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
use Statamic\Facades\Collection;
88
use Statamic\Query\Scopes\Filter;
99

10+
use function Statamic\trans as __;
11+
1012
class Site extends Filter
1113
{
1214
protected $pinned = true;

src/Taxonomies/Taxonomy.php

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
use Statamic\Support\Str;
3232
use Statamic\Support\Traits\FluentlyGetsAndSets;
3333

34+
use function Statamic\trans as __;
35+
3436
class Taxonomy implements Arrayable, ArrayAccess, AugmentableContract, Contract, Responsable
3537
{
3638
use ContainsCascadingData, ContainsSupplementalData, ExistsAsFile, FluentlyGetsAndSets, HasAugmentedData;

0 commit comments

Comments
 (0)