瀏覽代碼

Update content of arrays for creating forms

Visman 4 年之前
父節點
當前提交
ae13880c6b
共有 33 個文件被更改,包括 334 次插入334 次删除
  1. 19 19
      app/Models/Pages/Admin/Bans.php
  2. 5 5
      app/Models/Pages/Admin/Categories.php
  3. 5 5
      app/Models/Pages/Admin/Censoring.php
  4. 13 13
      app/Models/Pages/Admin/Forums.php
  5. 35 35
      app/Models/Pages/Admin/Groups.php
  6. 18 18
      app/Models/Pages/Admin/Install.php
  7. 5 5
      app/Models/Pages/Admin/Maintenance.php
  8. 59 59
      app/Models/Pages/Admin/Options.php
  9. 23 23
      app/Models/Pages/Admin/Parser/BBCode.php
  10. 5 5
      app/Models/Pages/Admin/Parser/Edit.php
  11. 12 12
      app/Models/Pages/Admin/Parser/Smilies.php
  12. 2 2
      app/Models/Pages/Admin/Reports.php
  13. 2 2
      app/Models/Pages/Admin/Update.php
  14. 5 5
      app/Models/Pages/Admin/Users/Action.php
  15. 3 3
      app/Models/Pages/Admin/Users/NewUser.php
  16. 7 7
      app/Models/Pages/Admin/Users/Result.php
  17. 4 4
      app/Models/Pages/Admin/Users/Stat.php
  18. 16 16
      app/Models/Pages/Admin/Users/View.php
  19. 5 5
      app/Models/Pages/Auth.php
  20. 2 2
      app/Models/Pages/Email.php
  21. 2 2
      app/Models/Pages/Moderate.php
  22. 8 8
      app/Models/Pages/PostFormTrait.php
  23. 16 16
      app/Models/Pages/Profile/Config.php
  24. 18 18
      app/Models/Pages/Profile/Edit.php
  25. 2 2
      app/Models/Pages/Profile/Email.php
  26. 2 2
      app/Models/Pages/Profile/Mod.php
  27. 2 2
      app/Models/Pages/Profile/Pass.php
  28. 22 22
      app/Models/Pages/Profile/View.php
  29. 3 3
      app/Models/Pages/Register.php
  30. 1 1
      app/Models/Pages/Report.php
  31. 8 8
      app/Models/Pages/Search.php
  32. 4 4
      app/Models/Pages/Userlist.php
  33. 1 1
      app/templates/layouts/form.forkbb.php

+ 19 - 19
app/Models/Pages/Admin/Bans.php

@@ -144,25 +144,25 @@ class Bans extends Admin
         $fields['username'] = [
         $fields['username'] = [
             'type'      => 'text',
             'type'      => 'text',
             'maxlength' => '25',
             'maxlength' => '25',
-            'caption'   => __('Username label'),
+            'caption'   => 'Username label',
             'value'     => $data['username'] ?? null,
             'value'     => $data['username'] ?? null,
         ];
         ];
         $fields['ip'] = [
         $fields['ip'] = [
             'type'      => 'text',
             'type'      => 'text',
             'maxlength' => '40',
             'maxlength' => '40',
-            'caption'   => __('IP label'),
+            'caption'   => 'IP label',
             'value'     => $data['ip'] ?? null,
             'value'     => $data['ip'] ?? null,
         ];
         ];
         $fields['email'] = [
         $fields['email'] = [
             'type'      => 'text',
             'type'      => 'text',
             'maxlength' => '80',
             'maxlength' => '80',
-            'caption'   => __('E-mail label'),
+            'caption'   => 'E-mail label',
             'value'     => $data['email'] ?? null,
             'value'     => $data['email'] ?? null,
         ];
         ];
         $fields['message'] = [
         $fields['message'] = [
             'type'      => 'text',
             'type'      => 'text',
             'maxlength' => '255',
             'maxlength' => '255',
-            'caption'   => __('Message label'),
+            'caption'   => 'Message label',
             'value'     => $data['message'] ?? null,
             'value'     => $data['message'] ?? null,
         ];
         ];
         $fields['between1'] = [
         $fields['between1'] = [
@@ -174,7 +174,7 @@ class Bans extends Admin
             'type'      => 'text',
             'type'      => 'text',
             'maxlength' => '100',
             'maxlength' => '100',
             'value'     => $data['expire_1'] ?? null,
             'value'     => $data['expire_1'] ?? null,
-            'caption'   => __('Expire date label'),
+            'caption'   => 'Expire date label',
         ];
         ];
         $fields['expire_2'] = [
         $fields['expire_2'] = [
             'class'     => 'bend',
             'class'     => 'bend',
@@ -206,7 +206,7 @@ class Bans extends Admin
                 'expire'   => __('Order by expire'),
                 'expire'   => __('Order by expire'),
             ],
             ],
             'value'   => $data['order_by'] ?? 'id',
             'value'   => $data['order_by'] ?? 'id',
-            'caption' => __('Order by label'),
+            'caption' => 'Order by label',
         ];
         ];
         $fields['direction'] = [
         $fields['direction'] = [
             'class'   => 'bend',
             'class'   => 'bend',
@@ -252,21 +252,21 @@ class Bans extends Admin
             $fields['username'] = [
             $fields['username'] = [
                 'type'      => $this->banCount < 1 ? 'text' : 'str',
                 'type'      => $this->banCount < 1 ? 'text' : 'str',
                 'maxlength' => '25',
                 'maxlength' => '25',
-                'caption'   => __('Username label'),
+                'caption'   => 'Username label',
                 'help'      => $this->banCount < 1 ? 'Username help' : null,
                 'help'      => $this->banCount < 1 ? 'Username help' : null,
                 'value'     => $data['username'] ?? null,
                 'value'     => $data['username'] ?? null,
             ];
             ];
             $fields['ip'] = [
             $fields['ip'] = [
                 'type'      => 'text',
                 'type'      => 'text',
                 'maxlength' => '255',
                 'maxlength' => '255',
-                'caption'   => __('IP label'),
+                'caption'   => 'IP label',
                 'help'      => 'IP help',
                 'help'      => 'IP help',
                 'value'     => $data['ip'] ?? null,
                 'value'     => $data['ip'] ?? null,
             ];
             ];
             $fields['email'] = [
             $fields['email'] = [
                 'type'      => 'text',
                 'type'      => 'text',
                 'maxlength' => '80',
                 'maxlength' => '80',
-                'caption'   => __('E-mail label'),
+                'caption'   => 'E-mail label',
                 'help'      => 'E-mail help',
                 'help'      => 'E-mail help',
                 'value'     => $data['email'] ?? null,
                 'value'     => $data['email'] ?? null,
             ];
             ];
@@ -280,14 +280,14 @@ class Bans extends Admin
         $fields['message'] = [
         $fields['message'] = [
             'type'      => 'text',
             'type'      => 'text',
             'maxlength' => '255',
             'maxlength' => '255',
-            'caption'   => __('Ban message label'),
+            'caption'   => 'Ban message label',
             'help'      => 'Ban message help',
             'help'      => 'Ban message help',
             'value'     => $data['message'] ?? null,
             'value'     => $data['message'] ?? null,
         ];
         ];
         $fields['expire'] = [
         $fields['expire'] = [
             'type'      => 'text',
             'type'      => 'text',
             'maxlength' => '100',
             'maxlength' => '100',
-            'caption'   => __('Expire date label'),
+            'caption'   => 'Expire date label',
             'help'      => 'Expire date help',
             'help'      => 'Expire date help',
             'value'     => $data['expire'] ?? null,
             'value'     => $data['expire'] ?? null,
         ];
         ];
@@ -431,13 +431,13 @@ class Bans extends Admin
             $fields["l{$number}-username"] = [
             $fields["l{$number}-username"] = [
                 'class'   => '' == $ban['username'] ? ['result', 'username', 'no-data'] : ['result', 'username'],
                 'class'   => '' == $ban['username'] ? ['result', 'username', 'no-data'] : ['result', 'username'],
                 'type'    => 'str',
                 'type'    => 'str',
-                'caption' => __('Results username head'),
+                'caption' => 'Results username head',
                 'value'   => $ban['username'],
                 'value'   => $ban['username'],
             ];
             ];
             $fields["l{$number}-email"] = [
             $fields["l{$number}-email"] = [
                 'class'   => '' == $ban['email'] ? ['result', 'email', 'no-data'] : ['result', 'email'],
                 'class'   => '' == $ban['email'] ? ['result', 'email', 'no-data'] : ['result', 'email'],
                 'type'    => 'str',
                 'type'    => 'str',
-                'caption' => __('Results e-mail head'),
+                'caption' => 'Results e-mail head',
                 'value'   => $ban['email'],
                 'value'   => $ban['email'],
             ];
             ];
             $fields[] = [
             $fields[] = [
@@ -446,25 +446,25 @@ class Bans extends Admin
             $fields["l{$number}-ips"] = [
             $fields["l{$number}-ips"] = [
                 'class'   => '' == $ban['ip'] ? ['result', 'ips', 'no-data'] : ['result', 'ips'],
                 'class'   => '' == $ban['ip'] ? ['result', 'ips', 'no-data'] : ['result', 'ips'],
                 'type'    => 'str',
                 'type'    => 'str',
-                'caption' => __('Results IP address head'),
+                'caption' => 'Results IP address head',
                 'value'   => $ban['ip'],
                 'value'   => $ban['ip'],
             ];
             ];
             $fields["l{$number}-expire"] = [
             $fields["l{$number}-expire"] = [
                 'class'   => empty($ban['expire']) ? ['result', 'expire', 'no-data'] : ['result', 'expire'],
                 'class'   => empty($ban['expire']) ? ['result', 'expire', 'no-data'] : ['result', 'expire'],
                 'type'    => 'str',
                 'type'    => 'str',
-                'caption' => __('Results expire head'),
+                'caption' => 'Results expire head',
                 'value'   => empty($ban['expire']) ? '' : \ForkBB\dt($ban['expire'], true),
                 'value'   => empty($ban['expire']) ? '' : \ForkBB\dt($ban['expire'], true),
             ];
             ];
             $fields["l{$number}-message"] = [
             $fields["l{$number}-message"] = [
                 'class'   => '' == $ban['message'] ? ['result', 'message', 'no-data'] : ['result', 'message'],
                 'class'   => '' == $ban['message'] ? ['result', 'message', 'no-data'] : ['result', 'message'],
                 'type'    => 'str',
                 'type'    => 'str',
-                'caption' => __('Results message head'),
+                'caption' => 'Results message head',
                 'value'   => $ban['message'],
                 'value'   => $ban['message'],
             ];
             ];
             $fields["l{$number}-creator"] = [
             $fields["l{$number}-creator"] = [
                 'class'   => ['result', 'creator'],
                 'class'   => ['result', 'creator'],
                 'type'    => '1' == $this->user->g_view_users && $ban['id_creator'] > 1 ? 'link' : 'str',
                 'type'    => '1' == $this->user->g_view_users && $ban['id_creator'] > 1 ? 'link' : 'str',
-                'caption' => __('Results banned by head'),
+                'caption' => 'Results banned by head',
                 'value'   => $ban['name_creator'],
                 'value'   => $ban['name_creator'],
                 'href'    => $this->c->Router->link(
                 'href'    => $this->c->Router->link(
                     'User',
                     'User',
@@ -489,7 +489,7 @@ class Bans extends Admin
                 'class'   => ['result', 'btn-edit'],
                 'class'   => ['result', 'btn-edit'],
                 'type'    => $ban['id'] > 0 ? 'btn' : 'str',
                 'type'    => $ban['id'] > 0 ? 'btn' : 'str',
                 'value'   => '✎',
                 'value'   => '✎',
-                'caption' => __('Results actions head'),
+                'caption' => 'Results actions head',
                 'title'   => __('Edit'),
                 'title'   => __('Edit'),
                 'link'    => $this->c->Router->link(
                 'link'    => $this->c->Router->link(
                     'AdminBansEdit',
                     'AdminBansEdit',
@@ -500,7 +500,7 @@ class Bans extends Admin
                 'class'   => ['result', 'btn-delete'],
                 'class'   => ['result', 'btn-delete'],
                 'type'    => $ban['id'] > 0 ? 'btn' : 'str',
                 'type'    => $ban['id'] > 0 ? 'btn' : 'str',
                 'value'   => '❌',
                 'value'   => '❌',
-                'caption' => __('Results actions head'),
+                'caption' => 'Results actions head',
                 'title'   => __('Delete'),
                 'title'   => __('Delete'),
                 'link'    => $this->c->Router->link(
                 'link'    => $this->c->Router->link(
                     'AdminBansDelete',
                     'AdminBansDelete',

+ 5 - 5
app/Models/Pages/Admin/Categories.php

@@ -91,7 +91,7 @@ class Categories extends Admin
                 'type'      => 'text',
                 'type'      => 'text',
                 'maxlength' => '80',
                 'maxlength' => '80',
                 'value'     => $row['cat_name'],
                 'value'     => $row['cat_name'],
-                'caption'   => __('Category name label'),
+                'caption'   => 'Category name label',
                 'required'  => true,
                 'required'  => true,
             ];
             ];
             $fields["form[{$key}][disp_position]"] = [
             $fields["form[{$key}][disp_position]"] = [
@@ -100,13 +100,13 @@ class Categories extends Admin
                 'min'     => '0',
                 'min'     => '0',
                 'max'     => '9999999999',
                 'max'     => '9999999999',
                 'value'   => $row['disp_position'],
                 'value'   => $row['disp_position'],
-                'caption' => __('Category position label'),
+                'caption' => 'Category position label',
             ];
             ];
             $fields["delete-btn{$key}"] = [
             $fields["delete-btn{$key}"] = [
                 'class'   => ['delete', 'category'],
                 'class'   => ['delete', 'category'],
                 'type'    => 'btn',
                 'type'    => 'btn',
                 'value'   => '❌',
                 'value'   => '❌',
-                'caption' => __('Delete'),
+                'caption' => 'Delete',
                 'title'   => __('Delete'),
                 'title'   => __('Delete'),
                 'link'    => $this->c->Router->link(
                 'link'    => $this->c->Router->link(
                     'AdminCategoriesDelete',
                     'AdminCategoriesDelete',
@@ -128,7 +128,7 @@ class Categories extends Admin
                     'class'     => 'new',
                     'class'     => 'new',
                     'type'      => 'text',
                     'type'      => 'text',
                     'maxlength' => '80',
                     'maxlength' => '80',
-                    'caption'   => __('Add category label'),
+                    'caption'   => 'Add category label',
                     'help'      => ['Add category help', $this->c->Router->link('AdminForums'), __('Forums')],
                     'help'      => ['Add category help', $this->c->Router->link('AdminForums'), __('Forums')],
                 ],
                 ],
             ],
             ],
@@ -204,7 +204,7 @@ class Categories extends Admin
                 'del' => [
                 'del' => [
                     'fields' => [
                     'fields' => [
                         'confirm' => [
                         'confirm' => [
-                            'caption' => __('Confirm delete'),
+                            'caption' => 'Confirm delete',
                             'type'    => 'checkbox',
                             'type'    => 'checkbox',
                             'label'   => __(['I want to delete the category %s', $category['cat_name']]),
                             'label'   => __(['I want to delete the category %s', $category['cat_name']]),
                             'value'   => '1',
                             'value'   => '1',

+ 5 - 5
app/Models/Pages/Admin/Censoring.php

@@ -74,7 +74,7 @@ class Censoring extends Admin
                             'type'    => 'radio',
                             'type'    => 'radio',
                             'value'   => $this->c->config->o_censoring,
                             'value'   => $this->c->config->o_censoring,
                             'values'  => [1 => __('Yes'), 0 => __('No')],
                             'values'  => [1 => __('Yes'), 0 => __('No')],
-                            'caption' => __('Censor words label'),
+                            'caption' => 'Censor words label',
                             'help'    => 'Censor words help',
                             'help'    => 'Censor words help',
                         ],
                         ],
                     ],
                     ],
@@ -103,14 +103,14 @@ class Censoring extends Admin
                 'type'      => 'text',
                 'type'      => 'text',
                 'maxlength' => '60',
                 'maxlength' => '60',
                 'value'     => $row['search_for'],
                 'value'     => $row['search_for'],
-                'caption'   => __('Censored word label'),
+                'caption'   => 'Censored word label',
             ];
             ];
             $fieldset["form[{$id}][replace_with]"] = [
             $fieldset["form[{$id}][replace_with]"] = [
                 'class'     => ['censor'],
                 'class'     => ['censor'],
                 'type'      => 'text',
                 'type'      => 'text',
                 'maxlength' => '60',
                 'maxlength' => '60',
                 'value'     => $row['replace_with'],
                 'value'     => $row['replace_with'],
-                'caption'   => __('Replacement label'),
+                'caption'   => 'Replacement label',
             ];
             ];
         }
         }
         $fieldset["form[0][search_for]"] = [
         $fieldset["form[0][search_for]"] = [
@@ -118,14 +118,14 @@ class Censoring extends Admin
             'type'      => 'text',
             'type'      => 'text',
             'maxlength' => '60',
             'maxlength' => '60',
             'value'     => '',
             'value'     => '',
-            'caption'   => __('Censored word label'),
+            'caption'   => 'Censored word label',
         ];
         ];
         $fieldset["form[0][replace_with]"] = [
         $fieldset["form[0][replace_with]"] = [
             'class'     => ['censor'],
             'class'     => ['censor'],
             'type'      => 'text',
             'type'      => 'text',
             'maxlength' => '60',
             'maxlength' => '60',
             'value'     => '',
             'value'     => '',
-            'caption'   => __('Replacement label'),
+            'caption'   => 'Replacement label',
         ];
         ];
 
 
         $form['sets']['censtable'] = [
         $form['sets']['censtable'] = [

+ 13 - 13
app/Models/Pages/Admin/Forums.php

@@ -175,7 +175,7 @@ class Forums extends Admin
                     'class'   => ['name', 'forum', 'depth' . $forum->depth],
                     'class'   => ['name', 'forum', 'depth' . $forum->depth],
                     'type'    => 'btn',
                     'type'    => 'btn',
                     'value'   => $forum->forum_name,
                     'value'   => $forum->forum_name,
-                    'caption' => __('Forum label'),
+                    'caption' => 'Forum label',
                     'link'    => $this->c->Router->link(
                     'link'    => $this->c->Router->link(
                         'AdminForumsEdit',
                         'AdminForumsEdit',
                         [
                         [
@@ -189,14 +189,14 @@ class Forums extends Admin
                     'min'     => '0',
                     'min'     => '0',
                     'max'     => '9999999999',
                     'max'     => '9999999999',
                     'value'   => $forum->disp_position,
                     'value'   => $forum->disp_position,
-                    'caption' => __('Position label'),
+                    'caption' => 'Position label',
                 ];
                 ];
                 $disabled = (bool) $forum->subforums;
                 $disabled = (bool) $forum->subforums;
                 $fields["delete-btn{$forum->id}"] = [
                 $fields["delete-btn{$forum->id}"] = [
                     'class'    => ['delete', 'forum'],
                     'class'    => ['delete', 'forum'],
                     'type'     => 'btn',
                     'type'     => 'btn',
                     'value'    => '❌',
                     'value'    => '❌',
-                    'caption'  => __('Delete'),
+                    'caption'  => 'Delete',
                     'title'    => __('Delete'),
                     'title'    => __('Delete'),
                     'link'     => $disabled
                     'link'     => $disabled
                         ? '#'
                         ? '#'
@@ -293,7 +293,7 @@ class Forums extends Admin
                 'confirm' => [
                 'confirm' => [
                     'fields' => [
                     'fields' => [
                         'confirm' => [
                         'confirm' => [
-                            'caption' => __('Confirm delete'),
+                            'caption' => 'Confirm delete',
                             'type'    => 'checkbox',
                             'type'    => 'checkbox',
                             'label'   => __(['I want to delete forum %s', $forum->forum_name]),
                             'label'   => __(['I want to delete forum %s', $forum->forum_name]),
                             'value'   => '1',
                             'value'   => '1',
@@ -462,19 +462,19 @@ class Forums extends Admin
                     'type'      => 'text',
                     'type'      => 'text',
                     'maxlength' => '80',
                     'maxlength' => '80',
                     'value'     => $forum->forum_name,
                     'value'     => $forum->forum_name,
-                    'caption'   => __('Forum name label'),
+                    'caption'   => 'Forum name label',
                     'required'  => true,
                     'required'  => true,
                 ],
                 ],
                 'forum_desc' => [
                 'forum_desc' => [
                     'type'    => 'textarea',
                     'type'    => 'textarea',
                     'value'   => $forum->forum_desc,
                     'value'   => $forum->forum_desc,
-                    'caption' => __('Forum description label'),
+                    'caption' => 'Forum description label',
                 ],
                 ],
                 'parent' => [
                 'parent' => [
                     'type'     => 'select',
                     'type'     => 'select',
                     'options'  => $this->listForOptions,
                     'options'  => $this->listForOptions,
                     'value'    => $forum->parent_forum_id ? $forum->parent_forum_id : -$forum->cat_id,
                     'value'    => $forum->parent_forum_id ? $forum->parent_forum_id : -$forum->cat_id,
-                    'caption'  => __('Parent label'),
+                    'caption'  => 'Parent label',
                     'help'     => 'Parent help',
                     'help'     => 'Parent help',
                     'required' => true,
                     'required' => true,
                 ],
                 ],
@@ -486,13 +486,13 @@ class Forums extends Admin
                         2 => __('Subject option'),
                         2 => __('Subject option'),
                     ],
                     ],
                     'value'   => $forum->sort_by,
                     'value'   => $forum->sort_by,
-                    'caption' => __('Sort by label'),
+                    'caption' => 'Sort by label',
                 ],
                 ],
                 'redirect_url' => [
                 'redirect_url' => [
                     'type'      => 'text',
                     'type'      => 'text',
                     'maxlength' => '255',
                     'maxlength' => '255',
                     'value'     => $forum->redirect_url,
                     'value'     => $forum->redirect_url,
-                    'caption'   => __('Redirect label'),
+                    'caption'   => 'Redirect label',
                     'help'      => 'Redirect help',
                     'help'      => 'Redirect help',
                     'disabled'  => $forum->num_topics || $forum->subforums ? true : null,
                     'disabled'  => $forum->num_topics || $forum->subforums ? true : null,
                 ],
                 ],
@@ -500,7 +500,7 @@ class Forums extends Admin
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $forum->no_sum_mess,
                     'value'   => $forum->no_sum_mess,
                     'values'  => [0 => __('Yes'), 1 => __('No')],
                     'values'  => [0 => __('Yes'), 1 => __('No')],
-                    'caption' => __('Count messages label'),
+                    'caption' => 'Count messages label',
                     'help'    => ['Count messages help', $this->c->Router->link('AdminUsers'), __('Users')],
                     'help'    => ['Count messages help', $this->c->Router->link('AdminUsers'), __('Users')],
                 ],
                 ],
             ],
             ],
@@ -523,7 +523,7 @@ class Forums extends Admin
                 'class'    => $group->def_read_forum ? $aOn : $aOff,
                 'class'    => $group->def_read_forum ? $aOn : $aOff,
                 'type'     => 'checkbox',
                 'type'     => 'checkbox',
                 'value'    => '1',
                 'value'    => '1',
-                'caption'  => __('Read forum label'),
+                'caption'  => 'Read forum label',
                 'label'    => __('<span></span>'),
                 'label'    => __('<span></span>'),
                 'checked'  => $group->set_read_forum,
                 'checked'  => $group->set_read_forum,
                 'disabled' => $group->dis_read_forum,
                 'disabled' => $group->dis_read_forum,
@@ -532,7 +532,7 @@ class Forums extends Admin
                 'class'    => $group->def_post_replies ? $aOn : $aOff,
                 'class'    => $group->def_post_replies ? $aOn : $aOff,
                 'type'     => 'checkbox',
                 'type'     => 'checkbox',
                 'value'    => '1',
                 'value'    => '1',
-                'caption'  => __('Post replies label'),
+                'caption'  => 'Post replies label',
                 'label'    => __('<span></span>'),
                 'label'    => __('<span></span>'),
                 'checked'  => $group->set_post_replies,
                 'checked'  => $group->set_post_replies,
                 'disabled' => $group->dis_post_replies,
                 'disabled' => $group->dis_post_replies,
@@ -541,7 +541,7 @@ class Forums extends Admin
                 'class'    => $group->def_post_topics ? $aOn : $aOff,
                 'class'    => $group->def_post_topics ? $aOn : $aOff,
                 'type'     => 'checkbox',
                 'type'     => 'checkbox',
                 'value'    => '1',
                 'value'    => '1',
-                'caption'  => __('Post topics label'),
+                'caption'  => 'Post topics label',
                 'label'    => __('<span></span>'),
                 'label'    => __('<span></span>'),
                 'checked'  => $group->set_post_topics,
                 'checked'  => $group->set_post_topics,
                 'disabled' => $group->dis_post_topics,
                 'disabled' => $group->dis_post_topics,

+ 35 - 35
app/Models/Pages/Admin/Groups.php

@@ -81,7 +81,7 @@ class Groups extends Admin
                             'type'      => 'select',
                             'type'      => 'select',
                             'options'   => $this->groupsNew,
                             'options'   => $this->groupsNew,
                             'value'     => $this->c->config->i_default_user_group,
                             'value'     => $this->c->config->i_default_user_group,
-                            'caption'   => __('New group label'),
+                            'caption'   => 'New group label',
                             'help'      => 'New group help',
                             'help'      => 'New group help',
 #                           'autofocus' => true,
 #                           'autofocus' => true,
                         ],
                         ],
@@ -115,7 +115,7 @@ class Groups extends Admin
                             'type'    => 'select',
                             'type'    => 'select',
                             'options' => $this->groupsDefault,
                             'options' => $this->groupsDefault,
                             'value'   => $this->c->config->i_default_user_group,
                             'value'   => $this->c->config->i_default_user_group,
-                            'caption' => __('Default group label'),
+                            'caption' => 'Default group label',
                             'help'    => 'Default group help',
                             'help'    => 'Default group help',
                         ],
                         ],
                     ],
                     ],
@@ -376,7 +376,7 @@ class Groups extends Admin
             'type'      => 'text',
             'type'      => 'text',
             'maxlength' => '50',
             'maxlength' => '50',
             'value'     => $group->g_title,
             'value'     => $group->g_title,
-            'caption'   => __('Group title label'),
+            'caption'   => 'Group title label',
             'required'  => true,
             'required'  => true,
 #           'autofocus' => true,
 #           'autofocus' => true,
         ];
         ];
@@ -384,7 +384,7 @@ class Groups extends Admin
             'type'      => 'text',
             'type'      => 'text',
             'maxlength' => '50',
             'maxlength' => '50',
             'value'     => $group->g_user_title,
             'value'     => $group->g_user_title,
-            'caption'   => __('User title label'),
+            'caption'   => 'User title label',
             'help'      => ['User title help', $group->groupGuest ? __('Guest') : __('Member')],
             'help'      => ['User title help', $group->groupGuest ? __('Guest') : __('Member')],
         ];
         ];
         $form['sets']['group-titles'] = [
         $form['sets']['group-titles'] = [
@@ -413,7 +413,7 @@ class Groups extends Admin
                 'type'    => 'select',
                 'type'    => 'select',
                 'options' => $options,
                 'options' => $options,
                 'value'   => $group->g_promote_next_group,
                 'value'   => $group->g_promote_next_group,
-                'caption' => __('Promote users label'),
+                'caption' => 'Promote users label',
                 'help'    => ['Promote users help', __('Disable promotion')],
                 'help'    => ['Promote users help', __('Disable promotion')],
             ];
             ];
             $fieldset['g_promote_min_posts'] = [
             $fieldset['g_promote_min_posts'] = [
@@ -421,7 +421,7 @@ class Groups extends Admin
                 'min'     => '0',
                 'min'     => '0',
                 'max'     => '9999999999',
                 'max'     => '9999999999',
                 'value'   => $group->g_promote_min_posts,
                 'value'   => $group->g_promote_min_posts,
-                'caption' => __('Number for promotion label'),
+                'caption' => 'Number for promotion label',
                 'help'    => 'Number for promotion help',
                 'help'    => 'Number for promotion help',
             ];
             ];
             $form['sets']['group-promote'] = [
             $form['sets']['group-promote'] = [
@@ -443,42 +443,42 @@ class Groups extends Admin
                 'type'    => 'radio',
                 'type'    => 'radio',
                 'value'   => $group->g_moderator,
                 'value'   => $group->g_moderator,
                 'values'  => $yn,
                 'values'  => $yn,
-                'caption' => __('Mod privileges label'),
+                'caption' => 'Mod privileges label',
                 'help'    => 'Mod privileges help',
                 'help'    => 'Mod privileges help',
             ];
             ];
             $fieldset['g_mod_edit_users'] = [
             $fieldset['g_mod_edit_users'] = [
                 'type'    => 'radio',
                 'type'    => 'radio',
                 'value'   => $group->g_mod_edit_users,
                 'value'   => $group->g_mod_edit_users,
                 'values'  => $yn,
                 'values'  => $yn,
-                'caption' => __('Edit profile label'),
+                'caption' => 'Edit profile label',
                 'help'    => 'Edit profile help',
                 'help'    => 'Edit profile help',
             ];
             ];
             $fieldset['g_mod_rename_users'] = [
             $fieldset['g_mod_rename_users'] = [
                 'type'    => 'radio',
                 'type'    => 'radio',
                 'value'   => $group->g_mod_rename_users,
                 'value'   => $group->g_mod_rename_users,
                 'values'  => $yn,
                 'values'  => $yn,
-                'caption' => __('Rename users label'),
+                'caption' => 'Rename users label',
                 'help'    => 'Rename users help',
                 'help'    => 'Rename users help',
             ];
             ];
             $fieldset['g_mod_change_passwords'] = [
             $fieldset['g_mod_change_passwords'] = [
                 'type'    => 'radio',
                 'type'    => 'radio',
                 'value'   => $group->g_mod_change_passwords,
                 'value'   => $group->g_mod_change_passwords,
                 'values'  => $yn,
                 'values'  => $yn,
-                'caption' => __('Change passwords label'),
+                'caption' => 'Change passwords label',
                 'help'    => 'Change passwords help',
                 'help'    => 'Change passwords help',
             ];
             ];
             $fieldset['g_mod_promote_users'] = [
             $fieldset['g_mod_promote_users'] = [
                 'type'    => 'radio',
                 'type'    => 'radio',
                 'value'   => $group->g_mod_promote_users,
                 'value'   => $group->g_mod_promote_users,
                 'values'  => $yn,
                 'values'  => $yn,
-                'caption' => __('Mod promote users label'),
+                'caption' => 'Mod promote users label',
                 'help'    => 'Mod promote users help',
                 'help'    => 'Mod promote users help',
             ];
             ];
             $fieldset['g_mod_ban_users'] = [
             $fieldset['g_mod_ban_users'] = [
                 'type'    => 'radio',
                 'type'    => 'radio',
                 'value'   => $group->g_mod_ban_users,
                 'value'   => $group->g_mod_ban_users,
                 'values'  => $yn,
                 'values'  => $yn,
-                'caption' => __('Ban users label'),
+                'caption' => 'Ban users label',
                 'help'    => 'Ban users help',
                 'help'    => 'Ban users help',
             ];
             ];
             $form['sets']['group-mod'] = [
             $form['sets']['group-mod'] = [
@@ -499,28 +499,28 @@ class Groups extends Admin
             'type'    => 'radio',
             'type'    => 'radio',
             'value'   => $group->g_read_board,
             'value'   => $group->g_read_board,
             'values'  => $yn,
             'values'  => $yn,
-            'caption' => __('Read board label'),
+            'caption' => 'Read board label',
             'help'    => 'Read board help',
             'help'    => 'Read board help',
         ];
         ];
         $fieldset['g_view_users'] = [
         $fieldset['g_view_users'] = [
             'type'    => 'radio',
             'type'    => 'radio',
             'value'   => $group->g_view_users,
             'value'   => $group->g_view_users,
             'values'  => $yn,
             'values'  => $yn,
-            'caption' => __('View user info label'),
+            'caption' => 'View user info label',
             'help'    => 'View user info help',
             'help'    => 'View user info help',
         ];
         ];
         $fieldset['g_post_replies'] = [
         $fieldset['g_post_replies'] = [
             'type'    => 'radio',
             'type'    => 'radio',
             'value'   => $group->g_post_replies,
             'value'   => $group->g_post_replies,
             'values'  => $yn,
             'values'  => $yn,
-            'caption' => __('Post replies label'),
+            'caption' => 'Post replies label',
             'help'    => 'Post replies help',
             'help'    => 'Post replies help',
         ];
         ];
         $fieldset['g_post_topics'] = [
         $fieldset['g_post_topics'] = [
             'type'    => 'radio',
             'type'    => 'radio',
             'value'   => $group->g_post_topics,
             'value'   => $group->g_post_topics,
             'values'  => $yn,
             'values'  => $yn,
-            'caption' => __('Post topics label'),
+            'caption' => 'Post topics label',
             'help'    => 'Post topics help',
             'help'    => 'Post topics help',
         ];
         ];
 
 
