fixed title for page show Chapter, Exercise, Solution v.4

Hexlet · Apr 3, 2024 · 8c14593 · 8c14593
1 parent 903af7d
commit 8c14593
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 12 deletions.
diff --git a/app/Helpers/TemplateHelper.php b/app/Helpers/TemplateHelper.php
@@ -4,10 +4,10 @@
 
 class TemplateHelper
 {
-    public static function getTitleContent(string $header, string $title): string
+    public static function getTitleContent(string $header): string
     {
         $nameProject = __('layout.title.name_SICP');
-        return "{$title} {$header} - {$nameProject}";
+        return "{$header} - {$nameProject}";
     }
 
     public static function getBookLink(string $locale): string

diff --git a/app/Helpers/helpers.php b/app/Helpers/helpers.php
@@ -9,9 +9,9 @@
 use Illuminate\Support\Collection;
 
 if (!function_exists('getTitleContent')) {
-    function getTitleContent(string $header, string $title = ''): string
+    function getTitleContent(string $header): string
     {
-        return TemplateHelper::getTitleContent($header, $title);
+        return TemplateHelper::getTitleContent($header);
     }
 }
 

diff --git a/resources/lang/en/chapter.php b/resources/lang/en/chapter.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'chapter' => 'Chapter',
+    'chapter' => 'Chapter :chapter',
     'index' => [
         'description' => 'Contents of the book Structure and Interpretation of Computer Programs',
     ],

diff --git a/resources/lang/en/exercise.php b/resources/lang/en/exercise.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'exercise' => 'Exercise',
+    'exercise' => 'Exercise :exercise',
     'index' => [
         'description' => 'List of exercises in the book Structure and Interpretation of Computer Programs',
     ],

diff --git a/resources/lang/en/solution.php b/resources/lang/en/solution.php
@@ -10,4 +10,5 @@
     'exercise' => 'Exercise',
     'code_review' => 'Code Review',
     'sub_title' => 'Compare your solutions',
+    'solution_for_title' => 'Solution for Exercise :exercise',
 ];
diff --git a/resources/lang/ru/chapter.php b/resources/lang/ru/chapter.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'chapter' => 'Глава',
+    'chapter' => 'Глава :chapter',
     'index' => [
         'description' => 'Оглавление книги Структура и интерпретация компьютерных программ',
     ],

diff --git a/resources/lang/ru/exercise.php b/resources/lang/ru/exercise.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'exercise' => 'Упражнение',
+    'exercise' => 'Упражнение :exercise',
     'index' => [
         'description' => 'Cписок упражнений книги Структура и интерпретация компьютерных программ',
     ],

diff --git a/resources/lang/ru/solution.php b/resources/lang/ru/solution.php
@@ -10,5 +10,5 @@
     'exercise' => 'Упражнение',
     'code_review' => 'Код Ревью',
     'sub_title' => 'Сравни свои решения',
-    'solution_for_title' => 'Решение для упражнения',
+    'solution_for_title' => 'Решение для упражнения :exercise',
 ];
diff --git a/resources/views/chapter/show.blade.php b/resources/views/chapter/show.blade.php
@@ -10,7 +10,7 @@
    */
 @endphp
 @section('title')
-  {{ getTitleContent($chapter->getFullTitle(), __('chapter.chapter')) }}
+  {{ getTitleContent(__('chapter.chapter', ['chapter' => $chapter->getFullTitle()])) }}
 @endsection
 @section('description')
   @foreach (Breadcrumbs::generate('chapter', $chapter) as $breadcrumb)

diff --git a/resources/views/exercise/show.blade.php b/resources/views/exercise/show.blade.php
@@ -7,7 +7,7 @@
    */
 @endphp
 @section('title')
-  {{ getTitleContent($exercise->getFullTitle(), __('exercise.exercise')) }}
+  {{ getTitleContent(__('exercise.exercise', ['exercise' => $exercise->getFullTitle()])) }}
 @endsection
 @section('description')
   {{ __('exercise.exercise') }} {{ $exercise->path }} {{ $exercise->getTitle() }} {{ __('exercise.show.description') }}

diff --git a/resources/views/solution/show.blade.php b/resources/views/solution/show.blade.php
@@ -2,7 +2,7 @@
 
 @section('meta-robots', 'nofollow, noindex')
 @section('title')
-  {{ getTitleContent($currentExercise->getFullTitle(), __('solution.solution_for_title')) }}
+  {{ getTitleContent(__('solution.solution_for_title', ['exercise' => $currentExercise->getFullTitle()])) }}
 @endsection
 @section('description'){{ $user->id }} - {{ __('solution.code_review') }} - {{ $user->name }} -
   {{ __('solution.exercise') }} {{ $currentExercise->getFullTitle() }}@endsection