Merge branch 'master' of github.com:openvk/openvk

Web/Presenters/templates/@layout.xml

@@ -109,13 +109,13 @@
 
                     {else}
                         <div class="link">
-                            <a href="/login">вход</a>
+                            <a href="/login">{_"header_login"}</a>
                         </div>
                         <div n:if="OPENVK_ROOT_CONF['openvk']['preferences']['registration']['enable']" class="link">
-                            <a href="/reg">регистрация</a>
+                            <a href="/reg">{_"header_registration"}</a>
                         </div>
                         <div class="link">
-                            <a href="/support">помощь</a>
+                            <a href="/support">{_"header_help"}</a>
                         </div>
                     {/ifset}
                 </div>
@@ -191,7 +191,7 @@
                         <input type="hidden" name="hash" value="{$csrfToken}" />
                         <input type="submit" value="{_'log_in'}" class="button" style="display: inline-block;" />
                         <a n:if="OPENVK_ROOT_CONF['openvk']['preferences']['registration']['enable']" href="/reg" class="button" style="display: inline-block;" >{_registration}</a><br><br>
-                        <a href="/restore.pl">Забыли пароль?</a>
+                        <a href="/restore.pl">{_"forgot_password"}</a>
                     </form>
                 {/ifset}
                 </div>

Web/Presenters/templates/Search/Index.xml

@@ -20,12 +20,12 @@
 {block tabs}
     <form style="margin-left: 12px;">
         <input name="type" type="hidden" value="{$_GET['type'] ?? 'users'}" />
-        <input name="query" type="text" placeholder="Поиск" value="{$_GET['query'] ?? ''}" style="width: 90%" />
-        <input type="submit" class="button" value="Поиск!" style="width: 9%" />
+        <input name="query" type="text" placeholder="{_"header_search"}" value="{$_GET['query'] ?? ''}" style="width: 90%" />
+        <input type="submit" class="button" value="{_"search_button"}" style="width: 9%" />
     </form>
     
     <p style="margin-left: 15px;">
-        <b>{$count} результатов</b>
+        <b>{tr("results", $count)}</b>
     </p>
 {/block}
 
@@ -36,7 +36,7 @@
 {/block}
 
 {block preview}
-    <img src="{$x->getAvatarUrl()}" width="75" alt="Фотография" />
+    <img src="{$x->getAvatarUrl()}" width="75" alt="{_"photo"}" />
 {/block}
 
 {block name}
@@ -49,7 +49,7 @@
             {if $type === "users"}
                 <tr>
                     <td><span class="nobold">{_"gender"}: </span></td>
-                    <td>{$x->isFemale() ? "женский" : "мужской"}</td>
+                    <td>{$x->isFemale() ? tr("female") : tr("male")}</td>
                 </tr>
                 <tr>
                     <td><span class="nobold">{_"relationship"}:</span></td>
@@ -62,10 +62,10 @@
             {/if}
             <tr>
                 <td>
-                    <span class="nobold">Описание:</span>
+                    <span class="nobold">{_"description"}:</span>
                 </td>
                 <td>
-                    {$x->getDescription() ?? "(отсутствует)"}
+                    {$x->getDescription() ?? '(' . tr("none") . ')'}
                 </td>
             </tr>
         </tbody>

Web/Presenters/templates/User/Edit.xml

@@ -65,7 +65,7 @@
                     {if OPENVK_ROOT_CONF['openvk']['credentials']['zadarma']['enable']}
                     <tr>
                         <td width="120" valign="top">
-                            <span class="nobold">Телефон: </span>
+                            <span class="nobold">{_"phone"}: </span>
                         </td>
                         <td>
                             <input type="phone" name="phone" value="{$user->getPhone()}" />
@@ -132,7 +132,7 @@
                     </tr>
                     <tr>
                         <td width="120" valign="top">
-                             <span class="nobold">День рождения: </span>    
+                             <span class="nobold">{_"birth_date"}: </span>
                         </td>
                         <td>
                          <input max={date('Y-m-d')} name="birthday" value={gmdate("Y-m-d", $user->getBirthday())} type="date"/>

Web/Presenters/templates/Wall/Feed.xml

@@ -7,7 +7,7 @@
     <div n:if="!isset($globalFeed)" style="float: right;">
         <span>
             <b>
-                <a href="/feed/all">Все новости</a>
+                <a href="/feed/all">{_"all_news"}</a>
             </b>
         </span>
     </div>