@@ -529,28 +529,28 @@ class Groups extends Admin
                 'type'    => 'radio',
                 'type'    => 'radio',
                 'value'   => $group->g_edit_posts,
                 'value'   => $group->g_edit_posts,
                 'values'  => $yn,
                 'values'  => $yn,
-                'caption' => __('Edit posts label'),
+                'caption' => 'Edit posts label',
                 'help'    => 'Edit posts help',
                 'help'    => 'Edit posts help',
             ];
             ];
             $fieldset['g_delete_posts'] = [
             $fieldset['g_delete_posts'] = [
                 'type'    => 'radio',
                 'type'    => 'radio',
                 'value'   => $group->g_delete_posts,
                 'value'   => $group->g_delete_posts,
                 'values'  => $yn,
                 'values'  => $yn,
-                'caption' => __('Delete posts label'),
+                'caption' => 'Delete posts label',
                 'help'    => 'Delete posts help',
                 'help'    => 'Delete posts help',
             ];
             ];
             $fieldset['g_delete_topics'] = [
             $fieldset['g_delete_topics'] = [
                 'type'    => 'radio',
                 'type'    => 'radio',
                 'value'   => $group->g_delete_topics,
                 'value'   => $group->g_delete_topics,
                 'values'  => $yn,
                 'values'  => $yn,
-                'caption' => __('Delete topics label'),
+                'caption' => 'Delete topics label',
                 'help'    => 'Delete topics help',
                 'help'    => 'Delete topics help',
             ];
             ];
             $fieldset['g_set_title'] = [
             $fieldset['g_set_title'] = [
                 'type'    => 'radio',
                 'type'    => 'radio',
                 'value'   => $group->g_set_title,
                 'value'   => $group->g_set_title,
                 'values'  => $yn,
                 'values'  => $yn,
-                'caption' => __('Set own title label'),
+                'caption' => 'Set own title label',
                 'help'    => 'Set own title help',
                 'help'    => 'Set own title help',
             ];
             ];
         }
         }
@@ -559,21 +559,21 @@ class Groups extends Admin
             'type'    => 'radio',
             'type'    => 'radio',
             'value'   => $group->g_post_links,
             'value'   => $group->g_post_links,
             'values'  => $yn,
             'values'  => $yn,
-            'caption' => __('Post links label'),
+            'caption' => 'Post links label',
             'help'    => 'Post links help',
             'help'    => 'Post links help',
         ];
         ];
         $fieldset['g_search'] = [
         $fieldset['g_search'] = [
             'type'    => 'radio',
             'type'    => 'radio',
             'value'   => $group->g_search,
             'value'   => $group->g_search,
             'values'  => $yn,
             'values'  => $yn,
-            'caption' => __('User search label'),
+            'caption' => 'User search label',
             'help'    => 'User search help',
             'help'    => 'User search help',
         ];
         ];
         $fieldset['g_search_users'] = [
         $fieldset['g_search_users'] = [
             'type'    => 'radio',
             'type'    => 'radio',
             'value'   => $group->g_search_users,
             'value'   => $group->g_search_users,
             'values'  => $yn,
             'values'  => $yn,
-            'caption' => __('User list search label'),
+            'caption' => 'User list search label',
             'help'    => 'User list search help',
             'help'    => 'User list search help',
         ];
         ];
 
 
@@ -582,7 +582,7 @@ class Groups extends Admin
                 'type'    => 'radio',
                 'type'    => 'radio',
                 'value'   => $group->g_send_email,
                 'value'   => $group->g_send_email,
                 'values'  => $yn,
                 'values'  => $yn,
-                'caption' => __('Send e-mails label'),
+                'caption' => 'Send e-mails label',
                 'help'    => 'Send e-mails help',
                 'help'    => 'Send e-mails help',
             ];
             ];
         }
         }
@@ -605,7 +605,7 @@ class Groups extends Admin
             'min'     => '0',
             'min'     => '0',
             'max'     => '999999',
             'max'     => '999999',
             'value'   => $group->g_post_flood,
             'value'   => $group->g_post_flood,
-            'caption' => __('Post flood label'),
+            'caption' => 'Post flood label',
             'help'    => 'Post flood help',
             'help'    => 'Post flood help',
         ];
         ];
         $fieldset['g_search_flood'] = [
         $fieldset['g_search_flood'] = [
@@ -613,7 +613,7 @@ class Groups extends Admin
             'min'     => '0',
             'min'     => '0',
             'max'     => '999999',
             'max'     => '999999',
             'value'   => $group->g_search_flood,
             'value'   => $group->g_search_flood,
-            'caption' => __('Search flood label'),
+            'caption' => 'Search flood label',
             'help'    => 'Search flood help',
             'help'    => 'Search flood help',
         ];
         ];
 
 
@@ -623,7 +623,7 @@ class Groups extends Admin
                 'min'     => '0',
                 'min'     => '0',
                 'max'     => '999999',
                 'max'     => '999999',
                 'value'   => $group->g_deledit_interval,
                 'value'   => $group->g_deledit_interval,
-                'caption' => __('Delete-edit interval label'),
+                'caption' => 'Delete-edit interval label',
                 'help'    => 'Delete-edit interval help',
                 'help'    => 'Delete-edit interval help',
             ];
             ];
             $fieldset['g_email_flood'] = [
             $fieldset['g_email_flood'] = [
@@ -631,7 +631,7 @@ class Groups extends Admin
                 'min'     => '0',
                 'min'     => '0',
                 'max'     => '999999',
                 'max'     => '999999',
                 'value'   => $group->g_email_flood,
                 'value'   => $group->g_email_flood,
-                'caption' => __('E-mail flood label'),
+                'caption' => 'E-mail flood label',
                 'help'    => 'E-mail flood help',
                 'help'    => 'E-mail flood help',
             ];
             ];
             $fieldset['g_report_flood'] = [
             $fieldset['g_report_flood'] = [
@@ -639,7 +639,7 @@ class Groups extends Admin
                 'min'     => '0',
                 'min'     => '0',
                 'max'     => '999999',
                 'max'     => '999999',
                 'value'   => $group->g_report_flood,
                 'value'   => $group->g_report_flood,
-                'caption' => __('Report flood label'),
+                'caption' => 'Report flood label',
                 'help'    => 'Report flood help',
                 'help'    => 'Report flood help',
             ];
             ];
 
 
@@ -657,7 +657,7 @@ class Groups extends Admin
                 'min'     => '0',
                 'min'     => '0',
                 'max'     => '16000',
                 'max'     => '16000',
                 'value'   => $group->g_sig_length,
                 'value'   => $group->g_sig_length,
-                'caption' => __('Max sig length label'),
+                'caption' => 'Max sig length label',
                 'help'    => 'Max sig length help',
                 'help'    => 'Max sig length help',
             ];
             ];
             $fieldset['g_sig_lines'] = [
             $fieldset['g_sig_lines'] = [
@@ -665,7 +665,7 @@ class Groups extends Admin
                 'min'     => '0',
                 'min'     => '0',
                 'max'     => '100',
                 'max'     => '100',
                 'value'   => $group->g_sig_lines,
                 'value'   => $group->g_sig_lines,
-                'caption' => __('Max sig lines label'),
+                'caption' => 'Max sig lines label',
                 'help'    => 'Max sig lines help',
                 'help'    => 'Max sig lines help',
             ];
             ];
             $form['sets']['group-signature'] = [
             $form['sets']['group-signature'] = [
@@ -679,14 +679,14 @@ class Groups extends Admin
                 'type'    => 'radio',
                 'type'    => 'radio',
                 'value'   => $group->g_pm,
                 'value'   => $group->g_pm,
                 'values'  => $yn,
                 'values'  => $yn,
-                'caption' => __('Allow PM label'),
+                'caption' => 'Allow PM label',
             ];
             ];
             $fieldset['g_pm_limit'] = [
             $fieldset['g_pm_limit'] = [
                 'type'    => 'number',
                 'type'    => 'number',
                 'min'     => '0',
                 'min'     => '0',
                 'max'     => '999999',
                 'max'     => '999999',
                 'value'   => $group->g_pm_limit,
                 'value'   => $group->g_pm_limit,
-                'caption' => __('PM limit label'),
+                'caption' => 'PM limit label',
                 'help'    => 'PM limit help',
                 'help'    => 'PM limit help',
             ];
             ];
             $form['sets']['group-pm'] = [
             $form['sets']['group-pm'] = [
@@ -803,7 +803,7 @@ class Groups extends Admin
                         'type'    => 'select',
                         'type'    => 'select',
                         'options' => $groups,
                         'options' => $groups,
                         'value'   => $this->c->config->i_default_user_group,
                         'value'   => $this->c->config->i_default_user_group,
-                        'caption' => __('Move users label'),
+                        'caption' => 'Move users label',
                         'help'    => ['Move users info', $group->g_title, $count],
                         'help'    => ['Move users info', $group->g_title, $count],
                     ],
                     ],
                 ],
                 ],
