Merge branch 'development' into release

Author: ssddanbrown

app/Http/Controllers/SettingController.php

@@ -19,9 +19,17 @@ public function __construct(ImageRepo $imageRepo)
     }
 
     /**
-     * Display a listing of the settings.
+     * Handle requests to the settings index path
      */
-    public function index(string $category)
+    public function index()
+    {
+        return redirect('/settings/features');
+    }
+
+    /**
+     * Display the settings for the given category.
+     */
+    public function category(string $category)
     {
         $this->ensureCategoryExists($category);
         $this->checkPermission('settings-manage');

composer.lock

@@ -24,7 +24,7 @@
     'width' => 'Largura',
     'height' => 'Altura',
     'More' => 'Mais',
-    'select' => 'Select...',
+    'select' => 'Selecionar...',
 
     // Toolbar
     'formats' => 'Formatos',
@@ -53,10 +53,10 @@
     'align_left' => 'Alinhar à esquerda',
     'align_center' => 'Alinhar ao centro',
     'align_right' => 'Alinhar à direita',
-    'align_justify' => 'Justify',
+    'align_justify' => 'Justificar',
     'list_bullet' => 'Lista com marcadores',
     'list_numbered' => 'Lista numerada',
-    'list_task' => 'Task list',
+    'list_task' => 'Lista de tarefas',
     'indent_increase' => 'Aumentar recuo',
     'indent_decrease' => 'Diminuir recuo',
     'table' => 'Tabela',
@@ -93,10 +93,10 @@
     'cell_properties_title' => 'Propriedades da Célula',
     'cell_type' => 'Tipo de célula',
     'cell_type_cell' => 'Célula',
-    'cell_scope' => 'Scope',
+    'cell_scope' => 'Âmbito',
     'cell_type_header' => 'Célula do cabeçalho',
-    'merge_cells' => 'Merge cells',
-    'split_cell' => 'Split cell',
+    'merge_cells' => 'Unir células',
+    'split_cell' => 'Dividir célula',
     'table_row_group' => 'Grupo de linhas',
     'table_column_group' => 'Grupo de colunas',
     'horizontal_align' => 'Alinhamento horizontal',
@@ -124,16 +124,16 @@
     'caption' => 'Legenda',
     'show_caption' => 'Mostrar legenda',
     'constrain' => 'Restringir proporções',
-    'cell_border_solid' => 'Solid',
-    'cell_border_dotted' => 'Dotted',
-    'cell_border_dashed' => 'Dashed',
-    'cell_border_double' => 'Double',
+    'cell_border_solid' => 'Sólido',
+    'cell_border_dotted' => 'Pontilhado',
+    'cell_border_dashed' => 'Tracejado',
+    'cell_border_double' => 'Dupla',
     'cell_border_groove' => 'Groove',
     'cell_border_ridge' => 'Ridge',
-    'cell_border_inset' => 'Inset',
-    'cell_border_outset' => 'Outset',
-    'cell_border_none' => 'None',
-    'cell_border_hidden' => 'Hidden',
+    'cell_border_inset' => 'Interna',
+    'cell_border_outset' => 'Externa',
+    'cell_border_none' => 'Nenhuma',
+    'cell_border_hidden' => 'Ocultada',
 
     // Images, links, details/summary & embed
     'source' => 'Fonte',
@@ -154,7 +154,7 @@
     'toggle_label' => 'Alternar etiqueta',
 
     // About view
-    'about' => 'About the editor',
+    'about' => 'Sobre o editor',
     'about_title' => 'Sobre o Editor WYSIWYG',
     'editor_license' => 'Editor da licença de direitos autorais',
     'editor_tiny_license' => 'Este editor é criado utilizando :tinyLink que é fornecido sob uma licença LGPL v2.1.',

resources/lang/pt/editor.php

@@ -10,8 +10,8 @@
     'settings' => 'Configurações',
     'settings_save' => 'Guardar Configurações',
     'settings_save_success' => 'Configurações guardadas',
-    'system_version' => 'System Version',
-    'categories' => 'Categories',
+    'system_version' => 'Versão do sistema',
+    'categories' => 'Categorias',
 
     // App Settings
     'app_customization' => 'Personalização',

resources/lang/pt/settings.php

@@ -1,6 +1,6 @@
 @inject('headContent', 'BookStack\Theming\CustomHtmlHeadContentProvider')
 
-@if(setting('app-custom-head') && \Route::currentRouteName() !== 'settings')
+@if(setting('app-custom-head') && !request()->routeIs('settings.category'))
 <!-- Start: custom user content -->
 {!! $headContent->forWeb() !!}
 <!-- End: custom user content -->

resources/views/common/custom-head.blade.php

@@ -265,8 +265,8 @@
     Route::delete('/settings/webhooks/{id}', [WebhookController::class, 'destroy']);
 
     // Settings
-    Route::redirect('/settings', '/settings/features')->name('settings');
-    Route::get('/settings/{category}', [SettingController::class, 'index']);
+    Route::get('/settings', [SettingController::class, 'index'])->name('settings');
+    Route::get('/settings/{category}', [SettingController::class, 'category'])->name('settings.category');
     Route::post('/settings/{category}', [SettingController::class, 'update']);
 });
 

routes/web.php

@@ -26,7 +26,7 @@ public function test_content_wrapped_in_specific_html_comments()
     public function test_configured_content_does_not_show_on_settings_page()
     {
         $this->setSettings(['app-custom-head' => '<script>console.log("cat");</script>']);
-        $resp = $this->asAdmin()->get('/settings');
+        $resp = $this->asAdmin()->get('/settings/features');
         $resp->assertDontSee('console.log("cat")', false);
     }
 

tests/Settings/CustomHeadContentTest.php

@@ -10,7 +10,11 @@ public function test_settings_endpoint_redirects_to_settings_view()
     {
         $resp = $this->asAdmin()->get('/settings');
 
-        $resp->assertRedirect('/settings/features');
+        $resp->assertStatus(302);
+
+        // Manually check path to ensure it's generated as the full path
+        $location = $resp->headers->get('location');
+        $this->assertEquals(url('/settings/features'), $location);
     }
 
     public function test_settings_category_links_work_as_expected()