@@ -29,7 +29,7 @@
                 <input type="submit" value="{_'write'}" class="button" />
                 <div style="float: right;">
                     <a href="javascript:void(document.querySelector(`input[name=_pic_attachment]`).click());">
-                        Прикрепить изображение
+                        {_"attach_photo"}
                     </a>
                 </div>
             </form>
@@ -45,7 +45,7 @@
         {/foreach}
         {include "../components/paginator.xml", conf => $paginatorConf}
         <br/>
-        Количество постов на странице:
+        {_"posts_per_page"}:
         <select id="pageSelect">
             <option value="1">1</option>
             <option value="5">5</option>

Web/Presenters/templates/components/attachment.xml

@@ -4,19 +4,19 @@
             <img class="media" src="{$attachment->getURL()}" alt="{$attachment->getDescription()}" />
         </a>
     {else}
-        <a href="javascript:alert('Это вложение более недоступно');">
-            <img class="media" src="/assets/packages/static/openvk/img/camera_200.png" alt="Фотография недоступна" />
+        <a href="javascript:alert('{_"attach_no_longer_available"}');">
+            <img class="media" src="/assets/packages/static/openvk/img/camera_200.png" alt="{_"attach_no_longer_available"}" />
         </a>
     {/if}
 {elseif $attachment instanceof \openvk\Web\Models\Entities\Post}
     {php $GLOBALS["_nesAttGloCou"] = (isset($GLOBALS["_nesAttGloCou"]) ? $GLOBALS["_nesAttGloCou"] : 0) + 1}
     {if $GLOBALS["_nesAttGloCou"] > 2}
-        <a href="/wall{$attachment->getPrettyId()}">Смотреть запись</a>
+        <a href="/wall{$attachment->getPrettyId()}">{_"open_post"}</a>
     {else}
         {include "post.xml", post => $attachment, compact => true}
     {/if}
 {else}
-    <span style="color:red;">Не удалось отобразить это вложение. Возможно, БД несовместима с этой версией OpenVK.</span>
+    <span style="color:red;">{_"version_incompatibility"}</span>
 {/if}
 
 {php $GLOBALS["_nesAttGloCou"] = NULL}

Web/Presenters/templates/components/comments.xml

@@ -24,7 +24,7 @@
     {elseif $model === "videos"}
         <p>Будьте первым, кто оставит комментарий к этой видеозаписи</p>
     {else}
-        <p>Будьте первым кто оставит комментарий к этой хуйне!</p>
+        <p>Будьте первым кто оставит комментарий к этой дичи!</p>
     {/if} -->
     {_"comments_tip"}
 {/if}

Web/Presenters/templates/components/paginator.xml

@@ -1,5 +1,5 @@
 <div n:if="!($conf->page === 1 && $conf->count <= $conf->perPage)" class="paginator">
-    <hr/>
+    <br/>
     <center>
         <a n:if="$conf->page != 1"
            href="?{http_build_query(array_merge($_GET, ['p' => ($conf->page - 1)]), 'k', '&', PHP_QUERY_RFC3986)}"

Web/Presenters/templates/components/wall.xml

@@ -16,7 +16,7 @@
                     </div>
                     <div id="post-buttons" style="display: none;">
                         <div class="post-upload">
-                            Вложение: <span>(unknown)</span>
+                            {_"attachment"}: <span>(unknown)</span>
                         </div>
                         <div class="post-opts">
                             {if !is_null($thisUser) && $owner < 0 && $club->canBeModifiedBy($thisUser)}
@@ -28,15 +28,15 @@
                                 </script>
                                 
                                 <label>
-                                    <input type="checkbox" name="as_group" onchange="onWallAsGroupClick(this)" /> От имени сообщества
+                                    <input type="checkbox" name="as_group" onchange="onWallAsGroupClick(this)" /> {_"post_as_group"}
                                 </label>
                                 <label id="forceSignOpt" style="display: none;">
-                                    <input type="checkbox" name="force_sign" /> Подпись автора
+                                    <input type="checkbox" name="force_sign" /> {_"add_signature"}
                                 </label>
                             {/if}
                             
                             <label>
-                                <input type="checkbox" name="nsfw" /> Содержит NSFW-контент
+                                <input type="checkbox" name="nsfw" /> {_"contains_nsfw"}
                             </label>
                         </div>
                         <input type="file" name="_pic_attachment" accept="image/*" style="display:none;" />

locales/de.strings

@@ -254,7 +254,7 @@
 "main" = "Hauptseite";
 "contacts" = "Kontakte";
 "avatar" = "Avatar";