@@ -813,7 +813,7 @@ class Groups extends Admin
         $form['sets']['conf'] = [
         $form['sets']['conf'] = [
             'fields' => [
             'fields' => [
                 'confirm' => [
                 'confirm' => [
-                    'caption' => __('Confirm delete'),
+                    'caption' => 'Confirm delete',
                     'type'    => 'checkbox',
                     'type'    => 'checkbox',
                     'label'   => __(['I want to delete this group', $group->g_title]),
                     'label'   => __(['I want to delete this group', $group->g_title]),
                     'value'   => '1',
                     'value'   => '1',

+ 18 - 18
app/Models/Pages/Admin/Install.php

@@ -212,7 +212,7 @@ class Install extends Admin
                                 'type'    => 'select',
                                 'type'    => 'select',
                                 'options' => $langs,
                                 'options' => $langs,
                                 'value'   => $this->user->language,
                                 'value'   => $this->user->language,
-                                'caption' => __('Install language'),
+                                'caption' => 'Install language',
                                 'help'    => 'Choose install language info',
                                 'help'    => 'Choose install language info',
                             ],
                             ],
                         ],
                         ],
@@ -251,39 +251,39 @@ class Install extends Admin
                             'type'     => 'select',
                             'type'     => 'select',
                             'options'  => $this->dbTypes,
                             'options'  => $this->dbTypes,
                             'value'    => $v ? $v->dbtype : 'mysql_innodb',
                             'value'    => $v ? $v->dbtype : 'mysql_innodb',
-                            'caption'  => __('Database type'),
+                            'caption'  => 'Database type',
                             'help'     => 'Info 2',
                             'help'     => 'Info 2',
                         ],
                         ],
                         'dbhost' => [
                         'dbhost' => [
                             'type'     => 'text',
                             'type'     => 'text',
                             'value'    => $v ? $v->dbhost : 'localhost',
                             'value'    => $v ? $v->dbhost : 'localhost',
-                            'caption'  => __('Database server hostname'),
+                            'caption'  => 'Database server hostname',
                             'help'     => 'Info 3',
                             'help'     => 'Info 3',
                             'required' => true,
                             'required' => true,
                         ],
                         ],
                         'dbname' => [
                         'dbname' => [
                             'type'     => 'text',
                             'type'     => 'text',
                             'value'    => $v ? $v->dbname : '',
                             'value'    => $v ? $v->dbname : '',
-                            'caption'  => __('Database name'),
+                            'caption'  => 'Database name',
                             'help'     => 'Info 4',
                             'help'     => 'Info 4',
                             'required' => true,
                             'required' => true,
                         ],
                         ],
                         'dbuser' => [
                         'dbuser' => [
                             'type'    => 'text',
                             'type'    => 'text',
                             'value'   => $v ? $v->dbuser : '',
                             'value'   => $v ? $v->dbuser : '',
-                            'caption' => __('Database username'),
+                            'caption' => 'Database username',
                         ],
                         ],
                         'dbpass' => [
                         'dbpass' => [
                             'type'    => 'password',
                             'type'    => 'password',
                             'value'   => '',
                             'value'   => '',
-                            'caption' => __('Database password'),
+                            'caption' => 'Database password',
                             'help'    => 'Info 5',
                             'help'    => 'Info 5',
                         ],
                         ],
                         'dbprefix' => [
                         'dbprefix' => [
                             'type'      => 'text',
                             'type'      => 'text',
                             'maxlength' => '40',
                             'maxlength' => '40',
                             'value'     => $v ? $v->dbprefix : '',
                             'value'     => $v ? $v->dbprefix : '',
-                            'caption'   => __('Table prefix'),
+                            'caption'   => 'Table prefix',
                             'help'      => 'Info 6',
                             'help'      => 'Info 6',
                             'required' => true,
                             'required' => true,
                         ],
                         ],
@@ -307,7 +307,7 @@ class Install extends Admin
                             'maxlength' => '25',
                             'maxlength' => '25',
                             'pattern'   => '^.{2,25}$',
                             'pattern'   => '^.{2,25}$',
                             'value'     => $v ? $v->username : '',
                             'value'     => $v ? $v->username : '',
-                            'caption'   => __('Administrator username'),
+                            'caption'   => 'Administrator username',
                             'help'      => 'Info 8',
                             'help'      => 'Info 8',
                             'required'  => true,
                             'required'  => true,
                         ],
                         ],
@@ -315,7 +315,7 @@ class Install extends Admin
                             'type'     => 'password',
                             'type'     => 'password',
                             'pattern'  => '^.{16,}$',
                             'pattern'  => '^.{16,}$',
                             'value'    => '',
                             'value'    => '',
-                            'caption'  => __('Administrator passphrase'),
+                            'caption'  => 'Administrator passphrase',
                             'help'     => 'Info 9',
                             'help'     => 'Info 9',
                             'required' => true,
                             'required' => true,
                         ],
                         ],
@@ -324,7 +324,7 @@ class Install extends Admin
                             'maxlength' => '80',
                             'maxlength' => '80',
                             'pattern'   => '.+@.+',
                             'pattern'   => '.+@.+',
                             'value'     => $v ? $v->email : '',
                             'value'     => $v ? $v->email : '',
-                            'caption'   => __('Administrator email'),
+                            'caption'   => 'Administrator email',
                             'help'      => 'Info 10',
                             'help'      => 'Info 10',
                             'required'  => true,
                             'required'  => true,
                         ],
                         ],
@@ -348,33 +348,33 @@ class Install extends Admin
                             'type'      => 'text',
                             'type'      => 'text',
                             'maxlength' => '255',
                             'maxlength' => '255',
                             'value'     => $v ? $v->title : __('My ForkBB Forum'),
                             'value'     => $v ? $v->title : __('My ForkBB Forum'),
-                            'caption'   => __('Board title'),
+                            'caption'   => 'Board title',
                             'required'  => true,
                             'required'  => true,
                         ],
                         ],
                         'descr' => [
                         'descr' => [
                             'type'      => 'text',
                             'type'      => 'text',
                             'maxlength' => '16000',
                             'maxlength' => '16000',
                             'value'     => $v ? $v->descr : __('Description'),
                             'value'     => $v ? $v->descr : __('Description'),
-                            'caption'   => __('Board description'),
+                            'caption'   => 'Board description',
                         ],
                         ],
                         'baseurl' => [
                         'baseurl' => [
                             'type'      => 'text',
                             'type'      => 'text',
                             'maxlength' => '128',
                             'maxlength' => '128',
                             'value'     => $v ? $v->baseurl : $this->c->BASE_URL,
                             'value'     => $v ? $v->baseurl : $this->c->BASE_URL,
-                            'caption'   => __('Base URL'),
+                            'caption'   => 'Base URL',
                             'required'  => true,
                             'required'  => true,
                         ],
                         ],
                         'defaultlang' => [
                         'defaultlang' => [
                             'type'      => 'select',
                             'type'      => 'select',
                             'options'   => $langs,
                             'options'   => $langs,
                             'value'     => $v ? $v->defaultlang : $this->user->language,
                             'value'     => $v ? $v->defaultlang : $this->user->language,
-                            'caption'   => __('Default language'),
+                            'caption'   => 'Default language',
                         ],
                         ],
                         'defaultstyle' => [
                         'defaultstyle' => [
                             'type'      => 'select',
                             'type'      => 'select',
                             'options'   => $styles,
                             'options'   => $styles,
                             'value'     => $v ? $v->defaultstyle : $this->user->style,
                             'value'     => $v ? $v->defaultstyle : $this->user->style,
-                            'caption'   => __('Default style'),
+                            'caption'   => 'Default style',
                         ],
                         ],
                     ],
                     ],
                 ],
                 ],
@@ -395,7 +395,7 @@ class Install extends Admin
                             'type'      => 'text',
                             'type'      => 'text',
                             'maxlength' => '128',
                             'maxlength' => '128',
                             'value'     => $v ? $v->cookie_domain : '',
                             'value'     => $v ? $v->cookie_domain : '',
-                            'caption'   => __('Cookie Domain'),
+                            'caption'   => 'Cookie Domain',
                             'help'      => 'Cookie Domain info',
                             'help'      => 'Cookie Domain info',
                         ],
                         ],
                         'cookie_path' => [
                         'cookie_path' => [
@@ -404,7 +404,7 @@ class Install extends Admin
                             'value'     => $v
                             'value'     => $v
                                 ? $v->cookie_path
                                 ? $v->cookie_path
                                 : \rtrim((string) \parse_url($this->c->BASE_URL, \PHP_URL_PATH), '/') . '/',
                                 : \rtrim((string) \parse_url($this->c->BASE_URL, \PHP_URL_PATH), '/') . '/',
-                            'caption'   => __('Cookie Path'),
+                            'caption'   => 'Cookie Path',
                             'help'      => 'Cookie Path info',
                             'help'      => 'Cookie Path info',
                             'required'  => true,
                             'required'  => true,
                         ],
                         ],
@@ -418,7 +418,7 @@ class Install extends Admin
                                     : 0
                                     : 0
                                 ),
                                 ),
                             'values'  => [1 => __('Yes '), 0 => __('No ')],
                             'values'  => [1 => __('Yes '), 0 => __('No ')],
-                            'caption' => __('Cookie Secure'),
+                            'caption' => 'Cookie Secure',
                             'help'    => 'Cookie Secure info',
                             'help'    => 'Cookie Secure info',
                         ],
                         ],
 
 

+ 5 - 5
app/Models/Pages/Admin/Maintenance.php

@@ -78,13 +78,13 @@ class Maintenance extends Admin
                             'type'    => 'radio',
                             'type'    => 'radio',
                             'value'   => $config->o_maintenance,
                             'value'   => $config->o_maintenance,
                             'values'  => [1 => __('Yes'), 0 => __('No')],
                             'values'  => [1 => __('Yes'), 0 => __('No')],
-                            'caption' => __('Maintenance mode label'),
+                            'caption' => 'Maintenance mode label',
                             'help'    => 'Maintenance mode help',
                             'help'    => 'Maintenance mode help',
                         ],
                         ],
                         'o_maintenance_message' => [
                         'o_maintenance_message' => [
                             'type'    => 'textarea',
                             'type'    => 'textarea',
                             'value'   => $config->o_maintenance_message,
                             'value'   => $config->o_maintenance_message,
-                            'caption' => __('Maintenance message label'),
+                            'caption' => 'Maintenance message label',
                             'help'    => 'Maintenance message help',
                             'help'    => 'Maintenance message help',
                         ],
                         ],
                     ],
                     ],
@@ -126,7 +126,7 @@ class Maintenance extends Admin
                             'min'     => '1',
                             'min'     => '1',
                             'max'     => '9999',
                             'max'     => '9999',
                             'value'   => '100',
                             'value'   => '100',
-                            'caption' => __('Posts per cycle label'),
+                            'caption' => 'Posts per cycle label',
                             'help'    => 'Posts per cycle help',
                             'help'    => 'Posts per cycle help',
                         ],
                         ],
                         'start' => [
                         'start' => [
@@ -134,14 +134,14 @@ class Maintenance extends Admin
                             'min'     => '1',
                             'min'     => '1',
                             'max'     => '9999999999',
                             'max'     => '9999999999',
                             'value'   => '1',
                             'value'   => '1',
-                            'caption' => __('Starting post label'),
+                            'caption' => 'Starting post label',
                             'help'    => 'Starting post help',
                             'help'    => 'Starting post help',
                         ],
                         ],
                         'clear' => [
                         'clear' => [
                             'type'    => 'checkbox',
                             'type'    => 'checkbox',
                             'value'   => '1',
                             'value'   => '1',
                             'checked' => true,
                             'checked' => true,
-                            'caption' => __('Empty index label'),
+                            'caption' => 'Empty index label',
                             'label'   => __('Empty index help'),
                             'label'   => __('Empty index help'),
                         ],
                         ],
                     ],
                     ],

+ 59 - 59
app/Models/Pages/Admin/Options.php

@@ -208,7 +208,7 @@ class Options extends Admin
                     'type'      => 'text',
                     'type'      => 'text',
                     'maxlength' => '255',
                     'maxlength' => '255',
                     'value'     => $config->o_board_title,
                     'value'     => $config->o_board_title,
-                    'caption'   => __('Board title label'),
+                    'caption'   => 'Board title label',
                     'help'      => 'Board title help',
                     'help'      => 'Board title help',
                     'required'  => true,
                     'required'  => true,
 #                   'autofocus' => true,
 #                   'autofocus' => true,
@@ -216,7 +216,7 @@ class Options extends Admin
                 'o_board_desc' => [
                 'o_board_desc' => [
                     'type'    => 'textarea',
                     'type'    => 'textarea',
                     'value'   => $config->o_board_desc,
                     'value'   => $config->o_board_desc,
-                    'caption' => __('Board desc label'),
+                    'caption' => 'Board desc label',
                     'help'    => 'Board desc help',
                     'help'    => 'Board desc help',
                 ],
                 ],
                 'o_default_timezone' => [
                 'o_default_timezone' => [
@@ -264,28 +264,28 @@ class Options extends Admin
                         '14'    => __('UTC+14:00'),
                         '14'    => __('UTC+14:00'),
                     ],
                     ],
                     'value'   => $config->o_default_timezone,
                     'value'   => $config->o_default_timezone,
-                    'caption' => __('Timezone label'),
+                    'caption' => 'Timezone label',
                     'help'    => 'Timezone help',
                     'help'    => 'Timezone help',
                 ],
                 ],
                 'o_default_dst' => [
                 'o_default_dst' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->o_default_dst,
                     'value'   => $config->o_default_dst,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('DST label'),
+                    'caption' => 'DST label',
                     'help'    => 'DST help',
                     'help'    => 'DST help',
                 ],
                 ],
                 'o_default_lang' => [
                 'o_default_lang' => [
                     'type'    => 'select',
                     'type'    => 'select',
                     'options' => $langs,
                     'options' => $langs,
                     'value'   => $config->o_default_lang,
                     'value'   => $config->o_default_lang,
-                    'caption' => __('Language label'),
+                    'caption' => 'Language label',
                     'help'    => 'Language help',
                     'help'    => 'Language help',
                 ],
                 ],
                 'o_default_style' => [
                 'o_default_style' => [
                     'type'    => 'select',
                     'type'    => 'select',
                     'options' => $styles,
                     'options' => $styles,
                     'value'   => $config->o_default_style,
                     'value'   => $config->o_default_style,
-                    'caption' => __('Default style label'),
+                    'caption' => 'Default style label',
                     'help'    => 'Default style help',
                     'help'    => 'Default style help',
                 ],
                 ],
             ],
             ],
@@ -301,7 +301,7 @@ class Options extends Admin
                     'min'     => '0',
                     'min'     => '0',
                     'max'     => '99999',
                     'max'     => '99999',
                     'value'   => $config->o_timeout_visit,
                     'value'   => $config->o_timeout_visit,
-                    'caption' => __('Visit timeout label'),
+                    'caption' => 'Visit timeout label',
                     'help'    => 'Visit timeout help',
                     'help'    => 'Visit timeout help',
                 ],
                 ],
                 'o_timeout_online' => [
                 'o_timeout_online' => [
@@ -309,7 +309,7 @@ class Options extends Admin
                     'min'     => '0',
                     'min'     => '0',
                     'max'     => '99999',
                     'max'     => '99999',
                     'value'   => $config->o_timeout_online,
                     'value'   => $config->o_timeout_online,
-                    'caption' => __('Online timeout label'),
+                    'caption' => 'Online timeout label',
                     'help'    => 'Online timeout help',
                     'help'    => 'Online timeout help',
                 ],
                 ],
                 'o_redirect_delay' => [
                 'o_redirect_delay' => [
@@ -317,7 +317,7 @@ class Options extends Admin
                     'min'     => '0',
                     'min'     => '0',
                     'max'     => '99999',
                     'max'     => '99999',
                     'value'   => $config->o_redirect_delay,
                     'value'   => $config->o_redirect_delay,
-                    'caption' => __('Redirect time label'),
+                    'caption' => 'Redirect time label',
                     'help'    => 'Redirect time help',
                     'help'    => 'Redirect time help',
                 ],
                 ],
             ],
             ],
@@ -330,14 +330,14 @@ class Options extends Admin
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->o_show_user_info,
                     'value'   => $config->o_show_user_info,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Info in posts label'),
+                    'caption' => 'Info in posts label',
                     'help'    => 'Info in posts help',
                     'help'    => 'Info in posts help',
                 ],
                 ],
                 'o_show_post_count' => [
                 'o_show_post_count' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->o_show_post_count,
                     'value'   => $config->o_show_post_count,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Post count label'),
+                    'caption' => 'Post count label',
                     'help'    => 'Post count help',
                     'help'    => 'Post count help',
                 ],
                 ],
                 'i_disp_topics_default' => [
                 'i_disp_topics_default' => [
@@ -345,7 +345,7 @@ class Options extends Admin
                     'min'     => '10',
                     'min'     => '10',
                     'max'     => '50',
                     'max'     => '50',
                     'value'   => $config->i_disp_topics_default,
                     'value'   => $config->i_disp_topics_default,
-                    'caption' => __('Topics per page label'),
+                    'caption' => 'Topics per page label',
                     'help'    => 'Topics per page help',
                     'help'    => 'Topics per page help',
                 ],
                 ],
                 'i_disp_posts_default' => [
                 'i_disp_posts_default' => [
@@ -353,7 +353,7 @@ class Options extends Admin
                     'min'     => '10',
                     'min'     => '10',
                     'max'     => '50',
                     'max'     => '50',
                     'value'   => $config->i_disp_posts_default,
                     'value'   => $config->i_disp_posts_default,
-                    'caption' => __('Posts per page label'),
+                    'caption' => 'Posts per page label',
                     'help'    => 'Posts per page help',
                     'help'    => 'Posts per page help',
                 ],
                 ],
                 'i_disp_users' => [
                 'i_disp_users' => [
@@ -361,7 +361,7 @@ class Options extends Admin
                     'min'     => '10',
                     'min'     => '10',
                     'max'     => '50',
                     'max'     => '50',
                     'value'   => $config->i_disp_users,
                     'value'   => $config->i_disp_users,
-                    'caption' => __('Users per page label'),
+                    'caption' => 'Users per page label',
                     'help'    => 'Users per page help',
                     'help'    => 'Users per page help',
                 ],
                 ],
                 'i_topic_review' => [
                 'i_topic_review' => [
@@ -369,35 +369,35 @@ class Options extends Admin
                     'min'     => '0',
                     'min'     => '0',
                     'max'     => '50',
                     'max'     => '50',
                     'value'   => $config->i_topic_review,
                     'value'   => $config->i_topic_review,
-                    'caption' => __('Topic review label'),
+                    'caption' => 'Topic review label',
                     'help'    => 'Topic review help',
                     'help'    => 'Topic review help',
                 ],
                 ],
                 'p_message_all_caps' => [
                 'p_message_all_caps' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->p_message_all_caps,
                     'value'   => $config->p_message_all_caps,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('All caps message label'),
+                    'caption' => 'All caps message label',
                     'help'    => 'All caps message help',
                     'help'    => 'All caps message help',
                 ],
                 ],
                 'p_subject_all_caps' => [
                 'p_subject_all_caps' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->p_subject_all_caps,
                     'value'   => $config->p_subject_all_caps,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('All caps subject label'),
+                    'caption' => 'All caps subject label',
                     'help'    => 'All caps subject help',
                     'help'    => 'All caps subject help',
                 ],
                 ],
                 'p_sig_all_caps' => [
                 'p_sig_all_caps' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->p_sig_all_caps,
                     'value'   => $config->p_sig_all_caps,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('All caps sigs label'),
+                    'caption' => 'All caps sigs label',
                     'help'    => 'All caps sigs help',
                     'help'    => 'All caps sigs help',
                 ],
                 ],
                 'p_force_guest_email' => [
                 'p_force_guest_email' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->p_force_guest_email,
                     'value'   => $config->p_force_guest_email,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Require e-mail label'),
+                    'caption' => 'Require e-mail label',
                     'help'    => 'Require e-mail help',
                     'help'    => 'Require e-mail help',
                 ],
                 ],
             ],
             ],
@@ -410,48 +410,48 @@ class Options extends Admin
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->o_quickpost,
                     'value'   => $config->o_quickpost,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Quick post label'),
+                    'caption' => 'Quick post label',
                     'help'    => 'Quick post help',
                     'help'    => 'Quick post help',
                 ],
                 ],
                 'o_users_online' => [
                 'o_users_online' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->o_users_online,
                     'value'   => $config->o_users_online,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Users online label'),
+                    'caption' => 'Users online label',
                     'help'    => 'Users online help',
                     'help'    => 'Users online help',
                 ],
                 ],
                 'o_show_dot' => [
                 'o_show_dot' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->o_show_dot,
                     'value'   => $config->o_show_dot,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('User has posted label'),
+                    'caption' => 'User has posted label',
                     'help'    => 'User has posted help',
                     'help'    => 'User has posted help',
                 ],
                 ],
                 'o_topic_views' => [
                 'o_topic_views' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->o_topic_views,
                     'value'   => $config->o_topic_views,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Topic views label'),
+                    'caption' => 'Topic views label',
                     'help'    => 'Topic views help',
                     'help'    => 'Topic views help',
                 ],
                 ],
                 'o_quickjump' => [
                 'o_quickjump' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->o_quickjump,
                     'value'   => $config->o_quickjump,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Quick jump label'),
+                    'caption' => 'Quick jump label',
                     'help'    => 'Quick jump help',
                     'help'    => 'Quick jump help',
                 ],
                 ],
                 'o_search_all_forums' => [ //????
                 'o_search_all_forums' => [ //????
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->o_search_all_forums,
                     'value'   => $config->o_search_all_forums,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Search all label'),
+                    'caption' => 'Search all label',
                     'help'    => 'Search all help',
                     'help'    => 'Search all help',
                 ],
                 ],
                 'o_additional_navlinks' => [
                 'o_additional_navlinks' => [
                     'type'    => 'textarea',
                     'type'    => 'textarea',
                     'value'   => $config->o_additional_navlinks,
                     'value'   => $config->o_additional_navlinks,
-                    'caption' => __('Menu items label'),
+                    'caption' => 'Menu items label',
                     'help'    => 'Menu items help',
                     'help'    => 'Menu items help',
                 ],
                 ],
 
 
