Update 'legend' in forms

Translation of strings has been moved to the form template.

app/Models/Pages/Admin/Bans.php

@@ -186,7 +186,7 @@ class Bans extends Admin
             'type' => 'endwrap',
         ];
         $form['sets']['filters'] = [
-            'legend' => __('Ban search subhead'),
+            'legend' => 'Ban search subhead',
             'fields' => $fields,
         ];
 
@@ -221,7 +221,7 @@ class Bans extends Admin
             'type' => 'endwrap',
         ];
         $form['sets']['sorting'] = [
-            'legend' => __('Search results legend'),
+            'legend' => 'Search results legend',
             'fields' => $fields,
         ];
 
@@ -292,7 +292,7 @@ class Bans extends Admin
             'value'     => $data['expire'] ?? null,
         ];
         $form['sets']['ban-exp'] = [
-            'legend' => __('Message expiry subhead'),
+            'legend' => 'Message expiry subhead',
             'fields' => $fields,
         ];
 

app/Models/Pages/Admin/Forums.php

@@ -545,7 +545,7 @@ class Forums extends Admin
 
             $form['sets']["perms{$id}"] = [
                 'class'  => ['permission'],
-                'legend' => \ForkBB\e($group->g_title),
+                'legend' => $group->g_title,
                 'fields' => $fields,
             ];
         }

app/Models/Pages/Admin/Groups.php

@@ -75,7 +75,7 @@ class Groups extends Admin
             ],
             'sets'   => [
                 'base' => [
-                    'legend' => __('Add group subhead'),
+                    'legend' => 'Add group subhead',
                     'fields' => [
                         'basegroup' => [
                             'type'      => 'select',
@@ -109,7 +109,7 @@ class Groups extends Admin
             ],
             'sets'   => [
                 'del' => [
-                    'legend' => __('Default group subhead'),
+                    'legend' => 'Default group subhead',
                     'fields' => [
                         'defaultgroup' => [
                             'type'    => 'select',
@@ -388,7 +388,7 @@ class Groups extends Admin
             'help'      => ['User title help', $group->groupGuest ? __('Guest') : __('Member')],
         ];
         $form['sets']['group-titles'] = [
-            'legend' => __('Titles subhead'),
+            'legend' => 'Titles subhead',
             'fields' => $fieldset,
         ];
 
@@ -425,7 +425,7 @@ class Groups extends Admin
                 'help'    => 'Number for promotion help',
             ];
             $form['sets']['group-promote'] = [
-                'legend' => __('Promotion subhead'),
+                'legend' => 'Promotion subhead',
                 'fields' => $fieldset,
             ];
         }
@@ -482,7 +482,7 @@ class Groups extends Admin
                 'help'    => 'Ban users help',
             ];
             $form['sets']['group-mod'] = [
-                'legend' => __('Moderation subhead'),
+                'legend' => 'Moderation subhead',
                 'fields' => $fieldset,
             ];
             $form['sets']['mod-info'] = [
@@ -588,7 +588,7 @@ class Groups extends Admin
         }
 
         $form['sets']['group-permissions'] = [
-            'legend' => __('Permissions subhead'),
+            'legend' => 'Permissions subhead',
             'fields' => $fieldset,
         ];
         $form['sets']['def-info'] = [
@@ -646,7 +646,7 @@ class Groups extends Admin
         }
 
         $form['sets']['group-intervals'] = [
-            'legend' => __('Intervals subhead'),
+            'legend' => 'Intervals subhead',
             'fields' => $fieldset,
         ];
 
@@ -669,7 +669,7 @@ class Groups extends Admin
                 'help'    => 'Max sig lines help',
             ];
             $form['sets']['group-signature'] = [
-                'legend' => __('Signature subhead'),
+                'legend' => 'Signature subhead',
                 'fields' => $fieldset,
             ];
 
@@ -690,7 +690,7 @@ class Groups extends Admin
                 'help'    => 'PM limit help',
             ];
             $form['sets']['group-pm'] = [
-                'legend' => __('PM subhead'),
+                'legend' => 'PM subhead',
                 'fields' => $fieldset,
             ];
         }

