diff --git a/Web/Models/Entities/Ticket.php b/Web/Models/Entities/Ticket.php
index dbeaca9e..89f18b62 100644
--- a/Web/Models/Entities/Ticket.php
+++ b/Web/Models/Entities/Ticket.php
@@ -24,11 +24,11 @@ class Ticket extends RowModel
{
if ($this->getRecord()->type === 0)
{
- return 'Вопрос находится на рассмотрении.';
+ return tr("support_status_0");
} elseif ($this->getRecord()->type === 1) {
- return 'Есть ответ.';
+ return tr("support_status_1");
} elseif ($this->getRecord()->type === 2) {
- return 'Закрыто.';
+ return tr("support_status_2");
}
}
diff --git a/Web/Presenters/templates/Support/AnswerTicket.xml b/Web/Presenters/templates/Support/AnswerTicket.xml
index 6613b22a..fbb394d4 100644
--- a/Web/Presenters/templates/Support/AnswerTicket.xml
+++ b/Web/Presenters/templates/Support/AnswerTicket.xml
@@ -1,5 +1,5 @@
{extends "../@layout.xml"}
-{block title}Помощь{/block}
+{block title}{_menu_help}{/block}
{block header}
{$ticket->getName()}
@@ -12,7 +12,7 @@
{$ticket->getName()}
- Автор: {$ticket->getUser()->getFullName()} | {$ticket->getUser()->getRegistrationIP()} | Статус: {$ticket->getStatus()}
+ {_author}: {$ticket->getUser()->getFullName()} | {$ticket->getUser()->getRegistrationIP()} | {_status}: {$ticket->getStatus()}.
@@ -60,7 +60,7 @@
{$comment->getUser()->getFullName()}
- написал
+ {($comment->getUser()->isFemale() ? tr("post_writes_f") : tr("post_writes_m"))}
{$comment->getTime()}
{elseif ($comment->getUType() === 1)}
@@ -77,7 +77,7 @@
{/if}
- написал
+ {_post_writes_m}
{$comment->getTime()}
{/if}
@@ -85,7 +85,7 @@
diff --git a/Web/Presenters/templates/Support/Delete.xml b/Web/Presenters/templates/Support/Delete.xml
deleted file mode 100644
index e69de29b..00000000
diff --git a/Web/Presenters/templates/Support/Index.xml b/Web/Presenters/templates/Support/Index.xml
index a8247cd1..9f9443f5 100644
--- a/Web/Presenters/templates/Support/Index.xml
+++ b/Web/Presenters/templates/Support/Index.xml
@@ -1,8 +1,8 @@
{extends "../@layout.xml"}
-{block title}Помощь{/block}
+{block title}{_menu_help}{/block}
{block header}
- Помощь
+ {_menu_help}
{/block}
{block content}
@@ -14,13 +14,13 @@
{if $thisUser}
@@ -28,19 +28,19 @@
{if $isNew}
{/if}{/if}
{if $isMain}
- Часто задаваемые вопросы
+ {_support_faq}
-
Для кого этот сайт?
-
Сайт предназначен для поиска друзей и знакомых, а также просмотр данных пользователя. Это как справочник города, с помощью которого люди могут быстро найти актуальную информацию о человеке. Также этот сайт подойдёт для ностальгираторов и тех, кто решил слезть с трубы "ВКонтакте", которого клон и является.
+
{_support_faq_title}
+
{_support_faq_content}
{/if}
@@ -49,7 +49,7 @@
-
+
@@ -58,7 +58,7 @@
- Статус: {$ticket->getStatus()}
+ {_status}: {$ticket->getStatus()}
diff --git a/Web/Presenters/templates/Support/List.xml b/Web/Presenters/templates/Support/List.xml
index 27672ccb..06146230 100644
--- a/Web/Presenters/templates/Support/List.xml
+++ b/Web/Presenters/templates/Support/List.xml
@@ -5,18 +5,18 @@
{/block}
{block header}
- Helpdesk » Тикеты
+ Helpdesk » {_support_tickets}
{/block}
{block tabs}
{/block}
@@ -28,7 +28,7 @@
{block preview}
-
+
{/block}
@@ -40,5 +40,5 @@
{var author = $x->getUser()}
{ovk_proc_strtr($x->getContext(), 50)}
- Автор: {$author->getCanonicalName()}
+ {_author}: {$author->getCanonicalName()}
{/block}
diff --git a/Web/Presenters/templates/Support/View.xml b/Web/Presenters/templates/Support/View.xml
index 5f3265c4..4966f830 100644
--- a/Web/Presenters/templates/Support/View.xml
+++ b/Web/Presenters/templates/Support/View.xml
@@ -1,5 +1,5 @@
{extends "../@layout.xml"}
-{block title}Помощь{/block}
+{block title}{_menu_help}{/block}
{block header}
{$ticket->getName()}
@@ -13,7 +13,7 @@
{$ticket->getName()}
- Статус: {$ticket->getStatus()}
+ {_status}: {$ticket->getStatus()}
{$ticket->getText()|noescape}
@@ -21,7 +21,7 @@
{if $ticket->getType() !== 2}
@@ -33,12 +33,12 @@
-
+
{/if}
-Комментарии отсутствуют
+{_no_comments}
{var $printedSupportGreeting = false}
@@ -59,7 +59,7 @@
{$comment->getUser()->getFullName()}
- написал
+ {($comment->getUser()->isFemale() ? tr("post_writes_f") : tr("post_writes_m"))}
{$comment->getTime()}
{elseif ($comment->getUType() === 1)}
@@ -69,7 +69,7 @@
{$comment->getAuthorName()}
- написал
+ {_post_writes_m}
{$comment->getTime()}
{/if}
@@ -77,7 +77,7 @@
{if $comment->getUType() === 0}
{/if}
diff --git a/locales/en.strings b/locales/en.strings
index 9a311c39..0c729686 100644
--- a/locales/en.strings
+++ b/locales/en.strings
@@ -113,7 +113,6 @@
"pinned" = "pinned";
"comments_tip" = "Be first, who leaves a comment at this post!";
"your_comment" = "Your comment";
-"comments" = "Comments";
"shown" = "Shown";
"x_out_of" = "$1 of";
"wall_zero" = "no posts";
@@ -123,6 +122,8 @@
"publish_post" = "Add post";
"view_other_comments" = "View other comments";
+"no_comments" = "No comments";
+
"all_news" = "All news";
"posts_per_page" = "Number of posts per page";
@@ -134,7 +135,7 @@
"nsfw_warning" = "This post may have NSFW-content";
"report" = "Report";
"attach_photo" = "Attach photo";
-"no_posts_abstract" = "Nobody wrote anything here... At least.";
+"no_posts_abstract" = "Nobody wrote anything here... So far.";
"attach_no_longer_available" = "This attachment is no longer available.";
"open_post" = "Open post";
"version_incompatibility" = "This attachment could not be displayed. Probably the database is incompatible with the current version of OpenVK.";
@@ -460,9 +461,34 @@
"coins_one" = "One voice";
"coins_other" = "$1 voices";
+/* Support */
+
+"support_opened" = "Opened";
+"support_answered" = "With a response";
+"support_closed" = "Closed";
+"support_ticket" = "Ticket";
+"support_tickets" = "Tickets";
+"support_status_0" = "Issue under consideration";
+"support_status_1" = "There's a response";
+"support_status_2" = "Closed";
+"support_greeting_hi" = "Greetings, $1!";
+"support_greeting_regards" = "Best regards, $1 support team.";
+
+"support_faq" = "Frequently Asked Questions";
+"support_list" = "List of tickets";
+"support_new" = "New ticket";
+
+"support_faq_title" = "Who is this website for?";
+"support_faq_content" = "The site is designed to find friends and acquaintances, as well as view user data. It is like a city directory, through which people can quickly find relevant information about a person.";
+
+"support_new_title" = "Enter the topic of your ticket";
+"support_new_content" = "Describe the issue or suggestion";
+
"comment" = "Comment";
"sender" = "Sender";
+"author" = "Author";
+
/* Errors */
"error_1" = "Incorrect query";
diff --git a/locales/ru.strings b/locales/ru.strings
index 4653afb4..7d41d75a 100644
--- a/locales/ru.strings
+++ b/locales/ru.strings
@@ -116,7 +116,6 @@
"pinned" = "закреплено";
"comments_tip" = "Будьте первым, кто оставит комментарий!";
"your_comment" = "Ваш комментарий";
-"comments" = "Комментарии";
"shown" = "Показано";
"x_out_of" = "$1 из";
"wall_zero" = "нет записей";
@@ -126,6 +125,8 @@
"wall_other" = "$1 записей";
"view_other_comments" = "Посмотреть остальные комментарии";
+"no_comments" = "Комментарии отсутствуют";
+
"all_news" = "Все новости";
"posts_per_page" = "Количество записей на странице";
@@ -534,12 +535,34 @@
"coins_many" = "$1 голосов";
"coins_other" = "$1 голосов";
-"support_greeting_hi" = "Здравствуйте";
-"support_greeting_regargs" = "С уважением, команда поддержки";
+/* Support */
+
+"support_opened" = "Открытые";
+"support_answered" = "С ответом";
+"support_closed" = "Закрытые";
+"support_ticket" = "Обращение";
+"support_tickets" = "Обращения";
+"support_status_0" = "Вопрос на рассмотрении";
+"support_status_1" = "Есть ответ";
+"support_status_2" = "Закрыто";
+"support_greeting_hi" = "Здравствуйте, $1!";
+"support_greeting_regards" = "С уважением, команда поддержки $1.";
+
+"support_faq" = "Часто задаваемые вопросы";
+"support_list" = "Список обращений";
+"support_new" = "Новое обращение";
+
+"support_faq_title" = "Для кого этот сайт?";
+"support_faq_content" = "Сайт предназначен для поиска друзей и знакомых, а также просмотр данных пользователя. Это как справочник города, с помощью которого люди могут быстро найти актуальную информацию о человеке.";
+
+"support_new_title" = "Введите тему вашего обращения";
+"support_new_content" = "Опишите проблему или предложение";
"comment" = "Комментарий";
"sender" = "Отправитель";
+"author" = "Автор";
+
/* Errors */
"error_1" = "Некорректный запрос";