-"privacy" = "privatsphäre";
+"privacy" = "Privatsphäre";
 "interface" = "oberfläche";
 
 "profile_picture" = "Profilbild";

locales/en.strings

@@ -12,6 +12,7 @@
 "log_in" = "Log in";
 "password" = "Password";
 "registration" = "Registration";
+"forgot_password" = "Forgot your password?";
 
 /* Profile information */
 
@@ -46,6 +47,7 @@
 "status" = "Status";
 "no_information_provided" = "No information provided.";
 "deceased_person" = "Deceased person";
+"none" = "none";
 
 "relationship" = "Relationship";
 
@@ -114,10 +116,21 @@
 "feed" = "News";
 "publish_post" = "Add post";
 
+"all_news" = "All news";
+"posts_per_page" = "Number of posts per page";
+
+"attachment" = "Attachment";
+"post_as_group" = "Post as group";
+"add_signature" = "Add signature";
+/* ^ can be translated as "author's signature". ^ */
+"contains_nsfw" = "Contains NSFW content";
 "nsfw_warning" = "This post may have NSFW-content";
 "report" = "Report";
 "attach_photo" = "Attach photo";
 "no_posts_abstract" = "Nobody wrote anything here... At least.";
+"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.";
 
 /* Friends */
 
@@ -261,7 +274,7 @@
 "main" = "Main";
 "contacts" = "Contacts";
 "avatar" = "Avatar";
-"privacy" = "privacy";
+"privacy" = "Privacy";
 "interface" = "Interface";
 
 "profile_picture" = "Profile picture";
@@ -283,6 +296,10 @@
 "search_for_groups" = "Search for groups";
 "search_for_people" = "Search for people";
 "search_button" = "Find";
+"results_zero" = "No results";
+"results_one" = "$1 result";
+"results_other" = "$1 results";
+
 "privacy_setting_access_page" = "Who can view my page";
 "privacy_setting_read_info" = "Who can see main information of my page";
 "privacy_setting_see_groups" = "Who can see my groups and meetings";

locales/ru.strings

@@ -13,6 +13,7 @@
 "log_in" = "Вход";
 "password" = "Пароль";
 "registration" = "Регистрация";
+"forgot_password" = "Забыли пароль?";
 
 /* Profile information */
 
@@ -43,6 +44,7 @@
 "status" = "Статус";
 "no_information_provided" = "Информация отсутствует.";
 "deceased_person" = "Страница покойного человека";
+"none" = "отсутствует";
 "years" = "лет";
 
 "relationship" = "Семейное положение";
@@ -113,10 +115,20 @@
 "wall_many" = "$1 записей";
 "wall_other" = "$1 записей";
 
+"all_news" = "Все новости";
+"posts_per_page" = "Количество записей на странице";
+
+"attachment" = "Вложение";
+"post_as_group" = "От имени сообщества";
+"add_signature" = "Подпись автора";
+"contains_nsfw" = "Содержит NSFW-контент";
 "nsfw_warning" = "Данный пост может содержать 18+ контент";
 "report" = "Пожаловаться";
 "attach_photo" = "Прикрепить фото";
 "no_posts_abstract" = "Здесь никто ничего не написал... Пока.";
+"attach_no_longer_available" = "Это вложение больше недоступно.";
+"open_post" = "Открыть запись";
+"version_incompatibility" = "Не удалось отобразить это вложение. Возможно, база данных несовместима с текущей версией OpenVK.";
 
 /* Friends */
 
@@ -264,9 +276,8 @@
 "header_log_out" = "выйти";
 "header_search" = "Поиск";
 
-"header_login" = "Вход";
-"header_registration" = "Регистрация";
-"header_help" = "Помощь";
+"header_login" = "вход";
+"header_registration" = "регистрация";
 
 "footer_blog" = "блог";
 "footer_help" = "помощь";
@@ -307,6 +318,12 @@
 "search_for_groups" = "Поиск групп";
 "search_for_people" = "Поиск людей";
 "search_button" = "Найти";
+"results_zero" = "Ни одного результата";
+"results_one" = "Один результат";
+"results_few" = "$1 результата";
+"results_many" = "$1 результатов";
+"results_other" = "$1 результатов";
+
 "privacy_setting_access_page" = "Кому в интернете видно мою страницу";
 "privacy_setting_read_info" = "Кому видно основную информацию моей страницы";
 "privacy_setting_see_groups" = "Кому видно мои группы и встречи";