@@ -469,7 +469,7 @@ class Options extends Admin
                         1 => __('RSS'),
                         1 => __('RSS'),
                         2 => __('Atom'),
                         2 => __('Atom'),
                     ],
                     ],
-                    'caption' => __('Default feed label'),
+                    'caption' => 'Default feed label',
                     'help'    => 'Default feed help',
                     'help'    => 'Default feed help',
                 ],
                 ],
                 'i_feed_ttl' => [
                 'i_feed_ttl' => [
@@ -482,7 +482,7 @@ class Options extends Admin
                         60 => __(['%d Minutes', 60]),
                         60 => __(['%d Minutes', 60]),
                     ],
                     ],
                     'value'   => $config->i_feed_ttl,
                     'value'   => $config->i_feed_ttl,
-                    'caption' => __('Feed TTL label'),
+                    'caption' => 'Feed TTL label',
                     'help'    => 'Feed TTL help',
                     'help'    => 'Feed TTL help',
                 ],
                 ],
 
 
@@ -500,13 +500,13 @@ class Options extends Admin
                         1 => __('By e-mail'),
                         1 => __('By e-mail'),
                         2 => __('Both'),
                         2 => __('Both'),
                     ],
                     ],
-                    'caption' => __('Reporting method label'),
+                    'caption' => 'Reporting method label',
                     'help'    => 'Reporting method help',
                     'help'    => 'Reporting method help',
                 ],
                 ],
                 'o_mailing_list' => [
                 'o_mailing_list' => [
                     'type'    => 'textarea',
                     'type'    => 'textarea',
                     'value'   => $config->o_mailing_list,
                     'value'   => $config->o_mailing_list,
-                    'caption' => __('Mailing list label'),
+                    'caption' => 'Mailing list label',
                     'help'    => 'Mailing list help',
                     'help'    => 'Mailing list help',
                 ],
                 ],
             ],
             ],
@@ -519,14 +519,14 @@ class Options extends Admin
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->o_avatars,
                     'value'   => $config->o_avatars,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Use avatars label'),
+                    'caption' => 'Use avatars label',
                     'help'    => 'Use avatars help',
                     'help'    => 'Use avatars help',
                 ],
                 ],
                 'o_avatars_dir' => [ //????
                 'o_avatars_dir' => [ //????
                     'type'      => 'text',
                     'type'      => 'text',
                     'maxlength' => '255',
                     'maxlength' => '255',
                     'value'     => $config->o_avatars_dir,
                     'value'     => $config->o_avatars_dir,
-                    'caption'   => __('Upload directory label'),
+                    'caption'   => 'Upload directory label',
                     'help'      => ['Upload directory help', $this->c->PUBLIC_URL],
                     'help'      => ['Upload directory help', $this->c->PUBLIC_URL],
                     'required'  => true,
                     'required'  => true,
                 ],
                 ],
@@ -535,7 +535,7 @@ class Options extends Admin
                     'min'     => '50',
                     'min'     => '50',
                     'max'     => '999',
                     'max'     => '999',
                     'value'   => $config->i_avatars_width,
                     'value'   => $config->i_avatars_width,
-                    'caption' => __('Max width label'),
+                    'caption' => 'Max width label',
                     'help'    => 'Max width help',
                     'help'    => 'Max width help',
                 ],
                 ],
                 'i_avatars_height' => [
                 'i_avatars_height' => [
@@ -543,7 +543,7 @@ class Options extends Admin
                     'min'     => '50',
                     'min'     => '50',
                     'max'     => '999',
                     'max'     => '999',
                     'value'   => $config->i_avatars_height,
                     'value'   => $config->i_avatars_height,
-                    'caption' => __('Max height label'),
+                    'caption' => 'Max height label',
                     'help'    => 'Max height help',
                     'help'    => 'Max height help',
                 ],
                 ],
                 'i_avatars_size' => [
                 'i_avatars_size' => [
@@ -551,7 +551,7 @@ class Options extends Admin
                     'min'     => '0',
                     'min'     => '0',
                     'max'     => '9999999',
                     'max'     => '9999999',
                     'value'   => $config->i_avatars_size,
                     'value'   => $config->i_avatars_size,
-                    'caption' => __('Max size label'),
+                    'caption' => 'Max size label',
                     'help'    => 'Max size help',
                     'help'    => 'Max size help',
                 ],
                 ],
             ],
             ],
@@ -564,7 +564,7 @@ class Options extends Admin
                     'type'      => 'text',
                     'type'      => 'text',
                     'maxlength' => '80',
                     'maxlength' => '80',
                     'value'     => $config->o_admin_email,
                     'value'     => $config->o_admin_email,
-                    'caption'   => __('Admin e-mail label'),
+                    'caption'   => 'Admin e-mail label',
                     'help'      => 'Admin e-mail help',
                     'help'      => 'Admin e-mail help',
                     'required'  => true,
                     'required'  => true,
                     'pattern'   => '.+@.+',
                     'pattern'   => '.+@.+',
@@ -573,7 +573,7 @@ class Options extends Admin
                     'type'      => 'text',
                     'type'      => 'text',
                     'maxlength' => '80',
                     'maxlength' => '80',
                     'value'     => $config->o_webmaster_email,
                     'value'     => $config->o_webmaster_email,
-                    'caption'   => __('Webmaster e-mail label'),
+                    'caption'   => 'Webmaster e-mail label',
                     'help'      => 'Webmaster e-mail help',
                     'help'      => 'Webmaster e-mail help',
                     'required'  => true,
                     'required'  => true,
                     'pattern'   => '.+@.+',
                     'pattern'   => '.+@.+',
@@ -582,14 +582,14 @@ class Options extends Admin
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->o_forum_subscriptions,
                     'value'   => $config->o_forum_subscriptions,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Forum subscriptions label'),
+                    'caption' => 'Forum subscriptions label',
                     'help'    => 'Forum subscriptions help',
                     'help'    => 'Forum subscriptions help',
                 ],
                 ],
                 'o_topic_subscriptions' => [
                 'o_topic_subscriptions' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->o_topic_subscriptions,
                     'value'   => $config->o_topic_subscriptions,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Topic subscriptions label'),
+                    'caption' => 'Topic subscriptions label',
                     'help'    => 'Topic subscriptions help',
                     'help'    => 'Topic subscriptions help',
                 ],
                 ],
                 'i_email_max_recipients' => [
                 'i_email_max_recipients' => [
@@ -597,28 +597,28 @@ class Options extends Admin
                     'min'     => '1',
                     'min'     => '1',
                     'max'     => '99999',
                     'max'     => '99999',
                     'value'   => $config->i_email_max_recipients,
                     'value'   => $config->i_email_max_recipients,
-                    'caption' => __('Email max recipients label'),
+                    'caption' => 'Email max recipients label',
                     'help'    => 'Email max recipients help',
                     'help'    => 'Email max recipients help',
                 ],
                 ],
                 'o_smtp_host' => [
                 'o_smtp_host' => [
                     'type'      => 'text',
                     'type'      => 'text',
                     'maxlength' => '255',
                     'maxlength' => '255',
                     'value'     => $config->o_smtp_host,
                     'value'     => $config->o_smtp_host,
-                    'caption'   => __('SMTP address label'),
+                    'caption'   => 'SMTP address label',
                     'help'      => 'SMTP address help',
                     'help'      => 'SMTP address help',
                 ],
                 ],
                 'o_smtp_user' => [
                 'o_smtp_user' => [
                     'type'      => 'text',
                     'type'      => 'text',
                     'maxlength' => '255',
                     'maxlength' => '255',
                     'value'     => $config->o_smtp_user,
                     'value'     => $config->o_smtp_user,
-                    'caption'   => __('SMTP username label'),
+                    'caption'   => 'SMTP username label',
                     'help'      => 'SMTP username help',
                     'help'      => 'SMTP username help',
                 ],
                 ],
                 'o_smtp_pass' => [
                 'o_smtp_pass' => [
                     'type'      => 'password',
                     'type'      => 'password',
                     'maxlength' => '255',
                     'maxlength' => '255',
                     'value'     => $config->o_smtp_pass ? '          ' : null,
                     'value'     => $config->o_smtp_pass ? '          ' : null,
-                    'caption'   => __('SMTP password label'),
+                    'caption'   => 'SMTP password label',
                     'help'      => 'SMTP password help',
                     'help'      => 'SMTP password help',
                 ],
                 ],
                 'changeSmtpPassword' => [
                 'changeSmtpPassword' => [
@@ -631,7 +631,7 @@ class Options extends Admin
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->o_smtp_ssl,
                     'value'   => $config->o_smtp_ssl,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('SMTP SSL label'),
+                    'caption' => 'SMTP SSL label',
                     'help'    => 'SMTP SSL help',
                     'help'    => 'SMTP SSL help',
                 ],
                 ],
             ],
             ],
@@ -644,34 +644,34 @@ class Options extends Admin
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->o_regs_allow,
                     'value'   => $config->o_regs_allow,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Allow new label'),
+                    'caption' => 'Allow new label',
                     'help'    => 'Allow new help',
                     'help'    => 'Allow new help',
                 ],
                 ],
                 'o_regs_verify' => [
                 'o_regs_verify' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->o_regs_verify,
                     'value'   => $config->o_regs_verify,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Verify label'),
+                    'caption' => 'Verify label',
                     'help'    => 'Verify help',
                     'help'    => 'Verify help',
                 ],
                 ],
                 'o_regs_report' => [
                 'o_regs_report' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->o_regs_report,
                     'value'   => $config->o_regs_report,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Report new label'),
+                    'caption' => 'Report new label',
                     'help'    => 'Report new help',
                     'help'    => 'Report new help',
                 ],
                 ],
                 'o_rules' => [
                 'o_rules' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->o_rules,
                     'value'   => $config->o_rules,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Use rules label'),
+                    'caption' => 'Use rules label',
                     'help'    => 'Use rules help',
                     'help'    => 'Use rules help',
                 ],
                 ],
                 'o_rules_message' => [
                 'o_rules_message' => [
                     'type'    => 'textarea',
                     'type'    => 'textarea',
                     'value'   => $config->o_rules_message,
                     'value'   => $config->o_rules_message,
-                    'caption' => __('Rules label'),
+                    'caption' => 'Rules label',
                     'help'    => 'Rules help',
                     'help'    => 'Rules help',
                 ],
                 ],
                 'i_default_email_setting' => [
                 'i_default_email_setting' => [
@@ -683,7 +683,7 @@ class Options extends Admin
                         1 => __('Hide allow form label'),
                         1 => __('Hide allow form label'),
                         2 => __('Hide both label'),
                         2 => __('Hide both label'),
                     ],
                     ],
-                    'caption' => __('E-mail default label'),
+                    'caption' => 'E-mail default label',
                     'help'    => 'E-mail default help',
                     'help'    => 'E-mail default help',
                 ],
                 ],
             ],
             ],
@@ -696,13 +696,13 @@ class Options extends Admin
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->o_announcement,
                     'value'   => $config->o_announcement,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Display announcement label'),
+                    'caption' => 'Display announcement label',
                     'help'    => 'Display announcement help',
                     'help'    => 'Display announcement help',
                 ],
                 ],
                 'o_announcement_message' => [
                 'o_announcement_message' => [
                     'type'    => 'textarea',
                     'type'    => 'textarea',
                     'value'   => $config->o_announcement_message,
                     'value'   => $config->o_announcement_message,
-                    'caption' => __('Announcement message label'),
+                    'caption' => 'Announcement message label',
                     'help'    => 'Announcement message help',
                     'help'    => 'Announcement message help',
                 ],
                 ],
 
 
@@ -716,14 +716,14 @@ class Options extends Admin
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->b_poll_enabled,
                     'value'   => $config->b_poll_enabled,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Allow polls label'),
+                    'caption' => 'Allow polls label',
                 ],
                 ],
                 'i_poll_max_questions' => [
                 'i_poll_max_questions' => [
                     'type'    => 'number',
                     'type'    => 'number',
                     'min'     => '1',
                     'min'     => '1',
                     'max'     => '99',
                     'max'     => '99',
                     'value'   => $config->i_poll_max_questions,
                     'value'   => $config->i_poll_max_questions,
-                    'caption' => __('Max questions label'),
+                    'caption' => 'Max questions label',
                     'help'    => 'Max questions help',
                     'help'    => 'Max questions help',
                 ],
                 ],
                 'i_poll_max_fields' => [
                 'i_poll_max_fields' => [
@@ -731,7 +731,7 @@ class Options extends Admin
                     'min'     => '2',
                     'min'     => '2',
                     'max'     => '99',
                     'max'     => '99',
                     'value'   => $config->i_poll_max_fields,
                     'value'   => $config->i_poll_max_fields,
-                    'caption' => __('Max options label'),
+                    'caption' => 'Max options label',
                     'help'    => 'Max options help',
                     'help'    => 'Max options help',
                 ],
                 ],
                 'i_poll_time' => [
                 'i_poll_time' => [
@@ -739,7 +739,7 @@ class Options extends Admin
                     'min'     => '0',
                     'min'     => '0',
                     'max'     => '999999',
                     'max'     => '999999',
                     'value'   => $config->i_poll_time,
                     'value'   => $config->i_poll_time,
-                    'caption' => __('Poll edit time label'),
+                    'caption' => 'Poll edit time label',
                     'help'    => 'Poll edit time help',
                     'help'    => 'Poll edit time help',
                 ],
                 ],
                 'i_poll_term' => [
                 'i_poll_term' => [
@@ -747,14 +747,14 @@ class Options extends Admin
                     'min'     => '0',
                     'min'     => '0',
                     'max'     => '99',
                     'max'     => '99',
                     'value'   => $config->i_poll_term,
                     'value'   => $config->i_poll_term,
-                    'caption' => __('Hidden voices label'),
+                    'caption' => 'Hidden voices label',
                     'help'    => 'Hidden voices help',
                     'help'    => 'Hidden voices help',
                 ],
                 ],
                 'b_poll_guest' => [
                 'b_poll_guest' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->b_poll_guest,
                     'value'   => $config->b_poll_guest,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Result for guest label'),
+                    'caption' => 'Result for guest label',
                     'help'    => 'Result for guest help',
                     'help'    => 'Result for guest help',
                 ],
                 ],
             ],
             ],
@@ -767,7 +767,7 @@ class Options extends Admin
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->b_pm,
                     'value'   => $config->b_pm,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Allow PM label'),
+                    'caption' => 'Allow PM label',
                     'help'    => ['Allow PM help', __('User groups'), $this->c->Router->link('AdminGroups')],
                     'help'    => ['Allow PM help', __('User groups'), $this->c->Router->link('AdminGroups')],
                 ],
                 ],
             ],
             ],

+ 23 - 23
app/Models/Pages/Admin/Parser/BBCode.php

@@ -151,7 +151,7 @@ class BBCode extends Parser
                 'class'     => ['bbcode', 'tag'],
                 'class'     => ['bbcode', 'tag'],
                 'type'      => $tagData['bb_edit'] > 0 ? 'link' : 'str',
                 'type'      => $tagData['bb_edit'] > 0 ? 'link' : 'str',
                 'value'     => $tag,
                 'value'     => $tag,
-                'caption'   => __('BBCode tag label'),
+                'caption'   => 'BBCode tag label',
                 'title'     => __('BBCode tag title'),
                 'title'     => __('BBCode tag title'),
                 'href'      => 1 === $tagData['bb_edit']
                 'href'      => 1 === $tagData['bb_edit']
                     ? $this->c->Router->link('AdminBBCodeEdit', ['id' => $id])
                     ? $this->c->Router->link('AdminBBCodeEdit', ['id' => $id])
@@ -162,7 +162,7 @@ class BBCode extends Parser
                 'type'      => 'select',
                 'type'      => 'select',
                 'options'   => $selectList,
                 'options'   => $selectList,
                 'value'     => $this->getValue($tag, $this->c->config->a_bb_white_mes, $this->c->config->a_bb_black_mes),
                 'value'     => $this->getValue($tag, $this->c->config->a_bb_white_mes, $this->c->config->a_bb_black_mes),
-                'caption'   => __('BBCode mes label'),
+                'caption'   => 'BBCode mes label',
                 'disabled'  => 'ROOT' === $tag,
                 'disabled'  => 'ROOT' === $tag,
             ];
             ];
             $fields["bbcode[{$tag}][in_sig]"] = [
             $fields["bbcode[{$tag}][in_sig]"] = [
@@ -170,14 +170,14 @@ class BBCode extends Parser
                 'type'      => 'select',
                 'type'      => 'select',
                 'options'   => $selectList,
                 'options'   => $selectList,
                 'value'     => $this->getValue($tag, $this->c->config->a_bb_white_sig, $this->c->config->a_bb_black_sig),
                 'value'     => $this->getValue($tag, $this->c->config->a_bb_white_sig, $this->c->config->a_bb_black_sig),
-                'caption'   => __('BBCode sig label'),
+                'caption'   => 'BBCode sig label',
                 'disabled'  => 'ROOT' === $tag,
                 'disabled'  => 'ROOT' === $tag,
             ];
             ];
             $fields["bbcode{$id}-del"] = [
             $fields["bbcode{$id}-del"] = [
                 'class'     => ['bbcode', 'delete'],
                 'class'     => ['bbcode', 'delete'],
                 'type'      => 'btn',
                 'type'      => 'btn',
                 'value'     => '❌',
                 'value'     => '❌',
-                'caption'   => __('Delete'),
+                'caption'   => 'Delete',
                 'title'     => __('Delete'),
                 'title'     => __('Delete'),
                 'link'      => $this->c->Router->link(
                 'link'      => $this->c->Router->link(
                     'AdminBBCodeDelete',
                     'AdminBBCodeDelete',
@@ -438,7 +438,7 @@ class BBCode extends Parser
                 'tag' => [
                 'tag' => [
                     'type'      => $id > 0 ? 'str' : 'text',
                     'type'      => $id > 0 ? 'str' : 'text',
                     'value'     => $structure->tag,
                     'value'     => $structure->tag,
-                    'caption'   => __('Tag label'),
+                    'caption'   => 'Tag label',
                     'help'      => 'Tag info',
                     'help'      => 'Tag info',
                     'maxlength' => '11',
                     'maxlength' => '11',
                     'pattern'   => '^[a-z\*][a-z\d-]{0,10}$',
                     'pattern'   => '^[a-z\*][a-z\d-]{0,10}$',
@@ -448,13 +448,13 @@ class BBCode extends Parser
                     'type'      => 'select',
                     'type'      => 'select',
                     'options'   => $this->bbTypes,
                     'options'   => $this->bbTypes,
                     'value'     => $structure->type,
                     'value'     => $structure->type,
-                    'caption'   => __('Type label'),
+                    'caption'   => 'Type label',
                     'help'      => 'Type info',
                     'help'      => 'Type info',
                 ],
                 ],
                 'type_new' => [
                 'type_new' => [
                     'type'      => 'text',
                     'type'      => 'text',
                     'value'     => isset($this->bbTypes[$structure->type]) ? '' : $structure->type,
                     'value'     => isset($this->bbTypes[$structure->type]) ? '' : $structure->type,
-                    'caption'   => __('Type label'),
+                    'caption'   => 'Type label',
                     'help'      => 'New type info',
                     'help'      => 'New type info',
                     'maxlength' => '20',
                     'maxlength' => '20',
                     'pattern'   => '^[a-z][a-z\d-]{0,19}$',
                     'pattern'   => '^[a-z][a-z\d-]{0,19}$',
@@ -463,7 +463,7 @@ class BBCode extends Parser
                     'type'      => 'multiselect',
                     'type'      => 'multiselect',
                     'options'   => $this->bbTypes,
                     'options'   => $this->bbTypes,
                     'value'     => $structure->parents,
                     'value'     => $structure->parents,
-                    'caption'   => __('Parents label'),
+                    'caption'   => 'Parents label',
                     'help'      => 'Parents info',
                     'help'      => 'Parents info',
                     'size'      => \min(15, \count($this->bbTypes)),
                     'size'      => \min(15, \count($this->bbTypes)),
                     'required'  => true,
                     'required'  => true,
@@ -472,56 +472,56 @@ class BBCode extends Parser
                     'class'     => 'handler',
                     'class'     => 'handler',
                     'type'      => 'textarea',
                     'type'      => 'textarea',
                     'value'     => $structure->handler,
                     'value'     => $structure->handler,
-                    'caption'   => __('Handler label'),
+                    'caption'   => 'Handler label',
                     'help'      => 'Handler info',
                     'help'      => 'Handler info',
                 ],
                 ],
                 'text_handler' => [
                 'text_handler' => [
                     'class'     => 'handler',
                     'class'     => 'handler',
                     'type'      => 'textarea',
                     'type'      => 'textarea',
                     'value'     => $structure->text_handler,
                     'value'     => $structure->text_handler,
-                    'caption'   => __('Text handler label'),
+                    'caption'   => 'Text handler label',
                     'help'      => 'Text handler info',
                     'help'      => 'Text handler info',
                 ],
                 ],
                 'recursive' => [
                 'recursive' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => true === $structure->recursive ? 1 : 0,
                     'value'   => true === $structure->recursive ? 1 : 0,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Recursive label'),
+                    'caption' => 'Recursive label',
                     'help'    => 'Recursive info',
                     'help'    => 'Recursive info',
                 ],
                 ],
                 'text_only' => [
                 'text_only' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => true === $structure->text_only ? 1 : 0,
                     'value'   => true === $structure->text_only ? 1 : 0,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Text only label'),
+                    'caption' => 'Text only label',
                     'help'    => 'Text only info',
                     'help'    => 'Text only info',
                 ],
                 ],
                 'tags_only' => [
                 'tags_only' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => true === $structure->tags_only ? 1 : 0,
                     'value'   => true === $structure->tags_only ? 1 : 0,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Tags only label'),
+                    'caption' => 'Tags only label',
                     'help'    => 'Tags only info',
                     'help'    => 'Tags only info',
                 ],
                 ],
                 'pre' => [
                 'pre' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => true === $structure->pre ? 1 : 0,
                     'value'   => true === $structure->pre ? 1 : 0,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Pre label'),
+                    'caption' => 'Pre label',
                     'help'    => 'Pre info',
                     'help'    => 'Pre info',
                 ],
                 ],
                 'single' => [
                 'single' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => true === $structure->single ? 1 : 0,
                     'value'   => true === $structure->single ? 1 : 0,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Single label'),
+                    'caption' => 'Single label',
                     'help'    => 'Single info',
                     'help'    => 'Single info',
                 ],
                 ],
                 'auto' => [
                 'auto' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => true === $structure->auto ? 1 : 0,
                     'value'   => true === $structure->auto ? 1 : 0,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Auto label'),
+                    'caption' => 'Auto label',
                     'help'    => 'Auto info',
                     'help'    => 'Auto info',
                 ],
                 ],
                 'self_nesting' => [
                 'self_nesting' => [
@@ -529,7 +529,7 @@ class BBCode extends Parser
                     'value'   => $structure->self_nesting > 0 ? $structure->self_nesting : 0,
                     'value'   => $structure->self_nesting > 0 ? $structure->self_nesting : 0,
                     'min'     => '0',
                     'min'     => '0',
                     'max'     => '10',
                     'max'     => '10',
-                    'caption' => __('Self nesting label'),
+                    'caption' => 'Self nesting label',
                     'help'    => 'Self nesting info',
                     'help'    => 'Self nesting info',
                 ],
                 ],
             ],
             ],