app/Models/Pages/Admin/Maintenance.php

@@ -72,7 +72,7 @@ class Maintenance extends Admin
             ],
             'sets'   => [
                 'maint' => [
-                    'legend' => __('Maintenance head'),
+                    'legend' => 'Maintenance head',
                     'fields' => [
                         'o_maintenance' => [
                             'type'    => 'radio',
@@ -119,7 +119,7 @@ class Maintenance extends Admin
                     ],
                 ],
                 'indx' => [
-                    'legend' => __('Rebuild index head'),
+                    'legend' => 'Rebuild index head',
                     'fields' => [
                         'limit' => [
                             'type'    => 'number',

app/Models/Pages/Admin/Options.php

@@ -202,7 +202,7 @@ class Options extends Admin
         $styles = $this->c->Func->getStyles();
 
         $form['sets']['essentials'] = [
-            'legend' => __('Essentials subhead'),
+            'legend' => 'Essentials subhead',
             'fields' => [
                 'o_board_title' => [
                     'type'      => 'text',
@@ -294,7 +294,7 @@ class Options extends Admin
         $timestamp = \time() + ($this->user->timezone + $this->user->dst) * 3600;
 
         $form['sets']['timeouts'] = [
-            'legend' => __('Timeouts subhead'),
+            'legend' => 'Timeouts subhead',
             'fields' => [
                 'o_timeout_visit' => [
                     'type'    => 'number',
@@ -324,7 +324,7 @@ class Options extends Admin
         ];
 
         $form['sets']['display'] = [
-            'legend' => __('Display subhead'),
+            'legend' => 'Display subhead',
             'fields' => [
                 'o_show_user_info' => [
                     'type'    => 'radio',
@@ -404,7 +404,7 @@ class Options extends Admin
         ];
 
         $form['sets']['features'] = [
-            'legend' => __('Features subhead'),
+            'legend' => 'Features subhead',
             'fields' => [
                 'o_quickpost' => [
                     'type'    => 'radio',
@@ -459,7 +459,7 @@ class Options extends Admin
         ];
 
         $form['sets']['feed'] = [
-            'legend' => __('Feed subhead'),
+            'legend' => 'Feed subhead',
             'fields' => [
                 'i_feed_type' => [
                     'type'    => 'radio',
@@ -490,7 +490,7 @@ class Options extends Admin
         ];
 
         $form['sets']['reports'] = [
-            'legend' => __('Reports subhead'),
+            'legend' => 'Reports subhead',
             'fields' => [
                 'i_report_method' => [
                     'type'    => 'radio',
@@ -513,7 +513,7 @@ class Options extends Admin
         ];
 
         $form['sets']['avatars'] = [
-            'legend' => __('Avatars subhead'),
+            'legend' => 'Avatars subhead',
             'fields' => [
                 'o_avatars' => [
                     'type'    => 'radio',
@@ -558,7 +558,7 @@ class Options extends Admin
         ];
 
         $form['sets']['email'] = [
-            'legend' => __('E-mail subhead'),
+            'legend' => 'E-mail subhead',
             'fields' => [
                 'o_admin_email' => [
                     'type'      => 'text',
@@ -637,7 +637,7 @@ class Options extends Admin
         ];
 
         $form['sets']['registration'] = [
-            'legend' => __('Registration subhead'),
+            'legend' => 'Registration subhead',
             'fields' => [
                 'o_regs_allow' => [
                     'type'    => 'radio',
@@ -689,7 +689,7 @@ class Options extends Admin
         ];
 
         $form['sets']['announcement'] = [
-            'legend' => __('Announcement subhead'),
+            'legend' => 'Announcement subhead',
             'fields' => [
                 'o_announcement' => [
                     'type'    => 'radio',
@@ -709,7 +709,7 @@ class Options extends Admin
         ];
 
         $form['sets']['polls'] = [
-            'legend' => __('Polls subhead'),
+            'legend' => 'Polls subhead',
             'fields' => [
                 'b_poll_enabled' => [
                     'type'    => 'radio',
@@ -760,7 +760,7 @@ class Options extends Admin
         ];
 
         $form['sets']['pm'] = [
-            'legend' => __('PM subhead'),
+            'legend' => 'PM subhead',
             'fields' => [
                 'b_pm' => [
                     'type'    => 'radio',

app/Models/Pages/Admin/Parser/BBCode.php

@@ -120,7 +120,7 @@ class BBCode extends Parser
             'sets' => [
                 'bbcode-legend' => [
                     'class'  => ['bbcode-legend'],
-                    'legend' => __('BBCode list subhead'),
+                    'legend' => 'BBCode list subhead',
                     'fields' => [],
                 ],
             ],
@@ -190,7 +190,7 @@ class BBCode extends Parser
 
             $form['sets']["bbcode{$id}"] = [
                 'class'  => ['bbcode'],
-                'legend' => __(['BBCode %s', $tag]),
+                'legend' => ['BBCode %s', $tag],
                 'fields' => $fields,
             ];
         }
@@ -541,7 +541,7 @@ class BBCode extends Parser
             $structure->no_attr,
             'no_attr',
             'no_attr',
-            __(['No attr subhead', $tagStr]),
+            ['No attr subhead', $tagStr],
             'Allowed no_attr info'
         );
 
@@ -549,7 +549,7 @@ class BBCode extends Parser
             $structure->def_attr,
             'def_attr',
             'def_attr',
-            __(['Def attr subhead', $tagStr]),
+            ['Def attr subhead', $tagStr],
             'Allowed def_attr info'
         );
 
@@ -558,7 +558,7 @@ class BBCode extends Parser
                 $attr,
                 $name,
                 "{$name}_attr",
-                __(['Other attr subhead', $tagStr, $name]),
+                ['Other attr subhead', $tagStr, $name],
                 __(['Allowed %s attr info', $name])
             );
         }
@@ -567,7 +567,7 @@ class BBCode extends Parser
             $structure->new_attr,
             'new_attr',
             'new_attr',
-            __('New attr subhead'),
+            'New attr subhead',
             'Allowed new_attr info'
         );
 
@@ -577,7 +577,7 @@ class BBCode extends Parser
     /**
      * Формирует данные для формы
      */
-    protected function formEditSub(/* mixed */ $data, string $name, string $class, string $legend, string $info): array
+    protected function formEditSub(/* mixed */ $data, string $name, string $class, /* string|array */ $legend, string $info): array
     {
         $yn     = [1 => __('Yes'), 0 => __('No')];
         $fields = [];

app/Models/Pages/Admin/Parser/Edit.php

@@ -88,7 +88,7 @@ class Edit extends Parser
         $yn = [1 => __('Yes'), 0 => __('No')];
 
         $form['sets']['bbcode'] = [
-            'legend' => __('BBCode subhead'),
+            'legend' => 'BBCode subhead',
             'fields' => [
                 'p_message_bbcode' => [
                     'type'    => 'radio',
@@ -122,7 +122,7 @@ class Edit extends Parser
         ];
 
         $form['sets']['smilies'] = [
-            'legend' => __('Smilies subhead'),
+            'legend' => 'Smilies subhead',
             'fields' => [
                 'o_smilies' => [
                     'type'    => 'radio',

app/Models/Pages/Admin/Parser/Smilies.php

@@ -144,7 +144,7 @@ class Smilies extends Parser
             'sets' => [
                 'smilies-legend' => [
                     'class'  => ['smilies-legend'],
-                    'legend' => __('Smilies list subhead'),
+                    'legend' => 'Smilies list subhead',
                     'fields' => [],
                 ],
             ],
@@ -211,7 +211,7 @@ class Smilies extends Parser
 
             $form['sets']["smile{$id}"] = [
                 'class'  => ['smile'],
-                'legend' => __(['Smiley number %s', $i]),
+                'legend' => ['Smiley number %s', $i],
                 'fields' => $fields,
             ];
 
@@ -220,7 +220,7 @@ class Smilies extends Parser
 
         $form['sets']['new-smile'] = [
             'class'  => ['new-smile'],
-            'legend' => __('New smile subhead'),
+            'legend' => 'New smile subhead',
             'fields' => [
                 'new_sm_code' => [
                     'class'     => ['code', 'new-smile'],
@@ -260,7 +260,7 @@ class Smilies extends Parser
             'sets' => [
                 'image-legend' => [
                     'class'  => ['image-legend'],
-                    'legend' => __('Available images subhead'),
+                    'legend' => 'Available images subhead',
                     'fields' => [],
                 ],
             ],
@@ -320,7 +320,7 @@ class Smilies extends Parser
             'sets'    => [
                 'upload' => [
                     'class'  => ['upload_smile'],
-                    'legend' => __('Upload image subhead'),
+                    'legend' => 'Upload image subhead',
                     'fields' => [
                         'upload_image' => [
                             'type'    => 'file',

app/Models/Pages/Admin/Reports.php

@@ -77,11 +77,11 @@ class Reports extends Admin
         foreach ($reports as $report) {
             if ($noZapped) {
                 $cur = [
-                    'legend' => __(['Reported %s', \ForkBB\dt($report->created)]),
+                    'legend' => ['Reported %s', \ForkBB\dt($report->created)],
                 ];
             } else {
                 $cur = [
-                    'legend' => __(['Marked as read %1$s by %2$s', \ForkBB\dt($report->zapped), $report->marker->username]),
+                    'legend' => ['Marked as read %1$s by %2$s', \ForkBB\dt($report->zapped), $report->marker->username],
                 ];
             }
             $cur['fields'] = [];

app/Models/Pages/Admin/Update.php

@@ -295,7 +295,7 @@ class Update extends Admin
                     ],
                 ],
                 'update' => [
-                    'legend' => __('Update ForkBB'),
+                    'legend' => 'Update ForkBB',
                     'fields' => [
                         'dbpass' => [
                             'type'     => 'password',

app/Models/Pages/Admin/Users/NewUser.php

@@ -95,7 +95,7 @@ class NewUser extends Users
             ],
             'sets'   => [
                 'reg' => [
-                    'legend' => __('Add user legend'),
+                    'legend' => 'Add user legend',
                     'fields' => [
                         'username' => [
                             'autofocus' => true,

app/Models/Pages/Admin/Users/View.php

@@ -141,7 +141,7 @@ class View extends Users
             'hidden' => [],
             'sets'   => [
                 'new' => [
-                    'legend' => __('New user'),
+                    'legend' => 'New user',
                     'fields' => [],
                 ]
             ],
@@ -327,7 +327,7 @@ class View extends Users
             'type' => 'endwrap',
         ];
         $form['sets']['filters'] = [
-            'legend' => __('User search subhead'),
+            'legend' => 'User search subhead',
             'fields' => $fields,
         ];
 
@@ -370,7 +370,7 @@ class View extends Users
         ];
 
         $form['sets']['sorting'] = [
-            'legend' => __('Search results legend'),
+            'legend' => 'Search results legend',
             'fields' => $fields,
         ];
 
@@ -404,7 +404,7 @@ class View extends Users
             'required'  => true,
         ];
         $form['sets']['ip'] = [
-            'legend' => __('IP search subhead'),
+            'legend' => 'IP search subhead',
             'fields' => $fields,
         ];
 
@@ -446,7 +446,7 @@ class View extends Users
             ],
             'sets'   => [
                 'recalculate' => [
-                    'legend' => __('Number of users posts'),
+                    'legend' => 'Number of users posts',
                     'fields' => [],
                 ]
             ],

app/Models/Pages/Email.php

@@ -145,7 +145,7 @@ class Email extends Page
             ],
             'sets'   => [
                 'send-email' => [
-                    'legend' => __(['Send email to %s', $this->curUser->username]),
+                    'legend' => ['Send email to %s', $this->curUser->username],
                     'fields' => [
                         'subject' => [
                             'type'      => 'text',

app/Models/Pages/PM/PMConfig.php

@@ -85,7 +85,7 @@ class PMConfig extends AbstractPM
             ],
             'sets'   => [
                 'config' => [
-                    'legend' => __('PM Config legend'),
+                    'legend' => 'PM Config legend',
                     'fields' => [
                         'u_pm' => [
                             'type'    => 'radio',

app/Models/Pages/PostFormTrait.php

@@ -172,7 +172,7 @@ trait PostFormTrait
 
         if ($fieldset) {
             $form['sets']['uesm-options'] = [
-                'legend' => __('Options'),
+                'legend' => 'Options',
                 'fields' => $fieldset,
             ];
         }
@@ -211,7 +211,7 @@ trait PostFormTrait
             ];
 
             $form['sets']['uesm-poll'] = [
-                'legend' => __('Poll legend'),
+                'legend' => 'Poll legend',
                 'fields' => $fieldset,
             ];
 
@@ -246,7 +246,7 @@ trait PostFormTrait
                 }
 
                 $form['sets']["uesm-q-{$qid}"] = [
-                    'legend' => __(['Question %s legend', $qid]),
+                    'legend' => ['Question %s legend', $qid],
                     'fields' => $fieldset,
                 ];
             }

app/Models/Pages/Profile/Config.php

@@ -168,7 +168,7 @@ class Config extends Profile
         }
 
         $form['sets']['essentials'] = [
-            'legend' => __('Essentials'),
+            'legend' => 'Essentials',
             'class'  => ['data-edit'],
             'fields' => [
                 'language' => [
@@ -253,7 +253,7 @@ class Config extends Profile
             ],
         ];
         $form['sets']['viewing-posts'] = [
-            'legend' => __('Viewing posts'),
+            'legend' => 'Viewing posts',
             'class'  => ['data-edit'],
             'fields' => [
                 'show_smilies' => [
@@ -294,7 +294,7 @@ class Config extends Profile
             ],
         ];
         $form['sets']['pagination'] = [
-            'legend' => __('Pagination'),
+            'legend' => 'Pagination',
             'class'  => ['data-edit'],
             'fields' => [
                 'disp_topics' => [
@@ -316,7 +316,7 @@ class Config extends Profile
             ],
         ];
         $form['sets']['security'] = [
-            'legend' => __('Security'),
+            'legend' => 'Security',
             'class'  => ['data-edit'],
             'fields' => [
                 'ip_check_type' => [
@@ -336,7 +336,7 @@ class Config extends Profile
 
         if ($this->rules->viewSubscription) { // ???? модераторы?
             $form['sets']['subscriptions'] = [
-                'legend' => __('Subscription options'),
+                'legend' => 'Subscription options',
                 'class'  => ['data-edit'],
                 'fields' => [
                     'notify_with_post' => [

app/Models/Pages/Profile/Edit.php

@@ -336,7 +336,7 @@ class Edit extends Profile
         }
         $form['sets']['header'] = [
             'class'  => ['header-edit'],
-#            'legend' => __('Options'),
+#            'legend' => 'Options',
             'fields' => $fields,
         ];
 
@@ -344,7 +344,7 @@ class Edit extends Profile
         if ($this->user->isAdmMod) {
             $form['sets']['note'] = [
                 'class'  => ['data-edit'],
-                'legend' => __('Admin note'),
+                'legend' => 'Admin note',
                 'fields' => [
                     'admin_note' => [
                         'type'      => 'text',
@@ -384,7 +384,7 @@ class Edit extends Profile
         ];
         $form['sets']['personal'] = [
             'class'  => ['data-edit'],
-            'legend' => __('Personal information'),
+            'legend' => 'Personal information',
             'fields' => $fields,
         ];
 
@@ -440,7 +440,7 @@ class Edit extends Profile
         }
         $form['sets']['contacts'] = [
             'class'  => ['data-edit'],
-            'legend' => __('Contact details'),
+            'legend' => 'Contact details',
             'fields' => $fields,
         ];
 
@@ -455,7 +455,7 @@ class Edit extends Profile
             ];
             $form['sets']['signature'] = [
                 'class'  => ['data-edit'],
-                'legend' => __('Signature'),
+                'legend' => 'Signature',
                 'fields' => $fields,
             ];
         }

app/Models/Pages/Profile/View.php

@@ -81,7 +81,7 @@ class View extends Profile
         }
         $form['sets']['header'] = [
             'class'  => ['header'],
-#            'legend' => __('Options'),
+#            'legend' => 'Options',
             'fields' => $fields,
         ];
 
@@ -92,7 +92,7 @@ class View extends Profile
         ) {
             $form['sets']['note'] = [
                 'class'  => ['data'],
-                'legend' => __('Admin note'),
+                'legend' => 'Admin note',
                 'fields' => [
                     'admin_note' => [
                         'class'     => ['pline'],
@@ -137,7 +137,7 @@ class View extends Profile
         if (! empty($fields)) {
             $form['sets']['personal'] = [
                 'class'  => ['data'],
-                'legend' => __('Personal information'),
+                'legend' => 'Personal information',
                 'fields' => $fields,
             ];
         }
@@ -201,7 +201,7 @@ class View extends Profile
         if (! empty($fields)) {
             $form['sets']['contacts'] = [
                 'class'  => ['data'],
-                'legend' => __('Contact details'),
+                'legend' => 'Contact details',
                 'fields' => $fields,
             ];
         }
@@ -221,7 +221,7 @@ class View extends Profile
             if (! empty($fields)) {
                 $form['sets']['signature'] = [
                     'class'  => ['data'],
-                    'legend' => __('Signature'),
+                    'legend' => 'Signature',
                     'fields' => $fields,
                 ];
             }
@@ -325,7 +325,7 @@ class View extends Profile
         }
         $form['sets']['activity'] = [
             'class'  => ['data'],
-            'legend' => __('User activity'),
+            'legend' => 'User activity',
             'fields' => $fields,
         ];
 
@@ -370,7 +370,7 @@ class View extends Profile
         }
         $form['sets']['private'] = [
             'class'  => ['data'],
-            'legend' => __('Private information'),
+            'legend' => 'Private information',
             'fields' => $fields,
         ];
 

app/Models/Pages/Report.php

@@ -128,7 +128,7 @@ class Report extends Page
             ],
             'sets'   => [
                 'report' => [
-                    'legend' => __('Reason desc'),
+                    'legend' => 'Reason desc',
                     'fields' => [
                         'reason' => [
                             'type'      => 'textarea',

app/Models/Pages/Search.php

@@ -225,7 +225,7 @@ class Search extends Page
                     ],
                 ],
                 'where' => [
-                    'legend' => __('Search in legend'),
+                    'legend' => 'Search in legend',
                     'fields' => [
                         'forums' => [
                             'class'   => ['w3'],
@@ -258,7 +258,7 @@ class Search extends Page
                     ],
                 ],
                 'how' => [
-                    'legend' => __('Search results legend'),
+                    'legend' => 'Search results legend',
                     'fields' => [
                         'sort_by' => [
                             'class'   => ['w4'],

app/templates/layouts/form.forkbb.php

@@ -9,7 +9,7 @@
     @elseif (isset($setVal['fields']))
           <fieldset id="id-fs-{{ $setKey }}" @if ($setVal['class']) class="f-fs-{{ \implode(' f-fs-', $setVal['class']) }}" @endif>
         @if ($setVal['legend'])
-            <legend class="f-fleg">{{ $setVal['legend'] }}</legend>
+            <legend class="f-fleg">{!! __($setVal['legend']) !!}</legend>
         @endif
         @foreach ($setVal['fields'] as $key => $cur)
             @if ('info' === $cur['type'])