Bladeren bron

+ Translated error messages in search queries

Visman 6 jaren geleden
bovenliggende
commit
bb258b01b0
3 gewijzigde bestanden met toevoegingen van 47 en 5 verwijderingen
  1. 4 4
      app/Models/Search/Prepare.php
  2. 21 0
      app/lang/en/search.po
  3. 22 1
      app/lang/ru/search.po

+ 4 - 4
app/Models/Search/Prepare.php

@@ -85,9 +85,9 @@ class Prepare extends Method
                         if (! $keyword) {
                         if (! $keyword) {
                             $keyword = true;
                             $keyword = true;
                         } elseif (empty($words)) {
                         } elseif (empty($words)) {
-                            $error = 'Syntactic word at the beginning of the search (sub)query: \'%s\'';
+                            $error = 'Logical operator at the beginning of the search (sub)query: \'%s\'';
                         } else {
                         } else {
-                            $error = 'Syntactic words follow one after another: \'%s\'';
+                            $error = 'Logical operators follow one after another: \'%s\'';
                         }
                         }
                         $words[] = $key;
                         $words[] = $key;
                         break;
                         break;
@@ -101,7 +101,7 @@ class Prepare extends Method
                         if (! $count) {
                         if (! $count) {
                             $error = 'Empty subquery: \'%s\'';
                             $error = 'Empty subquery: \'%s\'';
                         } elseif ($keyword) {
                         } elseif ($keyword) {
-                            $error = 'Syntactic word at the end of the search subquery: \'%s\'';
+                            $error = 'Logical operator at the end of the search subquery: \'%s\'';
                         }
                         }
                         if (empty($stack)) {
                         if (empty($stack)) {
                             $error = 'The order of brackets is broken: \'%s\'';
                             $error = 'The order of brackets is broken: \'%s\'';
@@ -160,7 +160,7 @@ class Prepare extends Method
         if (! $count) {
         if (! $count) {
             $error = 'There is no word for search: \'%s\'';
             $error = 'There is no word for search: \'%s\'';
         } elseif ($keyword) {
         } elseif ($keyword) {
-            $error = 'Syntactic word at the end of the search query: \'%s\'';
+            $error = 'Logical operator at the end of the search query: \'%s\'';
         } elseif (! empty($stack)) {
         } elseif (! empty($stack)) {
             $error = 'The order of brackets is broken: \'%s\'';
             $error = 'The order of brackets is broken: \'%s\'';
         }
         }

+ 21 - 0
app/lang/en/search.po

@@ -182,3 +182,24 @@ msgstr ""
 
 
 msgid "Forum indent"
 msgid "Forum indent"
 msgstr "◦ ◦ "
 msgstr "◦ ◦ "
+
+msgid "There is no word for search: '%s'"
+msgstr "There is no word for search: '%s'"
+
+msgid "Logical operator at the end of the search query: '%s'"
+msgstr "Logical operator at the end of the search query: '%s'"
+
+msgid "The order of brackets is broken: '%s'"
+msgstr "The order of brackets is broken: '%s'"
+
+msgid "Empty subquery: '%s'"
+msgstr "Empty subquery: '%s'"
+
+msgid "Logical operator at the end of the search subquery: '%s'"
+msgstr "Logical operator at the end of the search subquery: '%s'"
+
+msgid "Logical operator at the beginning of the search (sub)query: '%s'"
+msgstr "Logical operator at the beginning of the search (sub)query: '%s'"
+
+msgid "Logical operators follow one after another: '%s'"
+msgstr "Logical operators follow one after another: '%s'"

+ 22 - 1
app/lang/ru/search.po

@@ -25,7 +25,7 @@ msgid "Search criteria legend"
 msgstr "Условия поиска"
 msgstr "Условия поиска"
 
 
 msgid "Search info"
 msgid "Search info"
-msgstr "Введите одно или несколько слов для поиска. Отделяйте слова пробелами. Используйте условия AND, OR и NOT. Вы можете дополнить условие, указав автора сообщений. Используйте символ звездочки (*) для поиска по части слова."
+msgstr "Введите одно или несколько слов для поиска. Отделяйте слова пробелами. Используйте AND, OR и NOT для уточнения поиска. Вы можете дополнить условие, указав автора сообщений. Используйте символ звездочки (*) для поиска по части слова."
 
 
 msgid "Keyword search"
 msgid "Keyword search"
 msgstr "Ключевое слово или фраза"
 msgstr "Ключевое слово или фраза"
@@ -182,3 +182,24 @@ msgstr ""
 
 
 msgid "Forum indent"
 msgid "Forum indent"
 msgstr "◦ ◦ "
 msgstr "◦ ◦ "
+
+msgid "There is no word for search: '%s'"
+msgstr "Нет слов для поиска: '%s'"
+
+msgid "Logical operator at the end of the search query: '%s'"
+msgstr "Логический оператор в конце запроса: '%s'"
+
+msgid "The order of brackets is broken: '%s'"
+msgstr "Нарушен порядок скобок: '%s'"
+
+msgid "Empty subquery: '%s'"
+msgstr "Пустой подзапрос: '%s'"
+
+msgid "Logical operator at the end of the search subquery: '%s'"
+msgstr "Логический оператор в конце подзапроса: '%s'"
+
+msgid "Logical operator at the beginning of the search (sub)query: '%s'"
+msgstr "Логический оператор в начале (под)запроса: '%s'"
+
+msgid "Logical operators follow one after another: '%s'"
+msgstr "Логические операторы следуют друг за другом: '%s'"