@@ -588,7 +588,7 @@ class BBCode extends Parser
             $fields["{$key}[name]"] = [
             $fields["{$key}[name]"] = [
                 'type'      => 'text',
                 'type'      => 'text',
                 'value'     => $data['name'] ?? '',
                 'value'     => $data['name'] ?? '',
-                'caption'   => __('Attribute name label'),
+                'caption'   => 'Attribute name label',
                 'help'      => 'Attribute name info',
                 'help'      => 'Attribute name info',
                 'maxlength' => '15',
                 'maxlength' => '15',
                 'pattern'   => '^[a-z-]{2,15}$',
                 'pattern'   => '^[a-z-]{2,15}$',
@@ -599,7 +599,7 @@ class BBCode extends Parser
             'type'    => 'radio',
             'type'    => 'radio',
             'value'   => null === $data ? 0 : 1,
             'value'   => null === $data ? 0 : 1,
             'values'  => $yn,
             'values'  => $yn,
-            'caption' => __('Allowed label'),
+            'caption' => 'Allowed label',
             'help'    => $info,
             'help'    => $info,
         ];
         ];
         if ('no_attr' !== $name) {
         if ('no_attr' !== $name) {
@@ -607,14 +607,14 @@ class BBCode extends Parser
                 'type'    => 'radio',
                 'type'    => 'radio',
                 'value'   => empty($data['required']) ? 0 : 1,
                 'value'   => empty($data['required']) ? 0 : 1,
                 'values'  => $yn,
                 'values'  => $yn,
-                'caption' => __('Required label'),
+                'caption' => 'Required label',
                 'help'    => 'Required info',
                 'help'    => 'Required info',
             ];
             ];
             $fields["{$key}[format]"] = [
             $fields["{$key}[format]"] = [
                 'class'     => 'format',
                 'class'     => 'format',
                 'type'      => 'text',
                 'type'      => 'text',
                 'value'     => $data['format'] ?? '',
                 'value'     => $data['format'] ?? '',
-                'caption'   => __('Format label'),
+                'caption'   => 'Format label',
                 'help'      => 'Format info',
                 'help'      => 'Format info',
             ];
             ];
         }
         }
@@ -622,14 +622,14 @@ class BBCode extends Parser
             'class'     => 'format',
             'class'     => 'format',
             'type'      => 'text',
             'type'      => 'text',
             'value'     => $data['body_format'] ?? '',
             'value'     => $data['body_format'] ?? '',
-            'caption'   => __('Body format label'),
+            'caption'   => 'Body format label',
             'help'      => 'Body format info',
             'help'      => 'Body format info',
         ];
         ];
         $fields["{$key}[text_only]"] = [
         $fields["{$key}[text_only]"] = [
             'type'    => 'radio',
             'type'    => 'radio',
             'value'   => empty($data['text_only']) ? 0 : 1,
             'value'   => empty($data['text_only']) ? 0 : 1,
             'values'  => $yn,
             'values'  => $yn,
-            'caption' => __('Text only label'),
+            'caption' => 'Text only label',
             'help'    => 'Text only info',
             'help'    => 'Text only info',
         ];
         ];
 
 

+ 5 - 5
app/Models/Pages/Admin/Parser/Edit.php

@@ -94,21 +94,21 @@ class Edit extends Parser
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->p_message_bbcode,
                     'value'   => $config->p_message_bbcode,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('BBCode label'),
+                    'caption' => 'BBCode label',
                     'help'    => 'BBCode help',
                     'help'    => 'BBCode help',
                 ],
                 ],
                 'p_sig_bbcode' => [
                 'p_sig_bbcode' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->p_sig_bbcode,
                     'value'   => $config->p_sig_bbcode,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('BBCode sigs label'),
+                    'caption' => 'BBCode sigs label',
                     'help'    => 'BBCode sigs help',
                     'help'    => 'BBCode sigs help',
                 ],
                 ],
                 'o_make_links' => [
                 'o_make_links' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->o_make_links,
                     'value'   => $config->o_make_links,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Clickable links label'),
+                    'caption' => 'Clickable links label',
                     'help'    => 'Clickable links help',
                     'help'    => 'Clickable links help',
                 ],
                 ],
                 'bbcode_management' => [
                 'bbcode_management' => [
@@ -128,14 +128,14 @@ class Edit extends Parser
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->o_smilies,
                     'value'   => $config->o_smilies,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Smilies mess label'),
+                    'caption' => 'Smilies mess label',
                     'help'    => 'Smilies mess help',
                     'help'    => 'Smilies mess help',
                 ],
                 ],
                 'o_smilies_sig' => [
                 'o_smilies_sig' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $config->o_smilies_sig,
                     'value'   => $config->o_smilies_sig,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Smilies sigs label'),
+                    'caption' => 'Smilies sigs label',
                     'help'    => 'Smilies sigs help',
                     'help'    => 'Smilies sigs help',
                 ],
                 ],
                 'smilies_management' => [
                 'smilies_management' => [

+ 12 - 12
app/Models/Pages/Admin/Parser/Smilies.php

@@ -169,7 +169,7 @@ class Smilies extends Parser
                 'type'      => 'text',
                 'type'      => 'text',
                 'maxlength' => '20',
                 'maxlength' => '20',
                 'value'     => $data['smilies'][$id]['sm_code'] ?? $cur['sm_code'],
                 'value'     => $data['smilies'][$id]['sm_code'] ?? $cur['sm_code'],
-                'caption'   => __('Smiley code label'),
+                'caption'   => 'Smiley code label',
                 'required'  => true,
                 'required'  => true,
             ];
             ];
             $fields["smilies[{$id}][sm_position]"] = [
             $fields["smilies[{$id}][sm_position]"] = [
@@ -178,7 +178,7 @@ class Smilies extends Parser
                 'min'       => '0',
                 'min'       => '0',
                 'max'       => '9999',
                 'max'       => '9999',
                 'value'     => $data['smilies'][$id]['sm_position'] ?? $cur['sm_position'],
                 'value'     => $data['smilies'][$id]['sm_position'] ?? $cur['sm_position'],
-                'caption'   => __('Position label'),
+                'caption'   => 'Position label',
                 'required'  => true,
                 'required'  => true,
             ];
             ];
             $fields["smilies[{$id}][sm_image]"] = [
             $fields["smilies[{$id}][sm_image]"] = [
@@ -186,20 +186,20 @@ class Smilies extends Parser
                 'type'     => 'select',
                 'type'     => 'select',
                 'options'  => $imageList,
                 'options'  => $imageList,
                 'value'    => $data['smilies'][$id]['sm_image'] ?? $cur['sm_image'],
                 'value'    => $data['smilies'][$id]['sm_image'] ?? $cur['sm_image'],
-                'caption'  => __('Name label'),
+                'caption'  => 'Name label',
             ];
             ];
             $fields["smile{$id}-pic"] = [
             $fields["smile{$id}-pic"] = [
                 'class'     => ['pic', 'smile'],
                 'class'     => ['pic', 'smile'],
                 'type'      => 'str',
                 'type'      => 'str',
                 'value'     => __(['<img src="%1$s" alt="%2$s">', $this->c->PUBLIC_URL . '/img/sm/' . $cur['sm_image'], $cur['sm_image']]),
                 'value'     => __(['<img src="%1$s" alt="%2$s">', $this->c->PUBLIC_URL . '/img/sm/' . $cur['sm_image'], $cur['sm_image']]),
-                'caption'   => __('Picture label'),
+                'caption'   => 'Picture label',
                 'html'      => true,
                 'html'      => true,
             ];
             ];
             $fields["smile{$id}-del"] = [
             $fields["smile{$id}-del"] = [
                 'class'     => ['delete', 'smile'],
                 'class'     => ['delete', 'smile'],
                 'type'      => 'btn',
                 'type'      => 'btn',
                 'value'     => '❌',
                 'value'     => '❌',
-                'caption'   => __('Delete'),
+                'caption'   => 'Delete',
                 'title'     => __('Delete'),
                 'title'     => __('Delete'),
                 'link'      => $this->c->Router->link(
                 'link'      => $this->c->Router->link(
                     'AdminSmiliesDelete',
                     'AdminSmiliesDelete',
@@ -227,7 +227,7 @@ class Smilies extends Parser
                     'type'      => 'text',
                     'type'      => 'text',
                     'maxlength' => '20',
                     'maxlength' => '20',
                     'value'     => $data['new_sm_code'] ?? '',
                     'value'     => $data['new_sm_code'] ?? '',
-                    'caption'   => __('Smiley code label'),
+                    'caption'   => 'Smiley code label',
                 ],
                 ],
                 'new_sm_position' => [
                 'new_sm_position' => [
                     'class'     => ['position', 'new-smile'],
                     'class'     => ['position', 'new-smile'],
@@ -235,14 +235,14 @@ class Smilies extends Parser
                     'min'       => '0',
                     'min'       => '0',
                     'max'       => '9999',
                     'max'       => '9999',
                     'value'     => $data['new_sm_position'] ?? $max + 1,
                     'value'     => $data['new_sm_position'] ?? $max + 1,
-                    'caption'   => __('Position label'),
+                    'caption'   => 'Position label',
                 ],
                 ],
                 'new_sm_image' => [
                 'new_sm_image' => [
                     'class'     => ['image', 'new-smile'],
                     'class'     => ['image', 'new-smile'],
                     'type'     => 'select',
                     'type'     => 'select',
                     'options'  => $imageList,
                     'options'  => $imageList,
                     'value'    => $data['new_image'] ?? null,
                     'value'    => $data['new_image'] ?? null,
-                    'caption'  => __('Name label'),
+                    'caption'  => 'Name label',
                 ],
                 ],
             ],
             ],
         ];
         ];
@@ -272,20 +272,20 @@ class Smilies extends Parser
                 'class'     => ['pic', 'image'],
                 'class'     => ['pic', 'image'],
                 'type'      => 'str',
                 'type'      => 'str',
                 'value'     => __(['<img src="%1$s" alt="%2$s">', $this->c->PUBLIC_URL . '/img/sm/' . $name, $name]),
                 'value'     => __(['<img src="%1$s" alt="%2$s">', $this->c->PUBLIC_URL . '/img/sm/' . $name, $name]),
-                'caption'   => __('Picture label'),
+                'caption'   => 'Picture label',
                 'html'      => true,
                 'html'      => true,
             ];
             ];
             $fields["image{$key}-name"] = [
             $fields["image{$key}-name"] = [
                 'class'   => ['name', 'image'],
                 'class'   => ['name', 'image'],
                 'type'    => 'str',
                 'type'    => 'str',
                 'value'   => $name,
                 'value'   => $name,
-                'caption' => __('Name label'),
+                'caption' => 'Name label',
             ];
             ];
             $fields["image{$key}-del"] = [
             $fields["image{$key}-del"] = [
                 'class'   => ['delete', 'image'],
                 'class'   => ['delete', 'image'],
                 'type'    => 'link',
                 'type'    => 'link',
                 'value'   => '❌',
                 'value'   => '❌',
-                'caption' => __('Delete'),
+                'caption' => 'Delete',
                 'title'   => __('Delete'),
                 'title'   => __('Delete'),
                 'href'    => $this->c->Router->link(
                 'href'    => $this->c->Router->link(
                     'AdminSmiliesDelete',
                     'AdminSmiliesDelete',
@@ -324,7 +324,7 @@ class Smilies extends Parser
                     'fields' => [
                     'fields' => [
                         'upload_image' => [
                         'upload_image' => [
                             'type'    => 'file',
                             'type'    => 'file',
-                            'caption' => __('Upload image label'),
+                            'caption' => 'Upload image label',
                             'help'    => 'Upload image info',
                             'help'    => 'Upload image info',
                             'accept'  => $this->accept,
                             'accept'  => $this->accept,
                         ],
                         ],

+ 2 - 2
app/Models/Pages/Admin/Reports.php

@@ -90,7 +90,7 @@ class Reports extends Admin
                 'type'    => $author->isGuest ? 'str' : 'link',
                 'type'    => $author->isGuest ? 'str' : 'link',
                 'value'   => $author->username,
                 'value'   => $author->username,
                 'title'   => $author->username,
                 'title'   => $author->username,
-                'caption' => __('Reported by'),
+                'caption' => 'Reported by',
                 'href'    => $author->link,
                 'href'    => $author->link,
             ];
             ];
             $post = $report->post;
             $post = $report->post;
@@ -112,7 +112,7 @@ class Reports extends Admin
                 'class'   => 'reason',
                 'class'   => 'reason',
                 'type'    => 'str',
                 'type'    => 'str',
                 'value'   => $report->message,
                 'value'   => $report->message,
-                'caption' => __('Reason'),
+                'caption' => 'Reason',
             ];
             ];
             if ($noZapped) {
             if ($noZapped) {
                 $cur['fields']['zap' . $report->id] = [
                 $cur['fields']['zap' . $report->id] = [

+ 2 - 2
app/Models/Pages/Admin/Update.php

@@ -300,14 +300,14 @@ class Update extends Admin
                         'dbpass' => [
                         'dbpass' => [
                             'type'     => 'password',
                             'type'     => 'password',
                             'value'    => '',
                             'value'    => '',
-                            'caption'  => __('Database password'),
+                            'caption'  => 'Database password',
                             'help'     => 'Database password note',
                             'help'     => 'Database password note',
                             'required' => true,
                             'required' => true,
                         ],
                         ],
                         'o_maintenance_message' => [
                         'o_maintenance_message' => [
                             'type'     => 'textarea',
                             'type'     => 'textarea',
                             'value'    => $v ? $v->o_maintenance_message : $this->c->config->o_maintenance_message,
                             'value'    => $v ? $v->o_maintenance_message : $this->c->config->o_maintenance_message,
-                            'caption'  => __('Maintenance message'),
+                            'caption'  => 'Maintenance message',
                             'help'     => 'Maintenance message info',
                             'help'     => 'Maintenance message info',
                             'required' => true,
                             'required' => true,
                         ],
                         ],

+ 5 - 5
app/Models/Pages/Admin/Users/Action.php

@@ -172,14 +172,14 @@ class Action extends Users
                             'type'    => 'radio',
                             'type'    => 'radio',
                             'value'   => 0,
                             'value'   => 0,
                             'values'  => $yn,
                             'values'  => $yn,
-                            'caption' => __('Delete users'),
+                            'caption' => 'Delete users',
                             'help'    => ['Confirm delete info', $names],
                             'help'    => ['Confirm delete info', $names],
                         ],
                         ],
                         'delete_posts' => [
                         'delete_posts' => [
                             'type'    => 'radio',
                             'type'    => 'radio',
                             'value'   => 0,
                             'value'   => 0,
                             'values'  => $yn,
                             'values'  => $yn,
-                            'caption' => __('Delete posts'),
+                            'caption' => 'Delete posts',
                         ],
                         ],
                     ],
                     ],
                 ],
                 ],
@@ -339,14 +339,14 @@ class Action extends Users
                             'type'      => 'select',
                             'type'      => 'select',
                             'options'   => $this->groupListForChange($profile),
                             'options'   => $this->groupListForChange($profile),
                             'value'     => $this->c->config->i_default_user_group,
                             'value'     => $this->c->config->i_default_user_group,
-                            'caption'   => __('New group label'),
+                            'caption'   => 'New group label',
                             'help'      => ['New group help', $names],
                             'help'      => ['New group help', $names],
                         ],
                         ],
                         'confirm' => [
                         'confirm' => [
                             'type'    => 'radio',
                             'type'    => 'radio',
                             'value'   => 0,
                             'value'   => 0,
                             'values'  => $yn,
                             'values'  => $yn,
-                            'caption' => __('Move users'),
+                            'caption' => 'Move users',
                         ],
                         ],
                     ],
                     ],
                 ],
                 ],
@@ -367,7 +367,7 @@ class Action extends Users
         if ($checkPass) {
         if ($checkPass) {
             $form['sets']['options']['fields']['password'] = [
             $form['sets']['options']['fields']['password'] = [
                 'type'      => 'password',
                 'type'      => 'password',
-                'caption'   => __('Your passphrase'),
+                'caption'   => 'Your passphrase',
                 'required'  => true,
                 'required'  => true,
             ];
             ];
         }
         }

+ 3 - 3
app/Models/Pages/Admin/Users/NewUser.php

@@ -102,7 +102,7 @@ class NewUser extends Users
                             'type'      => 'text',
                             'type'      => 'text',
                             'maxlength' => '25',
                             'maxlength' => '25',
                             'value'     => $data['username'] ?? null,
                             'value'     => $data['username'] ?? null,
-                            'caption'   => __('Username'),
+                            'caption'   => 'Username',
                             'help'      => 'Login format',
                             'help'      => 'Login format',
                             'required'  => true,
                             'required'  => true,
                             'pattern'   => '^.{2,25}$',
                             'pattern'   => '^.{2,25}$',
@@ -111,14 +111,14 @@ class NewUser extends Users
                             'type'      => 'text',
                             'type'      => 'text',
                             'maxlength' => '80',
                             'maxlength' => '80',
                             'value'     => $data['email'] ?? null,
                             'value'     => $data['email'] ?? null,
