Fixes after refactoring.

parpalak · parpalak · commit 32cd2151f37a · 2024-08-06T22:05:27.000+03:00
diff --git a/_admin/templates/article/view-favorite.php b/_admin/templates/article/view-favorite.php
@@ -1,5 +1,5 @@
 <?php
-if ($value === 'TRUE') {
+if ($row['column_favorite']) {
     echo '<i class="icon icon-favorite-active"></i>';
 } else {
     echo '<i class="icon icon-favorite-disabled"></i>';
diff --git a/_extensions/s2_blog/Controller/BlogController.php b/_extensions/s2_blog/Controller/BlogController.php
@@ -53,7 +53,7 @@ public function handle(Request $request): Response
             ->putInPlaceholder('class', 's2_blog')
             ->putInPlaceholder('rss_link', [sprintf(
                 '<link rel="alternate" type="application/rss+xml" title="%s" href="%s" />',
-                s2_htmlencode($this->translator->trans('RSS link title')),
+                s2_htmlencode($this->translator->trans('RSS blog link title')),
                 $this->blogUrlBuilder->main() . 'rss.xml'
             )])
         ;
diff --git a/_extensions/s2_blog/Controller/BlogRss.php b/_extensions/s2_blog/Controller/BlogRss.php
@@ -73,6 +73,6 @@ protected function link(): string
 
     protected function description(): string
     {
-        return sprintf($this->translator->trans('RSS description'), $this->blogTitle);
+        return sprintf($this->translator->trans('RSS blog description'), $this->blogTitle);
     }
 }
diff --git a/_extensions/s2_blog/Extension.php b/_extensions/s2_blog/Extension.php
@@ -316,7 +316,7 @@ public function registerListeners(EventDispatcherInterface $eventDispatcher, Con
                 $recentComments      = $placeholderProvider->getRecentComments();
 
                 $template->registerPlaceholder('<!-- s2_blog_last_comments -->', empty($recentComments) ? '' : $viewer->render('menu_comments', [
-                    'title' => $translator->trans('Last comments'),
+                    'title' => $translator->trans('Last blog comments'),
                     'menu'  => $recentComments,
                 ]));
             }
@@ -327,7 +327,7 @@ public function registerListeners(EventDispatcherInterface $eventDispatcher, Con
                 $lastDiscussions     = $placeholderProvider->getRecentDiscussions();
 
                 $template->registerPlaceholder('<!-- s2_blog_last_discussions -->', empty($lastDiscussions) ? '' : $viewer->render('menu_block', [
-                    'title' => $translator->trans('Last discussions'),
+                    'title' => $translator->trans('Last blog discussions'),
                     'menu'  => $lastDiscussions,
                     'class' => 's2_blog_last_discussions',
                 ]));
diff --git a/_extensions/s2_blog/lang/English.php b/_extensions/s2_blog/lang/English.php
@@ -1,16 +1,16 @@
 <?php
 
-return array(
+return [
 
     'N Comments'   => '{{ count }} comment|{{ count }} comments',
     'Post comment' => 'Leave a comment',
 
-    'Favorite posts'   => 'Favorite posts',
-    'See also'         => 'See also:',
-    'Last comments'    => 'Last blog comments',
-    'Last discussions' => 'Last blog discussions',
-    'Articles by tag'  => 'Related articles:',
-    'Year'             => '%s year',
+    'Favorite posts'        => 'Favorite posts',
+    'See also'              => 'See also:',
+    'Last blog comments'    => 'Last blog comments',
+    'Last blog discussions' => 'Last blog discussions',
+    'Articles by tag'       => 'Related articles:',
+    'Year'                  => '%s year',
 
     'Navigation'   => 'Posts',
     'Nav last'     => 'Last %d',
@@ -66,12 +66,12 @@
     'Blog posts now'    => 'Blog posts: %s',
     'Blog comments now' => 'Blog comments: %s',
 
-    'Not found'       => 'No posts',
+    'Not found'            => 'No posts',
 
     // RSS
-    'RSS description' => '%s. Last posts.',
-    'RSS link title'  => 'Last blog posts',
+    'RSS blog description' => '%s. Last posts.',
+    'RSS blog link title'  => 'Last blog posts',
 
     'Found blog tags'       => 'Similar blog tags: %s',
     'Found blog tags short' => '; blog tags: %s',
-);
+];
diff --git a/_extensions/s2_blog/lang/Russian.php b/_extensions/s2_blog/lang/Russian.php
@@ -1,16 +1,16 @@
 <?php
 
-return array(
+return [
 
     'N Comments'   => '{{ count }} комментарий|{{ count }} комментария|{{ count }} комментариев',
     'Post comment' => 'Оставить комментарий',
 
-    'Favorite posts'   => 'Избранные записи',
-    'See also'         => 'Смотрите также:',
-    'Last comments'    => 'Последние комментарии в блоге',
-    'Last discussions' => 'Обсуждаемое в блоге',
-    'Articles by tag'  => 'Статьи по этой теме:',
-    'Year'             => '%s год',
+    'Favorite posts'        => 'Избранные записи',
+    'See also'              => 'Смотрите также:',
+    'Last blog comments'    => 'Последние комментарии в блоге',
+    'Last blog discussions' => 'Обсуждаемое в блоге',
+    'Articles by tag'       => 'Статьи по этой теме:',
+    'Year'                  => '%s год',
 
     'Navigation'   => 'Записи',
     'Nav last'     => 'Последние %d',
@@ -66,12 +66,12 @@
     'Blog posts now'    => 'Записей в блоге: %s',
     'Blog comments now' => 'Комментариев в блоге: %s',
 
-    'Not found'       => 'Нет записей',
+    'Not found'            => 'Нет записей',
 
     // RSS
-    'RSS description' => '%s. Последние заметки.',
-    'RSS link title'  => 'Последние заметки в блоге',
+    'RSS blog description' => '%s. Последние заметки.',
+    'RSS blog link title'  => 'Последние заметки в блоге',
 
     'Found blog tags'       => 'Похожие ключевые слова в блоге: %s',
     'Found blog tags short' => '; в блоге: %s',
-);
+];
diff --git a/_extensions/s2_search/Admin/TranslationProvider.php b/_extensions/s2_search/Admin/TranslationProvider.php
@@ -19,7 +19,7 @@ public function getTranslations(string $language, string $locale): array
             'ru' => [
                 'Search config'        => 'Поиск',
                 'S2_SEARCH_QUICK'      => 'Быстрый поиск',
-                'S2_SEARCH_QUICK_help' => 'Показывать подсказки на основе поиска по заголовкам во время набора.',
+                'S2_SEARCH_QUICK_help' => 'По мере набора поискового запроса показывать подсказки с совпадающими заголовками.',
                 'Search index'         => 'Поисковый индекс',
                 'Reindex'              => 'Проиндексировать заново',
                 'Reindex title'        => 'Долгая операция. Если соединение с сервером прервется, можно запустить повторно.',
@@ -28,7 +28,7 @@ public function getTranslations(string $language, string $locale): array
             'en' => [
                 'Search config'        => 'Search',
                 'S2_SEARCH_QUICK'      => 'Quick search',
-                'S2_SEARCH_QUICK_help' => 'Show suggestions based on the search over titles while typing.',
+                'S2_SEARCH_QUICK_help' => 'Show suggestions based on the search over titles while typing a search query.',
                 'Search index'         => 'Search index',
                 'Reindex'              => 'Reindex',
                 'Reindex title'        => 'May be time-consuming. You can run it again in case of connection loss.',

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function handle(Request $request): Response`
`53`	`53`	`->putInPlaceholder('class', 's2_blog')`
`54`	`54`	`->putInPlaceholder('rss_link', [sprintf(`
`55`	`55`	`'<link rel="alternate" type="application/rss+xml" title="%s" href="%s" />',`
`56`		`- s2_htmlencode($this->translator->trans('RSS link title')),`
	`56`	`+ s2_htmlencode($this->translator->trans('RSS blog link title')),`
`57`	`57`	`$this->blogUrlBuilder->main() . 'rss.xml'`
`58`	`58`	`)])`
`59`	`59`	`;`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,6 @@ protected function link(): string`
`73`	`73`
`74`	`74`	`protected function description(): string`
`75`	`75`	`{`
`76`		`- return sprintf($this->translator->trans('RSS description'), $this->blogTitle);`
	`76`	`+ return sprintf($this->translator->trans('RSS blog description'), $this->blogTitle);`
`77`	`77`	`}`
`78`	`78`	`}`