-                            'caption'   => __('Email'),
+                            'caption'   => 'Email',
                             'help'      => 'Email info',
                             'help'      => 'Email info',
                             'required'  => true,
                             'required'  => true,
                             'pattern'   => '.+@.+',
                             'pattern'   => '.+@.+',
                         ],
                         ],
                         'password' => [
                         'password' => [
                             'type'      => 'text',
                             'type'      => 'text',
-                            'caption'   => __('Passphrase'),
+                            'caption'   => 'Passphrase',
                             'help'      => 'Passphrase help',
                             'help'      => 'Passphrase help',
                             'required'  => true,
                             'required'  => true,
                             'pattern'   => '^.{16,}$',
                             'pattern'   => '^.{16,}$',

+ 7 - 7
app/Models/Pages/Admin/Users/Result.php

@@ -277,14 +277,14 @@ class Result extends Users
             $fields["l{$number}-username"] = [
             $fields["l{$number}-username"] = [
                 'class'   => ['result', 'username'],
                 'class'   => ['result', 'username'],
                 'type'    => $user->isGuest ? 'str' : 'link',
                 'type'    => $user->isGuest ? 'str' : 'link',
-                'caption' => __('Results username head'),
+                'caption' => 'Results username head',
                 'value'   => $user->username,
                 'value'   => $user->username,
                 'href'    => $user->link,
                 'href'    => $user->link,
             ];
             ];
             $fields["l{$number}-email"] = [
             $fields["l{$number}-email"] = [
                 'class'   => $user->isGuest ? ['result', 'email', 'no-data'] : ['result', 'email'],
                 'class'   => $user->isGuest ? ['result', 'email', 'no-data'] : ['result', 'email'],
                 'type'    => $user->isGuest ? 'str' : 'link',
                 'type'    => $user->isGuest ? 'str' : 'link',
-                'caption' => __('Results e-mail head'),
+                'caption' => 'Results e-mail head',
                 'value'   => $user->isGuest ? '' : $user->email,
                 'value'   => $user->isGuest ? '' : $user->email,
                 'href'    => $user->isGuest ? '' : 'mailto:' . $user->email,
                 'href'    => $user->isGuest ? '' : 'mailto:' . $user->email,
             ];
             ];
@@ -294,13 +294,13 @@ class Result extends Users
             $fields["l{$number}-title"] = [
             $fields["l{$number}-title"] = [
                 'class'   => ['result', 'title'],
                 'class'   => ['result', 'title'],
                 'type'    => 'str',
                 'type'    => 'str',
-                'caption' => __('Results title head'),
+                'caption' => 'Results title head',
                 'value'   => -1 === $user->id ? null : $user->title(),
                 'value'   => -1 === $user->id ? null : $user->title(),
             ];
             ];
             $fields["l{$number}-posts"] = [
             $fields["l{$number}-posts"] = [
                 'class'   => $user->isGuest ? ['result', 'posts', 'no-data'] : ['result', 'posts'],
                 'class'   => $user->isGuest ? ['result', 'posts', 'no-data'] : ['result', 'posts'],
                 'type'    => $user->num_posts ? 'link' : 'str',
                 'type'    => $user->num_posts ? 'link' : 'str',
-                'caption' => __('Results posts head'),
+                'caption' => 'Results posts head',
                 'value'   => $user->num_posts ? \ForkBB\num($user->num_posts) : null,
                 'value'   => $user->num_posts ? \ForkBB\num($user->num_posts) : null,
                 'href'    => $this->c->Router->link(
                 'href'    => $this->c->Router->link(
                     'SearchAction',
                     'SearchAction',
@@ -314,7 +314,7 @@ class Result extends Users
             $fields["l{$number}-note"] = [
             $fields["l{$number}-note"] = [
                 'class'   => '' === \trim($user->admin_note ?? '') ? ['result', 'note', 'no-data'] : ['result', 'note'],
                 'class'   => '' === \trim($user->admin_note ?? '') ? ['result', 'note', 'no-data'] : ['result', 'note'],
                 'type'    => 'str',
                 'type'    => 'str',
-                'caption' => __('Примечание админа'),
+                'caption' => 'Примечание админа',
                 'value'   => $user->admin_note,
                 'value'   => $user->admin_note,
             ];
             ];
 
 
@@ -322,7 +322,7 @@ class Result extends Users
                 $fields["l{$number}-view-ip"] = [
                 $fields["l{$number}-view-ip"] = [
                     'class'   => $user->isGuest ? ['result', 'view-ip', 'no-data'] : ['result', 'view-ip'],
                     'class'   => $user->isGuest ? ['result', 'view-ip', 'no-data'] : ['result', 'view-ip'],
                     'type'    => $user->isGuest || ! $user->num_posts ? 'str' : 'link',
                     'type'    => $user->isGuest || ! $user->num_posts ? 'str' : 'link',
-                    'caption' => __('Results action head'),
+                    'caption' => 'Results action head',
                     'value'   => $user->isGuest ? null : __('Results view IP link'),
                     'value'   => $user->isGuest ? null : __('Results view IP link'),
                     'href'    => $this->c->Router->link(
                     'href'    => $this->c->Router->link(
                         'AdminUserStat',
                         'AdminUserStat',
@@ -339,7 +339,7 @@ class Result extends Users
             $key = $user->isGuest ? "guest{$number}" : "users[{$user->id}]";
             $key = $user->isGuest ? "guest{$number}" : "users[{$user->id}]";
             $fields[$key] = [
             $fields[$key] = [
                 'class'   => ['check'],
                 'class'   => ['check'],
-                'caption' => __('Select'),
+                'caption' => 'Select',
                 'type'    => $user->isGuest ? 'str' : 'checkbox',
                 'type'    => $user->isGuest ? 'str' : 'checkbox',
                 'value'   => $user->isGuest ? null : $user->id,
                 'value'   => $user->isGuest ? null : $user->id,
                 'checked' => false,
                 'checked' => false,

+ 4 - 4
app/Models/Pages/Admin/Users/Stat.php

@@ -86,7 +86,7 @@ class Stat extends Users
             $fields["l{$number}-ip"] = [
             $fields["l{$number}-ip"] = [
                 'class'   => ['result', 'ip'],
                 'class'   => ['result', 'ip'],
                 'type'    => $flag ? 'link' : 'str',
                 'type'    => $flag ? 'link' : 'str',
-                'caption' => __('Results IP address head'),
+                'caption' => 'Results IP address head',
                 'value'   => $flag ? $ip : null,
                 'value'   => $flag ? $ip : null,
                 'href'    => $flag
                 'href'    => $flag
                     ? $this->c->Router->link(
                     ? $this->c->Router->link(
@@ -100,19 +100,19 @@ class Stat extends Users
             $fields["l{$number}-last-used"] = [
             $fields["l{$number}-last-used"] = [
                 'class'   => ['result', 'last-used'],
                 'class'   => ['result', 'last-used'],
                 'type'    => 'str',
                 'type'    => 'str',
-                'caption' => __('Results last used head'),
+                'caption' => 'Results last used head',
                 'value'   => $flag ? \ForkBB\dt($data['last_used']) : null,
                 'value'   => $flag ? \ForkBB\dt($data['last_used']) : null,
             ];
             ];
             $fields["l{$number}-used-times"] = [
             $fields["l{$number}-used-times"] = [
                 'class'   => ['result', 'used-times'],
                 'class'   => ['result', 'used-times'],
                 'type'    => 'str',
                 'type'    => 'str',
-                'caption' => __('Results times found head'),
+                'caption' => 'Results times found head',
                 'value'   => $flag ? \ForkBB\num($data['used_times']) : null,
                 'value'   => $flag ? \ForkBB\num($data['used_times']) : null,
             ];
             ];
             $fields["l{$number}-action"] = [
             $fields["l{$number}-action"] = [
                 'class'   => ['result', 'action'],
                 'class'   => ['result', 'action'],
                 'type'    => $flag ? 'link' : 'str',
                 'type'    => $flag ? 'link' : 'str',
-                'caption' => __('Results action head'),
+                'caption' => 'Results action head',
                 'value'   => $flag ? __('Results find more link') : null,
                 'value'   => $flag ? __('Results find more link') : null,
                 'href'    => $flag
                 'href'    => $flag
                     ? $this->c->Router->link(
                     ? $this->c->Router->link(

+ 16 - 16
app/Models/Pages/Admin/Users/View.php

@@ -186,25 +186,25 @@ class View extends Users
         $fields['username'] = [
         $fields['username'] = [
             'type'      => 'text',
             'type'      => 'text',
             'maxlength' => '25',
             'maxlength' => '25',
-            'caption'   => __('Username label'),
+            'caption'   => 'Username label',
             'value'     => $data['username'] ?? null,
             'value'     => $data['username'] ?? null,
         ];
         ];
         $fields['email'] = [
         $fields['email'] = [
             'type'      => 'text',
             'type'      => 'text',
             'maxlength' => '80',
             'maxlength' => '80',
-            'caption'   => __('E-mail address label'),
+            'caption'   => 'E-mail address label',
             'value'     => $data['email'] ?? null,
             'value'     => $data['email'] ?? null,
         ];
         ];
         $fields['title'] = [
         $fields['title'] = [
             'type'      => 'text',
             'type'      => 'text',
             'maxlength' => '50',
             'maxlength' => '50',
-            'caption'   => __('Title label'),
+            'caption'   => 'Title label',
             'value'     => $data['title'] ?? null,
             'value'     => $data['title'] ?? null,
         ];
         ];
         $fields['realname'] = [
         $fields['realname'] = [
             'type'      => 'text',
             'type'      => 'text',
             'maxlength' => '40',
             'maxlength' => '40',
-            'caption'   => __('Real name label'),
+            'caption'   => 'Real name label',
             'value'     => $data['realname'] ?? null,
             'value'     => $data['realname'] ?? null,
         ];
         ];
         $genders = [
         $genders = [
@@ -217,31 +217,31 @@ class View extends Users
             'type'    => 'radio',
             'type'    => 'radio',
             'value'   => $data['gender'] ?? -1,
             'value'   => $data['gender'] ?? -1,
             'values'  => $genders,
             'values'  => $genders,
-            'caption' => __('Gender label'),
+            'caption' => 'Gender label',
         ];
         ];
         $fields['url'] = [
         $fields['url'] = [
             'id'        => 'website',
             'id'        => 'website',
             'type'      => 'text',
             'type'      => 'text',
             'maxlength' => '100',
             'maxlength' => '100',
-            'caption'   => __('Website label'),
+            'caption'   => 'Website label',
             'value'     => $data['url'] ?? null,
             'value'     => $data['url'] ?? null,
         ];
         ];
         $fields['location'] = [
         $fields['location'] = [
             'type'      => 'text',
             'type'      => 'text',
             'maxlength' => '30',
             'maxlength' => '30',
-            'caption'   => __('Location label'),
+            'caption'   => 'Location label',
             'value'     => $data['location'] ?? null,
             'value'     => $data['location'] ?? null,
         ];
         ];
         $fields['signature'] = [
         $fields['signature'] = [
             'type'      => 'text',
             'type'      => 'text',
             'maxlength' => '512',
             'maxlength' => '512',
-            'caption'   => __('Signature label'),
+            'caption'   => 'Signature label',
             'value'     => $data['signature'] ?? null,
             'value'     => $data['signature'] ?? null,
         ];
         ];
         $fields['admin_note'] = [
         $fields['admin_note'] = [
             'type'      => 'text',
             'type'      => 'text',
             'maxlength' => '30',
             'maxlength' => '30',
-            'caption'   => __('Admin note label'),
+            'caption'   => 'Admin note label',
             'value'     => $data['admin_note'] ?? null,
             'value'     => $data['admin_note'] ?? null,
         ];
         ];
         $fields['between1'] = [
         $fields['between1'] = [
@@ -254,7 +254,7 @@ class View extends Users
             'min'     => '0',
             'min'     => '0',
             'max'     => '9999999999',
             'max'     => '9999999999',
             'value'   => $data['num_posts_1'] ?? null,
             'value'   => $data['num_posts_1'] ?? null,
-            'caption' => __('Posts label'),
+            'caption' => 'Posts label',
         ];
         ];
         $fields['num_posts_2'] = [
         $fields['num_posts_2'] = [
             'type'    => 'number',
             'type'    => 'number',
@@ -275,7 +275,7 @@ class View extends Users
             'type'      => 'text',
             'type'      => 'text',
             'maxlength' => '100',
             'maxlength' => '100',
             'value'     => $data['last_post_1'] ?? null,
             'value'     => $data['last_post_1'] ?? null,
-            'caption'   => __('Last post label'),
+            'caption'   => 'Last post label',
         ];
         ];
         $fields['last_post_2'] = [
         $fields['last_post_2'] = [
             'class'     => 'bend',
             'class'     => 'bend',
@@ -295,7 +295,7 @@ class View extends Users
             'type'      => 'text',
             'type'      => 'text',
             'maxlength' => '100',
             'maxlength' => '100',
             'value'     => $data['last_visit_1'] ?? null,
             'value'     => $data['last_visit_1'] ?? null,
-            'caption'   => __('Last visit label'),
+            'caption'   => 'Last visit label',
         ];
         ];
         $fields['last_visit_2'] = [
         $fields['last_visit_2'] = [
             'class'     => 'bend',
             'class'     => 'bend',
@@ -315,7 +315,7 @@ class View extends Users
             'type'      => 'text',
             'type'      => 'text',
             'maxlength' => '100',
             'maxlength' => '100',
             'value'     => $data['registered_1'] ?? null,
             'value'     => $data['registered_1'] ?? null,
-            'caption'   => __('Registered label'),
+            'caption'   => 'Registered label',
         ];
         ];
         $fields['registered_2'] = [
         $fields['registered_2'] = [
             'class'     => 'bend',
             'class'     => 'bend',
@@ -348,7 +348,7 @@ class View extends Users
                 'registered' => __('Order by registered'),
                 'registered' => __('Order by registered'),
             ],
             ],
             'value'   => $data['order_by'] ?? 'registered',
             'value'   => $data['order_by'] ?? 'registered',
-            'caption' => __('Order by label'),
+            'caption' => 'Order by label',
         ];
         ];
         $fields['direction'] = [
         $fields['direction'] = [
             'class'   => 'bend',
             'class'   => 'bend',
@@ -366,7 +366,7 @@ class View extends Users
             'type'    => 'select',
             'type'    => 'select',
             'options' => $this->groups(),
             'options' => $this->groups(),
             'value'   => $data['user_group'] ?? -1,
             'value'   => $data['user_group'] ?? -1,
-            'caption' => __('User group label'),
+            'caption' => 'User group label',
         ];
         ];
 
 
         $form['sets']['sorting'] = [
         $form['sets']['sorting'] = [
@@ -399,7 +399,7 @@ class View extends Users
         $fields['ip'] = [
         $fields['ip'] = [
             'type'      => 'text',
             'type'      => 'text',
             'maxlength' => '49',
             'maxlength' => '49',
-            'caption'   => __('IP address label'),
+            'caption'   => 'IP address label',
             'value'     => $data['ip'] ?? null,
             'value'     => $data['ip'] ?? null,
             'required'  => true,
             'required'  => true,
         ];
         ];

+ 5 - 5
app/Models/Pages/Auth.php

@@ -148,13 +148,13 @@ class Auth extends Page
                             'autofocus' => true,
                             'autofocus' => true,
                             'type'      => 'text',
                             'type'      => 'text',
                             'value'     => $username,
                             'value'     => $username,
-                            'caption'   => __('Username'),
+                            'caption'   => 'Username',
                             'required'  => true,
                             'required'  => true,
                         ],
                         ],
                         'password' => [
                         'password' => [
                             'id'        => 'passinlogin',
                             'id'        => 'passinlogin',
                             'type'      => 'password',
                             'type'      => 'password',
-                            'caption'   => __('Passphrase'),
+                            'caption'   => 'Passphrase',
                             'help'      => ['<a href="%s">Forgotten?</a>', $this->c->Router->link('Forget')],
                             'help'      => ['<a href="%s">Forgotten?</a>', $this->c->Router->link('Forget')],
                             'required'  => true,
                             'required'  => true,
                         ],
                         ],
@@ -339,7 +339,7 @@ class Auth extends Page
                             'type'      => 'text',
                             'type'      => 'text',
                             'maxlength' => '80',
                             'maxlength' => '80',
                             'value'     => $email,
                             'value'     => $email,
-                            'caption'   => __('Email'),
+                            'caption'   => 'Email',
                             'help'      => 'Passphrase reset info',
                             'help'      => 'Passphrase reset info',
                             'required'  => true,
                             'required'  => true,
                             'pattern'   => '.+@.+',
                             'pattern'   => '.+@.+',
@@ -464,13 +464,13 @@ class Auth extends Page
                         'password' => [
                         'password' => [
                             'autofocus' => true,
                             'autofocus' => true,
                             'type'      => 'password',
                             'type'      => 'password',
-                            'caption'   => __('New pass'),
+                            'caption'   => 'New pass',
                             'required'  => true,
                             'required'  => true,
                             'pattern'   => '^.{16,}$',
                             'pattern'   => '^.{16,}$',
                         ],
                         ],
                         'password2' => [
                         'password2' => [
                             'type'      => 'password',
                             'type'      => 'password',
-                            'caption'   => __('Confirm new pass'),
+                            'caption'   => 'Confirm new pass',
                             'help'      => 'Passphrase help',
                             'help'      => 'Passphrase help',
                             'required'  => true,
                             'required'  => true,
                             'pattern'   => '^.{16,}$',
                             'pattern'   => '^.{16,}$',

+ 2 - 2
app/Models/Pages/Email.php

@@ -150,14 +150,14 @@ class Email extends Page
                         'subject' => [
                         'subject' => [
                             'type'      => 'text',
                             'type'      => 'text',
                             'maxlength' => '70',
                             'maxlength' => '70',
-                            'caption'   => __('Email subject'),
+                            'caption'   => 'Email subject',
                             'required'  => true,
                             'required'  => true,
                             'value'     => $vars['subject'] ?? null,
                             'value'     => $vars['subject'] ?? null,
                             'autofocus' => true,
                             'autofocus' => true,
                         ],
                         ],
                         'message' => [
                         'message' => [
                             'type'      => 'textarea',
                             'type'      => 'textarea',
-                            'caption'   => __('Email message'),
+                            'caption'   => 'Email message',
                             'required'  => true,
                             'required'  => true,
                             'value'     => $data['message'] ?? null,
                             'value'     => $data['message'] ?? null,
                         ],
                         ],

+ 2 - 2
app/Models/Pages/Moderate.php

@@ -577,7 +577,7 @@ class Moderate extends Page
             $fields['subject'] = [
             $fields['subject'] = [
                 'type'      => 'text',
                 'type'      => 'text',
                 'maxlength' => '70',
                 'maxlength' => '70',
-                'caption'   => __('New subject'),
+                'caption'   => 'New subject',
                 'required'  => true,
                 'required'  => true,
                 'value'     => '' == $v->subject ? $this->curTopic->subject : $v->subject,
                 'value'     => '' == $v->subject ? $this->curTopic->subject : $v->subject,
                 'autofocus' => $autofocus,
                 'autofocus' => $autofocus,
@@ -590,7 +590,7 @@ class Moderate extends Page
                 'type'      => 'select',
                 'type'      => 'select',
                 'options'   => $this->listForOptions,
                 'options'   => $this->listForOptions,
                 'value'     => null,
                 'value'     => null,
-                'caption'   => __('Move to'),
+                'caption'   => 'Move to',
                 'autofocus' => $autofocus,
                 'autofocus' => $autofocus,
             ];
             ];
             $autofocus = null;
             $autofocus = null;

+ 8 - 8
app/Models/Pages/PostFormTrait.php

@@ -49,7 +49,7 @@ trait PostFormTrait
                 'class'     => 'w1',
                 'class'     => 'w1',
                 'type'      => 'text',
                 'type'      => 'text',
                 'maxlength' => '25',
                 'maxlength' => '25',
-                'caption'   => __('Username'),
+                'caption'   => 'Username',
                 'required'  => true,
                 'required'  => true,
                 'pattern'   => '^.{2,25}$',
                 'pattern'   => '^.{2,25}$',
                 'value'     => $vars['username'] ?? null,
                 'value'     => $vars['username'] ?? null,
@@ -59,7 +59,7 @@ trait PostFormTrait
                 'class'     => 'w2',
                 'class'     => 'w2',
                 'type'      => 'text',
                 'type'      => 'text',
                 'maxlength' => '80',
                 'maxlength' => '80',
-                'caption'   => __('Email'),
+                'caption'   => 'Email',
                 'required'  => '1' == $this->c->config->p_force_guest_email,
                 'required'  => '1' == $this->c->config->p_force_guest_email,
                 'pattern'   => '.+@.+',
                 'pattern'   => '.+@.+',
                 'value'     => $vars['email'] ?? null,
                 'value'     => $vars['email'] ?? null,
@@ -72,7 +72,7 @@ trait PostFormTrait
                 'class'     => 'w0',
                 'class'     => 'w0',
                 'type'      => 'text',
                 'type'      => 'text',
                 'maxlength' => '70',
                 'maxlength' => '70',
-                'caption'   => __('Subject'),
+                'caption'   => 'Subject',
                 'required'  => true,
                 'required'  => true,
                 'value'     => $vars['subject'] ?? null,
                 'value'     => $vars['subject'] ?? null,
                 'autofocus' => $autofocus,
                 'autofocus' => $autofocus,
@@ -83,7 +83,7 @@ trait PostFormTrait
         $fieldset['message'] = [
         $fieldset['message'] = [
             'class'    => 'w0',
             'class'    => 'w0',
             'type'     => 'textarea',
             'type'     => 'textarea',
-            'caption'  => __('Message'),
+            'caption'  => 'Message',
             'required' => true,
             'required' => true,
             'value'    => $vars['message'] ?? null,
             'value'    => $vars['message'] ?? null,
 /* ????
 /* ????
@@ -207,7 +207,7 @@ trait PostFormTrait
                 'min'      => '0',
                 'min'      => '0',
                 'max'      => '366',
                 'max'      => '366',
                 'value'    => $vars['poll']['duration'] ?? 0,
                 'value'    => $vars['poll']['duration'] ?? 0,
-                'caption'  => __('Poll duration label'),
+                'caption'  => 'Poll duration label',
                 'help'     => 'Poll duration help',
                 'help'     => 'Poll duration help',
                 'disabled' => $vars['pollNoEdit'] ?? null,
                 'disabled' => $vars['pollNoEdit'] ?? null,
             ];
             ];
@@ -230,7 +230,7 @@ trait PostFormTrait
                 $fieldset["poll[question][{$qid}]"] = [
                 $fieldset["poll[question][{$qid}]"] = [
                     'type'      => 'text',
                     'type'      => 'text',
                     'maxlength' => '240',
                     'maxlength' => '240',
-                    'caption'   => __('Question text label'),
+                    'caption'   => 'Question text label',
                     'value'     => $vars['poll']['question'][$qid] ?? null,
                     'value'     => $vars['poll']['question'][$qid] ?? null,
                     'disabled'  => $vars['pollNoEdit'] ?? null,
                     'disabled'  => $vars['pollNoEdit'] ?? null,
                 ];
                 ];
@@ -239,7 +239,7 @@ trait PostFormTrait
                     'min'      => '1',
                     'min'      => '1',
                     'max'      => (string) $this->c->config->i_poll_max_fields,
                     'max'      => (string) $this->c->config->i_poll_max_fields,
                     'value'    => $vars['poll']['type'][$qid] ?? 1,
                     'value'    => $vars['poll']['type'][$qid] ?? 1,
-                    'caption'  => __('Answer type label'),
+                    'caption'  => 'Answer type label',
                     'help'     => 'Answer type help',
                     'help'     => 'Answer type help',
                     'disabled' => $vars['pollNoEdit'] ?? null,
                     'disabled' => $vars['pollNoEdit'] ?? null,
                 ];
                 ];
@@ -248,7 +248,7 @@ trait PostFormTrait
                     $fieldset["poll[answer][{$qid}][{$fid}]"] = [
                     $fieldset["poll[answer][{$qid}][{$fid}]"] = [
                         'type'      => 'text',
                         'type'      => 'text',
                         'maxlength' => '240',
                         'maxlength' => '240',
-                        'caption'   => __(['Answer %s label', $fid]),
+                        'caption'   => ['Answer %s label', $fid],
                         'value'     => $vars['poll']['answer'][$qid][$fid] ?? null,
                         'value'     => $vars['poll']['answer'][$qid][$fid] ?? null,
                         'disabled'  => $vars['pollNoEdit'] ?? null,
                         'disabled'  => $vars['pollNoEdit'] ?? null,
                     ];
                     ];

+ 16 - 16
app/Models/Pages/Profile/Config.php

@@ -175,13 +175,13 @@ class Config extends Profile
                     'type'    => 'select',
                     'type'    => 'select',
                     'options' => $langs,
                     'options' => $langs,
                     'value'   => $this->curUser->language,
                     'value'   => $this->curUser->language,
-                    'caption' => __('Language'),
+                    'caption' => 'Language',
                 ],
                 ],
                 'style' => [
                 'style' => [
                     'type'    => 'select',
                     'type'    => 'select',
                     'options' => $styles,
                     'options' => $styles,
                     'value'   => $this->curUser->style,
                     'value'   => $this->curUser->style,
-                    'caption' => __('Style'),
+                    'caption' => 'Style',
                 ],
                 ],
                 'timezone' => [
                 'timezone' => [
                     'type'    => 'select',
                     'type'    => 'select',
@@ -228,26 +228,26 @@ class Config extends Profile
                         '14'    => __('UTC+14:00'),
                         '14'    => __('UTC+14:00'),
                     ],
                     ],
                     'value'   => $this->curUser->timezone,
                     'value'   => $this->curUser->timezone,
-                    'caption' => __('Time zone'),
+                    'caption' => 'Time zone',
                 ],
                 ],
                 'dst' => [
                 'dst' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $this->curUser->dst,
                     'value'   => $this->curUser->dst,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('DST label'),
+                    'caption' => 'DST label',
                     'help'    => 'DST help',
                     'help'    => 'DST help',
                 ],
                 ],
                 'time_format' => [
                 'time_format' => [
                     'type'    => 'select',
                     'type'    => 'select',
                     'options' => $timeFormat,
                     'options' => $timeFormat,
                     'value'   => $this->curUser->time_format,
                     'value'   => $this->curUser->time_format,
-                    'caption' => __('Time format'),
+                    'caption' => 'Time format',
                 ],
                 ],
                 'date_format' => [
                 'date_format' => [
                     'type'    => 'select',
                     'type'    => 'select',
                     'options' => $dateFormat,
                     'options' => $dateFormat,
                     'value'   => $this->curUser->date_format,
                     'value'   => $this->curUser->date_format,
-                    'caption' => __('Date format'),
+                    'caption' => 'Date format',
                 ],
                 ],
 
 
             ],
             ],
@@ -260,35 +260,35 @@ class Config extends Profile
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $this->curUser->show_smilies,
                     'value'   => $this->curUser->show_smilies,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Smilies label'),
+                    'caption' => 'Smilies label',
                     'help'    => 'Smilies info',
                     'help'    => 'Smilies info',
                 ],
                 ],
                 'show_sig' => [
                 'show_sig' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $this->curUser->show_sig,
                     'value'   => $this->curUser->show_sig,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Sigs label'),
+                    'caption' => 'Sigs label',
                     'help'    => 'Sigs info',
                     'help'    => 'Sigs info',
                 ],
                 ],
                 'show_avatars' => [
                 'show_avatars' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $this->curUser->show_avatars,
                     'value'   => $this->curUser->show_avatars,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Avatars label'),
+                    'caption' => 'Avatars label',
                     'help'    => 'Avatars info',
                     'help'    => 'Avatars info',
                 ],
                 ],
                 'show_img' => [
                 'show_img' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $this->curUser->show_img,
                     'value'   => $this->curUser->show_img,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Images label'),
+                    'caption' => 'Images label',
                     'help'    => 'Images info',
                     'help'    => 'Images info',
                 ],
                 ],
                 'show_img_sig' => [
                 'show_img_sig' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
                     'value'   => $this->curUser->show_img_sig,
                     'value'   => $this->curUser->show_img_sig,
                     'values'  => $yn,
                     'values'  => $yn,
-                    'caption' => __('Images sigs label'),
+                    'caption' => 'Images sigs label',
                     'help'    => 'Images sigs info',
                     'help'    => 'Images sigs info',
                 ],
                 ],
             ],
             ],
@@ -302,7 +302,7 @@ class Config extends Profile
                     'min'     => '0',
                     'min'     => '0',
                     'max'     => '50',
                     'max'     => '50',
                     'value'   => $this->curUser->__disp_topics,
                     'value'   => $this->curUser->__disp_topics,
-                    'caption' => __('Topics per page label'),
+                    'caption' => 'Topics per page label',
                     'help'    => 'For default',
                     'help'    => 'For default',
                 ],
                 ],
                 'disp_posts' => [
                 'disp_posts' => [
@@ -310,7 +310,7 @@ class Config extends Profile
                     'min'     => '0',
                     'min'     => '0',
                     'max'     => '50',
                     'max'     => '50',
                     'value'   => $this->curUser->__disp_posts,
                     'value'   => $this->curUser->__disp_posts,
-                    'caption' => __('Posts per page label'),
+                    'caption' => 'Posts per page label',
                     'help'    => 'For default',
                     'help'    => 'For default',
                 ],
                 ],
             ],
             ],
@@ -327,7 +327,7 @@ class Config extends Profile
                         '2' => __('Strict check'),
                         '2' => __('Strict check'),
                     ],
                     ],
                     'value'    => $this->curUser->ip_check_type,
                     'value'    => $this->curUser->ip_check_type,
-                    'caption'  => __('IP check'),
+                    'caption'  => 'IP check',
                     'help'     => 'IP check info',
                     'help'     => 'IP check info',
                     'disabled' => $this->rules->editIpCheckType ? null : true,
                     'disabled' => $this->rules->editIpCheckType ? null : true,
                 ],
                 ],
@@ -343,14 +343,14 @@ class Config extends Profile
                         'type'    => 'radio',
                         'type'    => 'radio',
                         'value'   => $this->curUser->notify_with_post,
                         'value'   => $this->curUser->notify_with_post,
                         'values'  => $yn,
                         'values'  => $yn,
-                        'caption' => __('Notify label'),
+                        'caption' => 'Notify label',
                         'help'    => 'Notify info',
                         'help'    => 'Notify info',
                     ],
                     ],
                     'auto_notify' => [
                     'auto_notify' => [
                         'type'    => 'radio',
                         'type'    => 'radio',
                         'value'   => $this->curUser->auto_notify,
                         'value'   => $this->curUser->auto_notify,
                         'values'  => $yn,
                         'values'  => $yn,
-                        'caption' => __('Auto notify label'),
+                        'caption' => 'Auto notify label',
                         'help'    => 'Auto notify info',
                         'help'    => 'Auto notify info',
                     ],
                     ],
                 ],
                 ],

+ 18 - 18
app/Models/Pages/Profile/Edit.php

@@ -235,7 +235,7 @@ class Edit extends Profile
             $fields['username'] = [
             $fields['username'] = [
                 'type'      => 'text',
                 'type'      => 'text',
                 'maxlength' => '25',
                 'maxlength' => '25',
-                'caption'   => __('Username'),
+                'caption'   => 'Username',
                 'required'  => true,
                 'required'  => true,
                 'pattern'   => '^.{2,25}$',
                 'pattern'   => '^.{2,25}$',
                 'value'     => $this->curUser->username,
                 'value'     => $this->curUser->username,
@@ -244,14 +244,14 @@ class Edit extends Profile
             $fields['username'] = [
             $fields['username'] = [
                 'class'   => 'pline',
                 'class'   => 'pline',
                 'type'    => 'str',
                 'type'    => 'str',
-                'caption' => __('Username'),
+                'caption' => 'Username',
                 'value'   => $this->curUser->username,
                 'value'   => $this->curUser->username,
             ];
             ];
         }
         }
         if ($this->rules->changeGroup) {
         if ($this->rules->changeGroup) {
             $fields['group'] = [
             $fields['group'] = [
                 'type'    => 'link',
                 'type'    => 'link',
-                'caption' => __('Group'),
+                'caption' => 'Group',
                 'value'   => $this->curUser->group_id ? $this->curUser->g_title : __('Change user group'),
                 'value'   => $this->curUser->group_id ? $this->curUser->g_title : __('Change user group'),
                 'title'   => __('Change user group'),
                 'title'   => __('Change user group'),
                 'href'    => $this->linkChangeGroup(),
                 'href'    => $this->linkChangeGroup(),
@@ -260,7 +260,7 @@ class Edit extends Profile
             $fields['group'] = [
             $fields['group'] = [
                 'class'   => 'pline',
                 'class'   => 'pline',
                 'type'    => 'str',
                 'type'    => 'str',
-                'caption' => __('Group'),
+                'caption' => 'Group',
                 'value'   => $this->curUser->group_id ? $this->curUser->g_title : '-',
                 'value'   => $this->curUser->group_id ? $this->curUser->g_title : '-',
             ];
             ];
         }
         }
@@ -276,7 +276,7 @@ class Edit extends Profile
             $fields['title'] = [
             $fields['title'] = [
                 'type'      => 'text',
                 'type'      => 'text',
                 'maxlength' => '50',
                 'maxlength' => '50',
-                'caption'   => __('Title'),
+                'caption'   => 'Title',
                 'value'     => $this->curUser->title,
                 'value'     => $this->curUser->title,
                 'help'      => 'Leave blank',
                 'help'      => 'Leave blank',
             ];
             ];
@@ -284,7 +284,7 @@ class Edit extends Profile
             $fields['title'] = [
             $fields['title'] = [
                 'class'   => 'pline',
                 'class'   => 'pline',
                 'type'    => 'str',
                 'type'    => 'str',
-                'caption' => __('Title'),
+                'caption' => 'Title',
                 'value'   => $this->curUser->title(),
                 'value'   => $this->curUser->title(),
             ];
             ];
         }
         }
@@ -300,13 +300,13 @@ class Edit extends Profile
                 $fields['avatar'] = [
                 $fields['avatar'] = [
                     'class'   => 'pline',
                     'class'   => 'pline',
                     'type'    => 'str',
                     'type'    => 'str',
-                    'caption' => __('Avatar'),
+                    'caption' => 'Avatar',
                     'value'   => __('Not uploaded'),
                     'value'   => __('Not uploaded'),
                 ];
                 ];
             } elseif ($this->curUser->avatar) {
             } elseif ($this->curUser->avatar) {
                 $fields['avatar'] = [
                 $fields['avatar'] = [
                     'type'    => 'yield',
                     'type'    => 'yield',
-                    'caption' => __('Avatar'),
+                    'caption' => 'Avatar',
                     'value'   => 'avatar',
                     'value'   => 'avatar',
                 ];
                 ];
             }
             }
@@ -325,7 +325,7 @@ class Edit extends Profile
 
 
             $fields['upload_avatar'] = [
             $fields['upload_avatar'] = [
                 'type'    => 'file',
                 'type'    => 'file',
-                'caption' => __('New avatar'),
+                'caption' => 'New avatar',
                 'help'    => ['New avatar info',
                 'help'    => ['New avatar info',
                     \ForkBB\num($this->c->config->i_avatars_width),
                     \ForkBB\num($this->c->config->i_avatars_width),
                     \ForkBB\num($this->c->config->i_avatars_height),
                     \ForkBB\num($this->c->config->i_avatars_height),
@@ -350,7 +350,7 @@ class Edit extends Profile
                     'admin_note' => [
                     'admin_note' => [
                         'type'      => 'text',
                         'type'      => 'text',
                         'maxlength' => '30',
                         'maxlength' => '30',
-                        'caption'   => __('Admin note'),
+                        'caption'   => 'Admin note',
                         'value'     => $this->curUser->admin_note,
                         'value'     => $this->curUser->admin_note,
                     ],
                     ],
                 ],
                 ],
@@ -362,7 +362,7 @@ class Edit extends Profile
         $fields['realname'] = [
         $fields['realname'] = [
             'type'      => 'text',
             'type'      => 'text',
             'maxlength' => '40',
             'maxlength' => '40',
-            'caption'   => __('Realname'),
+            'caption'   => 'Realname',
             'value'     => $this->curUser->realname,
             'value'     => $this->curUser->realname,
         ];
         ];
         $genders = [
         $genders = [
@@ -375,12 +375,12 @@ class Edit extends Profile
             'type'    => 'radio',
             'type'    => 'radio',
             'value'   => $this->curUser->gender,
             'value'   => $this->curUser->gender,
             'values'  => $genders,
             'values'  => $genders,
-            'caption' => __('Gender'),
+            'caption' => 'Gender',
         ];
         ];
         $fields['location'] = [
         $fields['location'] = [
             'type'      => 'text',
             'type'      => 'text',
             'maxlength' => 30,
             'maxlength' => 30,
-            'caption'   => __('Location'),
+            'caption'   => 'Location',
             'value'     => $this->curUser->location,
             'value'     => $this->curUser->location,
         ];
         ];
         $form['sets']['personal'] = [
         $form['sets']['personal'] = [
@@ -395,7 +395,7 @@ class Edit extends Profile
             $fields['open-email'] = [
             $fields['open-email'] = [
                 'class'   => 'pline',
                 'class'   => 'pline',
                 'type'    => 'str',
                 'type'    => 'str',
-                'caption' => __('Email info'),
+                'caption' => 'Email info',
                 'value'   => $this->curUser->censorEmail,
                 'value'   => $this->curUser->censorEmail,
             ];
             ];
         }
         }
@@ -415,7 +415,7 @@ class Edit extends Profile
                 1 => __('Hide allow form label'),
                 1 => __('Hide allow form label'),
                 2 => __('Hide both label'),
                 2 => __('Hide both label'),
             ],
             ],
-            'caption' => __('Email settings label'),
+            'caption' => 'Email settings label',
         ];
         ];
 
 
         if ($this->rules->editWebsite) {
         if ($this->rules->editWebsite) {
@@ -423,7 +423,7 @@ class Edit extends Profile
                 'id'        => 'website',
                 'id'        => 'website',
                 'type'      => 'text',
                 'type'      => 'text',
                 'maxlength' => '100',
                 'maxlength' => '100',
-                'caption'   => __('Website'),
+                'caption'   => 'Website',
                 'value'     => $this->curUser->url,
                 'value'     => $this->curUser->url,
             ];
             ];
         } elseif (
         } elseif (
@@ -434,7 +434,7 @@ class Edit extends Profile
                 'id'      => 'website',
                 'id'      => 'website',
                 'class'   => 'pline',
                 'class'   => 'pline',
                 'type'    => 'link',
                 'type'    => 'link',
-                'caption' => __('Website'),
+                'caption' => 'Website',
                 'value'   => $this->curUser->censorUrl,
                 'value'   => $this->curUser->censorUrl,
                 'href'    => $this->curUser->censorUrl,
                 'href'    => $this->curUser->censorUrl,
             ];
             ];
@@ -451,7 +451,7 @@ class Edit extends Profile
             $fields['signature'] = [
             $fields['signature'] = [
                 'type'    => 'textarea',
                 'type'    => 'textarea',
                 'value'   => $this->curUser->signature,
                 'value'   => $this->curUser->signature,
-                'caption' => __('Signature'),
+                'caption' => 'Signature',
                 'help'    => ['Sig max size', \ForkBB\num($this->curUser->g_sig_length), \ForkBB\num($this->curUser->g_sig_lines)],
                 'help'    => ['Sig max size', \ForkBB\num($this->curUser->g_sig_length), \ForkBB\num($this->curUser->g_sig_lines)],
             ];
             ];
             $form['sets']['signature'] = [
             $form['sets']['signature'] = [

+ 2 - 2
app/Models/Pages/Profile/Email.php

@@ -230,7 +230,7 @@ class Email extends Profile
                             'autofocus' => true,
                             'autofocus' => true,
                             'type'      => 'text',
                             'type'      => 'text',
                             'maxlength' => '80',
                             'maxlength' => '80',
-                            'caption'   => __($this->rules->confirmEmail ? 'New or old email' : 'New email'),
+                            'caption'   => $this->rules->confirmEmail ? 'New or old email' : 'New email',
                             'required'  => true,
                             'required'  => true,
                             'pattern'   => '.+@.+',
                             'pattern'   => '.+@.+',
                             'value'     => $this->curUser->email,
                             'value'     => $this->curUser->email,
@@ -238,7 +238,7 @@ class Email extends Profile
                         ],
                         ],
                         'password' => [
                         'password' => [
                             'type'      => 'password',
                             'type'      => 'password',
-                            'caption'   => __('Your passphrase'),
+                            'caption'   => 'Your passphrase',
                             'required'  => true,
                             'required'  => true,
                         ],
                         ],
                     ],
                     ],

+ 2 - 2
app/Models/Pages/Profile/Mod.php

@@ -136,7 +136,7 @@ class Mod extends Profile
                     'class'   => ['modforum', 'name', 'depth' . $forum->depth],
                     'class'   => ['modforum', 'name', 'depth' . $forum->depth],
                     'type'    => 'str',
                     'type'    => 'str',
                     'value'   => $forum->forum_name,
                     'value'   => $forum->forum_name,
-                    'caption' => __('Forum label'),
+                    'caption' => 'Forum label',
                 ];
                 ];
                 $fields["moderator[{$forum->id}]"] = [
                 $fields["moderator[{$forum->id}]"] = [
                     'class'    => ['modforum', 'moderator'],
                     'class'    => ['modforum', 'moderator'],
@@ -144,7 +144,7 @@ class Mod extends Profile
                     'value'    => $forum->id,
                     'value'    => $forum->id,
                     'checked'  => isset($this->curForums[$forum->id]) && $this->curUser->isModerator($forum),
                     'checked'  => isset($this->curForums[$forum->id]) && $this->curUser->isModerator($forum),
                     'disabled' => ! isset($this->curForums[$forum->id]) || '' != $this->curForums[$forum->id]->redirect_url,
                     'disabled' => ! isset($this->curForums[$forum->id]) || '' != $this->curForums[$forum->id]->redirect_url,
-                    'caption'  => __('Moderator label'),
+                    'caption'  => 'Moderator label',
                 ];
                 ];
                 $form['sets']["forum{$forum->id}"] = [
                 $form['sets']["forum{$forum->id}"] = [
                     'class'  => 'modforum',
                     'class'  => 'modforum',

+ 2 - 2
app/Models/Pages/Profile/Pass.php

@@ -105,14 +105,14 @@ class Pass extends Profile
                         'new_pass' => [
                         'new_pass' => [
                             'autofocus' => true,
                             'autofocus' => true,
                             'type'      => 'password',
                             'type'      => 'password',
-                            'caption'   => __('New pass'),
+                            'caption'   => 'New pass',
                             'required'  => true,
                             'required'  => true,
                             'pattern'   => '^.{16,}$',
                             'pattern'   => '^.{16,}$',
                             'help'      => 'Passphrase help',
                             'help'      => 'Passphrase help',
                         ],
                         ],
                         'password' => [
                         'password' => [
                             'type'      => 'password',
                             'type'      => 'password',
-                            'caption'   => __('Your passphrase'),
+                            'caption'   => 'Your passphrase',
                             'required'  => true,
                             'required'  => true,
                         ],
                         ],
                     ],
                     ],

+ 22 - 22
app/Models/Pages/Profile/View.php

@@ -56,13 +56,13 @@ class View extends Profile
         $fields['username'] = [
         $fields['username'] = [
             'class'   => 'pline',
             'class'   => 'pline',
             'type'    => 'str',
             'type'    => 'str',
-            'caption' => __('Username'),
+            'caption' => 'Username',
             'value'   => $this->curUser->username,
             'value'   => $this->curUser->username,
         ];
         ];
         $fields['title'] = [
         $fields['title'] = [
             'class'   => 'pline',
             'class'   => 'pline',
             'type'    => 'str',
             'type'    => 'str',
-            'caption' => __('Title'),
+            'caption' => 'Title',
             'value'   => $this->curUser->title(),
             'value'   => $this->curUser->title(),
         ];
         ];
         $fields[] = [
         $fields[] = [
@@ -74,7 +74,7 @@ class View extends Profile
         ) {
         ) {
             $fields['avatar'] = [
             $fields['avatar'] = [
                 'type'    => 'yield',
                 'type'    => 'yield',
-                'caption' => __('Avatar'),
+                'caption' => 'Avatar',
                 'value'   => 'avatar',
                 'value'   => 'avatar',
             ];
             ];
         }
         }
@@ -96,7 +96,7 @@ class View extends Profile
                     'admin_note' => [
                     'admin_note' => [
                         'class'     => 'pline',
                         'class'     => 'pline',
                         'type'      => 'str',
                         'type'      => 'str',
-                        'caption'   => __('Admin note'),
+                        'caption'   => 'Admin note',
                         'value'     => $this->curUser->admin_note,
                         'value'     => $this->curUser->admin_note,
                     ],
                     ],
                 ],
                 ],
@@ -109,7 +109,7 @@ class View extends Profile
             $fields['realname'] = [
             $fields['realname'] = [
                 'class'   => 'pline',
                 'class'   => 'pline',
                 'type'    => 'str',
                 'type'    => 'str',
-                'caption' => __('Realname'),
+                'caption' => 'Realname',
                 'value'   => $this->curUser->censorRealname,
                 'value'   => $this->curUser->censorRealname,
             ];
             ];
         }
         }
@@ -122,14 +122,14 @@ class View extends Profile
                 'class'   => 'pline',
                 'class'   => 'pline',
                 'type'    => 'str',
                 'type'    => 'str',
                 'value'   => $genders[$this->curUser->gender],
                 'value'   => $genders[$this->curUser->gender],
-                'caption' => __('Gender'),
+                'caption' => 'Gender',
             ];
             ];
         }
         }
         if ('' != $this->curUser->location) {
         if ('' != $this->curUser->location) {
             $fields['location'] = [
             $fields['location'] = [
                 'class'   => 'pline',
                 'class'   => 'pline',
                 'type'    => 'str',
                 'type'    => 'str',
-                'caption' => __('Location'),
+                'caption' => 'Location',
                 'value'   => $this->curUser->censorLocation,
                 'value'   => $this->curUser->censorLocation,
             ];
             ];
         }
         }
@@ -148,7 +148,7 @@ class View extends Profile
                 $fields['email'] = [
                 $fields['email'] = [
                     'class'   => 'pline',
                     'class'   => 'pline',
                     'type'    => 'link',
                     'type'    => 'link',
-                    'caption' => __('Email info'),
+                    'caption' => 'Email info',
                     'value'   => $this->curUser->censorEmail,
                     'value'   => $this->curUser->censorEmail,
                     'href'    => 'mailto:' . $this->curUser->censorEmail,
                     'href'    => 'mailto:' . $this->curUser->censorEmail,
                 ];
                 ];
@@ -158,7 +158,7 @@ class View extends Profile
                 $fields['email'] = [
                 $fields['email'] = [
                     'class'   => 'pline',
                     'class'   => 'pline',
                     'type'    => 'link',
                     'type'    => 'link',
-                    'caption' => __('Email info'),
+                    'caption' => 'Email info',
                     'value'   => __('Send email'),
                     'value'   => __('Send email'),
                     'href'    => $this->c->Router->link('SendEmail', ['id' => $this->curUser->id]),
                     'href'    => $this->c->Router->link('SendEmail', ['id' => $this->curUser->id]),
                 ];
                 ];
@@ -172,7 +172,7 @@ class View extends Profile
                 'id'      => 'website',
                 'id'      => 'website',
                 'class'   => 'pline',
                 'class'   => 'pline',
                 'type'    => 'link',
                 'type'    => 'link',
-                'caption' => __('Website'),
+                'caption' => 'Website',
                 'value'   => $this->curUser->censorUrl,
                 'value'   => $this->curUser->censorUrl,
                 'href'    => $this->curUser->censorUrl,
                 'href'    => $this->curUser->censorUrl,
                 'rel'     => 'ugc',
                 'rel'     => 'ugc',
@@ -192,7 +192,7 @@ class View extends Profile
             if ($this->curUser->isSignature) {
             if ($this->curUser->isSignature) {
                 $fields['signature'] = [
                 $fields['signature'] = [
                     'type'    => 'yield',
                     'type'    => 'yield',
-                    'caption' => __('Signature'),
+                    'caption' => 'Signature',
                     'value'   => 'signature',
                     'value'   => 'signature',
                 ];
                 ];
 
 
@@ -213,20 +213,20 @@ class View extends Profile
             'class'   => 'pline',
             'class'   => 'pline',
             'type'    => 'str',
             'type'    => 'str',
             'value'   => \ForkBB\dt($this->curUser->registered, true),
             'value'   => \ForkBB\dt($this->curUser->registered, true),
-            'caption' => __('Registered info'),
+            'caption' => 'Registered info',
         ];
         ];
         $fields['lastpost'] = [
         $fields['lastpost'] = [
             'class'   => 'pline',
             'class'   => 'pline',
             'type'    => 'str',
             'type'    => 'str',
             'value'   => \ForkBB\dt($this->curUser->last_post, true),
             'value'   => \ForkBB\dt($this->curUser->last_post, true),
-            'caption' => __('Last post info'),
+            'caption' => 'Last post info',
         ];
         ];
         if ($this->curUser->last_post > 0) {
         if ($this->curUser->last_post > 0) {
             if ('1' == $this->user->g_search) {
             if ('1' == $this->user->g_search) {
                 $fields['posts'] = [
                 $fields['posts'] = [
                     'class'   => 'pline',
                     'class'   => 'pline',
                     'type'    => 'link',
                     'type'    => 'link',
-                    'caption' => __('Posts info'),
+                    'caption' => 'Posts info',
                     'value'   => $this->user->showPostCount ? \ForkBB\num($this->curUser->num_posts) : __('Show posts'),
                     'value'   => $this->user->showPostCount ? \ForkBB\num($this->curUser->num_posts) : __('Show posts'),
                     'href'    => $this->c->Router->link(
                     'href'    => $this->c->Router->link(
                         'SearchAction',
                         'SearchAction',
@@ -240,7 +240,7 @@ class View extends Profile
                 $fields['topics'] = [
                 $fields['topics'] = [
                     'class'   => 'pline',
                     'class'   => 'pline',
                     'type'    => 'link',
                     'type'    => 'link',
-                    'caption' => __('Topics info'),
+                    'caption' => 'Topics info',
                     'value'   => $this->user->showPostCount ? \ForkBB\num($this->curUser->num_topics) : __('Show topics'),
                     'value'   => $this->user->showPostCount ? \ForkBB\num($this->curUser->num_topics) : __('Show topics'),
                     'href'    => $this->c->Router->link(
                     'href'    => $this->c->Router->link(
                         'SearchAction',
                         'SearchAction',
@@ -255,13 +255,13 @@ class View extends Profile
                 $fields['posts'] = [
                 $fields['posts'] = [
                     'class'   => 'pline',
                     'class'   => 'pline',
                     'type'    => 'str',
                     'type'    => 'str',
-                    'caption' => __('Posts info'),
+                    'caption' => 'Posts info',
                     'value'   => \ForkBB\num($this->curUser->num_posts),
                     'value'   => \ForkBB\num($this->curUser->num_posts),
                 ];
                 ];
                 $fields['topics'] = [
                 $fields['topics'] = [
                     'class'   => 'pline',
                     'class'   => 'pline',
                     'type'    => 'str',
                     'type'    => 'str',
-                    'caption' => __('Topics info'),
+                    'caption' => 'Topics info',
                     'value'   => \ForkBB\num($this->curUser->num_topics),
                     'value'   => \ForkBB\num($this->curUser->num_topics),
                 ];
                 ];
             }
             }
@@ -274,7 +274,7 @@ class View extends Profile
                 $fields['forums_subscr'] = [
                 $fields['forums_subscr'] = [
                     'class'   => 'pline',
                     'class'   => 'pline',
                     'type'    => $isLink ? 'link' : 'str',
                     'type'    => $isLink ? 'link' : 'str',
-                    'caption' => __('Total forums subscriptions'),
+                    'caption' => 'Total forums subscriptions',
                     'value'   => \ForkBB\num(\count($subscrInfo[$subscr::FORUMS_DATA])),
                     'value'   => \ForkBB\num(\count($subscrInfo[$subscr::FORUMS_DATA])),
                     'href'    => $this->c->Router->link(
                     'href'    => $this->c->Router->link(
                         'SearchAction',
                         'SearchAction',
@@ -290,7 +290,7 @@ class View extends Profile
                 $fields['topics_subscr'] = [
                 $fields['topics_subscr'] = [
                     'class'   => 'pline',
                     'class'   => 'pline',
                     'type'    => $isLink ? 'link' : 'str',
                     'type'    => $isLink ? 'link' : 'str',
-                    'caption' => __('Total topics subscriptions'),
+                    'caption' => 'Total topics subscriptions',
                     'value'   => \ForkBB\num(\count($subscrInfo[$subscr::TOPICS_DATA])),
                     'value'   => \ForkBB\num(\count($subscrInfo[$subscr::TOPICS_DATA])),
                     'href'    => $this->c->Router->link(
                     'href'    => $this->c->Router->link(
                         'SearchAction',
                         'SearchAction',
@@ -318,14 +318,14 @@ class View extends Profile
                 'value'   => $this->rules->my
                 'value'   => $this->rules->my
                     ? \ForkBB\dt($this->curUser->last_visit)
                     ? \ForkBB\dt($this->curUser->last_visit)
                     : \ForkBB\dt($this->curUser->currentVisit, true),
                     : \ForkBB\dt($this->curUser->currentVisit, true),
-                'caption' => __('Last visit info'),
+                'caption' => 'Last visit info',
             ];
             ];
         }
         }
         if ($this->rules->viewOEmail) {
         if ($this->rules->viewOEmail) {
             $fields['open-email'] = [
             $fields['open-email'] = [
                 'class'   => 'pline',
                 'class'   => 'pline',
                 'type'    => 2 === $this->curUser->email_setting ? 'str' : 'link',
                 'type'    => 2 === $this->curUser->email_setting ? 'str' : 'link',
-                'caption' => __('Email info'),
+                'caption' => 'Email info',
                 'value'   => $this->curUser->censorEmail,
                 'value'   => $this->curUser->censorEmail,
                 'href'    => 'mailto:' . $this->curUser->censorEmail,
                 'href'    => 'mailto:' . $this->curUser->censorEmail,
             ];
             ];
@@ -337,7 +337,7 @@ class View extends Profile
             $fields['ip'] = [
             $fields['ip'] = [
                 'class'   => 'pline',
                 'class'   => 'pline',
                 'type'    => 'link',
                 'type'    => 'link',
-                'caption' => __('IP'),
+                'caption' => 'IP',
                 'value'   => $this->curUser->registration_ip,
                 'value'   => $this->curUser->registration_ip,
                 'href'    => $this->c->Router->link(
                 'href'    => $this->c->Router->link(
                     'AdminHost',
                     'AdminHost',

+ 3 - 3
app/Models/Pages/Register.php

@@ -109,7 +109,7 @@ class Register extends Page
                             'type'      => 'text',
                             'type'      => 'text',
                             'maxlength' => '80',
                             'maxlength' => '80',
                             'value'     => $v->email,
                             'value'     => $v->email,
-                            'caption'   => __('Email'),
+                            'caption'   => 'Email',
                             'help'      => 'Email info',
                             'help'      => 'Email info',
                             'required'  => true,
                             'required'  => true,
                             'pattern'   => '.+@.+',
                             'pattern'   => '.+@.+',
@@ -119,7 +119,7 @@ class Register extends Page
                             'type'      => 'text',
                             'type'      => 'text',
                             'maxlength' => '25',
                             'maxlength' => '25',
                             'value'     => $v->username,
                             'value'     => $v->username,
-                            'caption'   => __('Username'),
+                            'caption'   => 'Username',
                             'help'      => 'Login format',
                             'help'      => 'Login format',
                             'required'  => true,
                             'required'  => true,
                             'pattern'   => '^.{2,25}$',
                             'pattern'   => '^.{2,25}$',
@@ -127,7 +127,7 @@ class Register extends Page
                         'password' => [
                         'password' => [
                             'class'     => 'hint',
                             'class'     => 'hint',
                             'type'      => 'password',
                             'type'      => 'password',
-                            'caption'   => __('Passphrase'),
+                            'caption'   => 'Passphrase',
                             'help'      => 'Passphrase help',
                             'help'      => 'Passphrase help',
                             'required'  => true,
                             'required'  => true,
                             'pattern'   => '^.{16,}$',
                             'pattern'   => '^.{16,}$',

+ 1 - 1
app/Models/Pages/Report.php

@@ -132,7 +132,7 @@ class Report extends Page
                     'fields' => [
                     'fields' => [
                         'reason' => [
                         'reason' => [
                             'type'      => 'textarea',
                             'type'      => 'textarea',
-                            'caption'   => __('Reason'),
+                            'caption'   => 'Reason',
                             'required'  => true,
                             'required'  => true,
                             'value'     => $data['reason'] ?? null,
                             'value'     => $data['reason'] ?? null,
                             'autofocus' => true,
                             'autofocus' => true,

+ 8 - 8
app/Models/Pages/Search.php

@@ -166,7 +166,7 @@ class Search extends Page
                             'class'     => 'w0',
                             'class'     => 'w0',
                             'type'      => 'text',
                             'type'      => 'text',
                             'maxlength' => '100',
                             'maxlength' => '100',
-                            'caption'   => __('Keyword search'),
+                            'caption'   => 'Keyword search',
                             'value'     => $v ? $v->keywords : '',
                             'value'     => $v ? $v->keywords : '',
                             'required'  => true,
                             'required'  => true,
                             'autofocus' => true,
                             'autofocus' => true,
@@ -205,7 +205,7 @@ class Search extends Page
                             'class'     => 'w2',
                             'class'     => 'w2',
                             'type'      => 'text',
                             'type'      => 'text',
                             'maxlength' => '100',
                             'maxlength' => '100',
-                            'caption'   => __('Keyword search'),
+                            'caption'   => 'Keyword search',
                             'value'     => $v ? $v->keywords : '',
                             'value'     => $v ? $v->keywords : '',
                             'required'  => true,
                             'required'  => true,
                             'autofocus' => true,
                             'autofocus' => true,
@@ -214,7 +214,7 @@ class Search extends Page
                             'class'     => 'w1',
                             'class'     => 'w1',
                             'type'      => 'text',
                             'type'      => 'text',
                             'maxlength' => '25',
                             'maxlength' => '25',
-                            'caption'   => __('Author search'),
+                            'caption'   => 'Author search',
                             'value'     => $v ? $v->author : '*',
                             'value'     => $v ? $v->author : '*',
                             'required'  => true,
                             'required'  => true,
                         ],
                         ],
@@ -232,7 +232,7 @@ class Search extends Page
                             'type'    => 'multiselect',
                             'type'    => 'multiselect',
                             'options' => $this->listForOptions,
                             'options' => $this->listForOptions,
                             'value'   => $v ? \explode('.', $v->forums) : null,
                             'value'   => $v ? \explode('.', $v->forums) : null,
-                            'caption' => __('Forum search'),
+                            'caption' => 'Forum search',
                             'size'    => \min(\count($this->listForOptions), 10),
                             'size'    => \min(\count($this->listForOptions), 10),
                         ],
                         ],
                         'serch_in' => [
                         'serch_in' => [
@@ -244,7 +244,7 @@ class Search extends Page
                                 2 => __('Topic only'),
                                 2 => __('Topic only'),
                             ],
                             ],
                             'value'   => $v ? $v->serch_in : 0,
                             'value'   => $v ? $v->serch_in : 0,
-                            'caption' => __('Search in'),
+                            'caption' => 'Search in',
                         ],
                         ],
                         [
                         [
                             'type'  => 'info',
                             'type'  => 'info',
@@ -270,7 +270,7 @@ class Search extends Page
                                 3 => __('Sort by forum'),
                                 3 => __('Sort by forum'),
                             ],
                             ],
                             'value'   => $v ? $v->sort_by : 0,
                             'value'   => $v ? $v->sort_by : 0,
-                            'caption' => __('Sort by'),
+                            'caption' => 'Sort by',
                         ],
                         ],
                         'sort_dir' => [
                         'sort_dir' => [
                             'class'   => 'w4',
                             'class'   => 'w4',
@@ -280,7 +280,7 @@ class Search extends Page
                                 1 => __('Ascending'),
                                 1 => __('Ascending'),
                             ],
                             ],
                             'value'   => $v ? $v->sort_dir : 0,
                             'value'   => $v ? $v->sort_dir : 0,
-                            'caption' => __('Sort order'),
+                            'caption' => 'Sort order',
                         ],
                         ],
                         'show_as' => [
                         'show_as' => [
                             'class'   => 'w4',
                             'class'   => 'w4',
@@ -290,7 +290,7 @@ class Search extends Page
                                 1 => __('Show as topics'),
                                 1 => __('Show as topics'),
                             ],
                             ],
                             'value'   => $v ? $v->show_as : 0,
                             'value'   => $v ? $v->show_as : 0,
-                            'caption' => __('Show as'),
+                            'caption' => 'Show as',
                         ],
                         ],
                         [
                         [
                             'type'  => 'info',
                             'type'  => 'info',

+ 4 - 4
app/Models/Pages/Userlist.php

@@ -179,7 +179,7 @@ class Userlist extends Page
                 'type'      => 'text',
                 'type'      => 'text',
                 'maxlength' => '25',
                 'maxlength' => '25',
                 'value'     => $v->name ?: '*',
                 'value'     => $v->name ?: '*',
-                'caption'   => __('Username'),
+                'caption'   => 'Username',
                 'help'      => 'User search info',
                 'help'      => 'User search info',
                 'required'  => true,
                 'required'  => true,
 #               'autofocus' => true,
 #               'autofocus' => true,
@@ -192,7 +192,7 @@ class Userlist extends Page
             'type'    => 'select',
             'type'    => 'select',
             'options' => $this->groupList,
             'options' => $this->groupList,
             'value'   => $v->group,
             'value'   => $v->group,
-            'caption' => __('User group'),
+            'caption' => 'User group',
         ];
         ];
         $fields['sort'] = [
         $fields['sort'] = [
             'class'   => 'w4',
             'class'   => 'w4',
@@ -203,7 +203,7 @@ class Userlist extends Page
                 ['registered', __('Sort by date')],
                 ['registered', __('Sort by date')],
             ],
             ],
             'value'   => $v->sort,
             'value'   => $v->sort,
-            'caption' => __('Sort users by'),
+            'caption' => 'Sort users by',
         ];
         ];
         $fields['dir'] = [
         $fields['dir'] = [
             'class'   => 'w4',
             'class'   => 'w4',
@@ -213,7 +213,7 @@ class Userlist extends Page
                 'ASC'  => __('Ascending'),
                 'ASC'  => __('Ascending'),
                 'DESC' => __('Descending'),
                 'DESC' => __('Descending'),
             ],
             ],
-            'caption' => __('User sort order'),
+            'caption' => 'User sort order',
         ];
         ];
         $form['sets']['users'] = ['fields' => $fields];
         $form['sets']['users'] = ['fields' => $fields];
 
 

+ 1 - 1
app/templates/layouts/form.forkbb.php

@@ -20,7 +20,7 @@
             </div>
             </div>
             @else
             @else
             <dl id="id-dl-{{ $cur['id'] or $key }}" @if ($cur['class']) class="f-field-{{ \implode(' f-field-', (array) $cur['class']) }}" @endif>
             <dl id="id-dl-{{ $cur['id'] or $key }}" @if ($cur['class']) class="f-field-{{ \implode(' f-field-', (array) $cur['class']) }}" @endif>
-              <dt> @if ($cur['caption'])<label class="f-ycaption @if ($cur['required']) f-req @endif" @if (false === \strpos('.radio.yield.str.btn.link.', ".{$cur['type']}.")) for="id-{{ $key }}" @endif>{!! $cur['caption'] !!}</label> @endif</dt>
+              <dt> @if ($cur['caption'])<label class="f-ycaption @if ($cur['required']) f-req @endif" @if (false === \strpos('.radio.yield.str.btn.link.', ".{$cur['type']}.")) for="id-{{ $key }}" @endif>{!! __($cur['caption']) !!}</label> @endif</dt>
               <dd>
               <dd>
                 @if ('text' === $cur['type'])
                 @if ('text' === $cur['type'])
                 <input @if ($cur['required']) required @endif @if ($cur['disabled']) disabled @endif @if ($cur['autofocus']) autofocus @endif class="f-ctrl f-ytxt" id="id-{{ $key }}" name="{{ $key }}" type="text" @if ($cur['maxlength']) maxlength="{{ $cur['maxlength'] }}" @endif @if ($cur['pattern']) pattern="{{ $cur['pattern'] }}" @endif @isset ($cur['value']) value="{{ $cur['value'] }}" @endisset>
                 <input @if ($cur['required']) required @endif @if ($cur['disabled']) disabled @endif @if ($cur['autofocus']) autofocus @endif class="f-ctrl f-ytxt" id="id-{{ $key }}" name="{{ $key }}" type="text" @if ($cur['maxlength']) maxlength="{{ $cur['maxlength'] }}" @endif @if ($cur['pattern']) pattern="{{ $cur['pattern'] }}" @endif @isset ($cur['value']) value="{{ $cur['value'] }}" @endisset>