Global: Correct the components code

НЛО прилетело и опубликовало эту надпись здесь

Web/Presenters/templates/components/attachment.xml

@@ -5,8 +5,8 @@
             <img class="media" src="{$attachment->getURL()}" alt="{$attachment->getDescription()}" />
         </a>
     {else}
-        <a href="javascript:alert('{_"attach_no_longer_available"}');">
+        <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"}" />
+            <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\Video}
@@ -14,12 +14,12 @@
 {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()}">{_"open_post"}</a>
+        <a href="/wall{$attachment->getPrettyId()}">{_open_post}</a>
     {else}
         {include "post.xml", post => $attachment, compact => true}
     {/if}
 {else}
-    <span style="color:red;">{_"version_incompatibility"}</span>
+    <span style="color:red;">{_version_incompatibility}</span>
 {/if}
 
 {php $GLOBALS["_nesAttGloCou"] = NULL}

Web/Presenters/templates/components/comment.xml

@@ -8,10 +8,7 @@
         <tr>
             <td width="30" valign="top">
                 <a href="{$author->getURL()}">
-                    <img
+                    <img src="{$author->getAvatarURL()}" width="30" class="cCompactAvatars" />
-                        src="{$author->getAvatarURL()}"
-                        width="30"
-                        class="cCompactAvatars" />
                 </a>
             </td>
             <td width="100%" valign="top">
@@ -19,7 +16,7 @@
                     <a href="{$author->getURL()}"><b>
                         {$author->getCanonicalName()}
                     </b></a>
-                    {if $author->isVerified()}<img class="name-checkmark" src="/assets/packages/static/openvk/img/checkmark.png">{/if}<br/>
+                    <img n:if="$author->isVerified()" class="name-checkmark" src="/assets/packages/static/openvk/img/checkmark.png"><br/>
                 </div>
                 <div class="post-content" id="{$comment->getId()}">
                     <div class="text" id="text{$comment->getId()}">
@@ -34,9 +31,9 @@
                     <div n:if="isset($thisUser) &&! ($compact ?? false)" class="post-menu">
                         <a href="#_comment{$comment->getId()}" class="date">{$comment->getPublicationTime()}</a>&nbsp;|
                         {if $comment->canBeDeletedBy($thisUser)}
-                            <a href="/comment{$comment->getId()}/delete">{_"delete"}</a>&nbsp;|
+                            <a href="/comment{$comment->getId()}/delete">{_delete}</a>&nbsp;|
                         {/if}
-                        <a class="comment-reply">{_"reply"}</a>
+                        <a class="comment-reply">{_reply}</a>
                         <div style="float: right; font-size: .7rem;">
                             <a class="post-like-button" href="/comment{$comment->getId()}/like?hash={rawurlencode($csrfToken)}">
                                 <div class="heart" style="{if $comment->hasLikeFrom($thisUser)}opacity: 1;{else}opacity: 0.4;{/if}"></div>
@@ -45,7 +42,6 @@
                         </div>
                     </div>
                 </div>
-                
             </td>
         </tr>
     </tbody>

Web/Presenters/templates/components/comments.xml

@@ -1,4 +1,4 @@
-<h4 n:if="$showTitle ?? true">{_"comments"} ({$count})</h4>
+<h4 n:if="$showTitle ?? true">{_comments} ({$count})</h4>
 
 <div n:ifset="$thisUser">
     {var commentsURL = "/al_comments/create/$model/" . $parent->getId()}
@@ -27,7 +27,7 @@
     {else}
         <p>Будьте первым кто оставит комментарий к этой дичи!</p>
     {/if} -->
-    {_"comments_tip"}
+    {_comments_tip}
 {/if}
 
 {script "js/al_comments.js"}

Web/Presenters/templates/components/paginator.xml

@@ -3,16 +3,10 @@
 
 <div n:if="!($conf->page === 1 && $conf->count <= $conf->perPage)" style="padding: 8px;">
     <div n:class="paginator, ($conf->atBottom ?? false) ? paginator-at-bottom">
-        {if $conf->page > $space}
+        <a n:if="$conf->page > $space" n:attr="class => ($conf->page === 1 ? 'active')" href="?{http_build_query(array_merge($_GET, ['p' => 1]), 'k', '&', PHP_QUERY_RFC3986)}">&laquo;</a>
-            <a n:attr="class => ($conf->page === 1 ? 'active')" href="?{http_build_query(array_merge($_GET, ['p' => 1]), 'k', '&', PHP_QUERY_RFC3986)}">«</a>
-        {/if}
         {for $j = $conf->page - ($space-1); $j <= $conf->page + ($space-1); $j++}
-            {if $j > 0 && $j <= $pageCount}
+            <a n:if="$j > 0 && $j <= $pageCount" n:attr="class => ($conf->page === $j ? 'active')" href="?{http_build_query(array_merge($_GET, ['p' => $j]), 'k', '&', PHP_QUERY_RFC3986)}">{$j}</a>
-                <a n:attr="class => ($conf->page === $j ? 'active')" href="?{http_build_query(array_merge($_GET, ['p' => $j]), 'k', '&', PHP_QUERY_RFC3986)}">{$j}</a>
-            {/if}
         {/for}
-        {if $conf->page <= $pageCount-$space}
+        <a n:if="$conf->page <= $pageCount-$space" n:attr="class => ($conf->page === $pageCount ? 'active')" href="?{http_build_query(array_merge($_GET, ['p' => $pageCount]), 'k', '&', PHP_QUERY_RFC3986)}">&raquo;</a>
-            <a n:attr="class => ($conf->page === $pageCount ? 'active')" href="?{http_build_query(array_merge($_GET, ['p' => $pageCount]), 'k', '&', PHP_QUERY_RFC3986)}">»</a>
-        {/if}
     </div>
 </div>

Web/Presenters/templates/components/post.xml

@@ -1,9 +1,4 @@
 {var microblogEnabled = isset($thisUser) ? $thisUser->hasMicroblogEnabled() : false}
-{if !$post->isPostedOnBehalfOfGroup()}
-    {var then = date_create("@" . $post->getOwner()->getOnline()->timestamp())}
-    {var now = date_create()}
-    {var diff = date_diff($now, $then)}
-{/if}
 
 {if $microblogEnabled}
     {include "post/microblogpost.xml", post => $post, diff => $diff, commentSection => $commentSection}

Web/Presenters/templates/components/post/microblogpost.xml

@@ -9,25 +9,14 @@
         <tr>
             <td width="54" valign="top">
                 <a href="{$author->getURL()}">
-                    <img
+                    <img src="{$author->getAvatarURL()}" width="{ifset $compact}25{else}50{/ifset}" {ifset $compact}class="cCompactAvatars"{/ifset} />
-                        src="{$author->getAvatarURL()}"
+                    <span n:if="!$post->isPostedOnBehalfOfGroup() && !$compact && $author->isOnline()" class="post-online">{_online}</span>
-                        width="{ifset $compact}25{else}50{/ifset}" 
-                        {ifset $compact}class="cCompactAvatars"{/ifset} />
-                            {if !$post->isPostedOnBehalfOfGroup() && !$compact}
-                                <span n:if="$author->isOnline()" class="post-online">
-                                    {_online}
-                                </span>
-                    {/if}
                 </a>
             </td>
             <td width="100%" valign="top">
                 <div class="post-author">
-                    <a href="{$author->getURL()}">
+                    <a href="{$author->getURL()}"><b>{$author->getCanonicalName()}</b></a>
-                        <b>
+                    <img n:if="$author->isVerified()" class="name-checkmark" src="/assets/packages/static/openvk/img/checkmark.png">
-                            {$author->getCanonicalName()}
-                        </b>
-                    </a>
-                    {if $author->isVerified()}<img class="name-checkmark" src="/assets/packages/static/openvk/img/checkmark.png">{/if}
                     {if ($onWallOf ?? false) &&!$post->isPostedOnBehalfOfGroup() && $post->getOwnerPost() !== $post->getTargetWall()}
                         {var wallId  = $post->getTargetWall()}
                         {var wallURL = $wallId > -1 ? "/id$wallId" : "/club" . abs($wallId)}
@@ -44,18 +33,17 @@
                             </b>
                         </a>
                     {/if}
-                    {ifset $compact}<br>
-                    <a href="/wall{$post->getPrettyId()}" class="date">
-                        {$post->getPublicationTime()}
-                    </a>
 
+                    {ifset $compact}
+                        <br>
+                        <a href="/wall{$post->getPrettyId()}" class="date">
+                            {$post->getPublicationTime()}
+                        </a>
                     {/ifset}
-                    {if $post->isPinned()}
+
-                        <span class="nobold">{_pinned}</span>
+                    <span n:if="$post->isPinned()" class="nobold">{_pinned}</span>
-                    {/if}
+
-                    {if $post->canBeDeletedBy($thisUser) && !($forceNoDeleteLink ?? false) && !isset($compact)}
+                    <a n:if="$post->canBeDeletedBy($thisUser) && !($forceNoDeleteLink ?? false) && !isset($compact)" class="delete" href="/wall{$post->getPrettyId()}/delete"></a>
-                        <a class="delete" href="/wall{$post->getPrettyId()}/delete"></a>
-                    {/if}
                     
                     {if $post->canBePinnedBy($thisUser) && !($forceNoPinLink ?? false) && !isset($compact)}
                         {if $post->isPinned()}
@@ -80,11 +68,11 @@
                         &nbsp;! Этот пост был размещён за взятку.
                     </div>
                     <div n:if="$post->isSigned()" class="post-signature">
-                        {var acutalAuthor = $post->getOwner(false)}
+                        {var actualAuthor = $post->getOwner(false)}
                         <span>
-                            Автор:
+                            {_author}:
-                            <a href="{$acutalAuthor->getURL()}">
+                            <a href="{$actualAuthor->getURL()}">
-                               {$acutalAuthor->getCanonicalName()}
+                               {$actualAuthor->getCanonicalName()}
                             </a>
                         </span>
                     </div>
@@ -94,26 +82,17 @@
                     {if isset($thisUser)}
                         &nbsp;
                         
-                        {if !($forceNoCommentsLink ?? false)}
+                        <a n:if="!($forceNoCommentsLink ?? false) && $commentsCount == 0" href="javascript:expand_comment_textarea({$commentTextAreaId})">{_comment}</a>
-                            <a n:if="$commentsCount == 0" href="javascript:expand_comment_textarea({$commentTextAreaId})">
-                                {_"comment"}
-                            </a>
-                        {/if}
                         
                         <div class="like_wrap">
-                            {if !($forceNoShareLink ?? false)}
+                            <a n:if="!($forceNoShareLink ?? false)" class="post-share-button" href="javascript:repostPost('{$post->getPrettyId()}', '{rawurlencode($csrfToken)}')">
-                                <a class="post-share-button" href="javascript:repostPost('{$post->getPrettyId()}', '{rawurlencode($csrfToken)}')">
+                                <div class="repost-icon" style="opacity: 0.4;"></div>
-                                    <div class="repost-icon" style="opacity: 0.4;"></div>
+                                <span class="likeCnt">{if $post->getRepostCount() > 0}{$post->getRepostCount()}{/if}</span>
-                                    <span class="likeCnt">{if $post->getRepostCount() > 0}{$post->getRepostCount()}{/if}</span>
+                            </a>
-                                </a>
-                            {/if}
 
                             {if !($forceNoLike ?? false)}
                                 {var liked = $post->hasLikeFrom($thisUser)}
-                                <a href="/wall{$post->getPrettyId()}/like?hash={rawurlencode($csrfToken)}"
+                                <a href="/wall{$post->getPrettyId()}/like?hash={rawurlencode($csrfToken)}" class="post-like-button" data-liked="{(int) $liked}" data-likes="{$post->getLikesCount()}">
-                                class="post-like-button"
-                                        data-liked="{(int) $liked}"
-                                        data-likes="{$post->getLikesCount()}">
                                     <div class="heart" id="{if $liked}liked{/if}"></div>
                                     <span class="likeCnt">{if $post->getLikesCount() > 0}{$post->getLikesCount()}{/if}</span>
                                 </a>
@@ -121,21 +100,17 @@
                         </div>
                     {/if}
                 </div>
-                {if !($forceNoCommentsLink ?? false)}
+                <div n:if="!($forceNoCommentsLink ?? false) && $commentSection == true && $compact == false" class="post-menu-s">
-                    <div n:if="$commentSection == true && $compact == false" class="post-menu-s">
+                    <a n:if="$commentsCount > 3" href="/wall{$post->getPrettyId()}" class="expand_button">{_view_other_comments}</a>
-                        {if $commentsCount > 3}
+                    {foreach $comments as $comment}
-                            <a href="/wall{$post->getPrettyId()}" class="expand_button">{_view_other_comments}</a>
+                        {include "../comment.xml", comment => $comment, $compact => true}
-                        {/if}
+                    {/foreach}
-                        {foreach $comments as $comment}
+                    <div n:ifset="$thisUser" id="commentTextArea{$commentTextAreaId}" n:attr="style => ($commentsCount == 0 ? 'display: none;')" class="commentsTextFieldWrap">
-                            {include "../comment.xml", comment => $comment, $compact => true}
+                        {var commentsURL = "/al_comments/create/posts/" . $post->getId()}
-                        {/foreach}
+                        {var club = is_null($club) ? ($post->getTargetWall() < 0 ? (new openvk\Web\Models\Repositories\Clubs)->get(abs($post->getTargetWall())) : NULL) : $club}
-                        <div n:ifset="$thisUser" id="commentTextArea{$commentTextAreaId}" n:attr="style => ($commentsCount == 0 ? 'display: none;')" class="commentsTextFieldWrap">
+                        {include "../textArea.xml", route => $commentsURL, postOpts => false, graffiti => (bool) ovkGetQuirk("comments.allow-graffiti"), post => $post, club => $club}
-                            {var commentsURL = "/al_comments/create/posts/" . $post->getId()}
-                            {var club = is_null($club) ? ($post->getTargetWall() < 0 ? (new openvk\Web\Models\Repositories\Clubs)->get(abs($post->getTargetWall())) : NULL) : $club}
-                            {include "../textArea.xml", route => $commentsURL, postOpts => false, graffiti => (bool) ovkGetQuirk("comments.allow-graffiti"), post => $post, club => $club}
-                        </div>
                     </div>
-                {/if}
+                </div>
             </td>
         </tr>
     </tbody>

Web/Presenters/templates/components/post/oldpost.xml

@@ -5,26 +5,15 @@
         <tr>
             <td width="54" valign="top">
                 <a href="{$author->getURL()}">
-                    <img
+                    <img src="{$author->getAvatarURL()}" width="50" />
-                        src="{$author->getAvatarURL()}"
+                    <span n:if="!$post->isPostedOnBehalfOfGroup() && !($compact ?? false) && $author->isOnline()" class="post-online">{_online}</span>
-                        width="50" />
                 </a>
-                       {if !$post->isPostedOnBehalfOfGroup() && !($compact ?? false)}
-                            <span n:if="$author->isOnline()" class="post-online">
-                                {_online}
-                            </span>
-                        {/if}
-                
             </td>
             <td width="100%" valign="top">
                 <div class="post-author">
-                    <a href="{$author->getURL()}">
+                    <a href="{$author->getURL()}"><b>{$author->getCanonicalName()}</b></a>
-                        <b>
+                    <img n:if="$author->isVerified()" class="name-checkmark" src="/assets/packages/static/openvk/img/checkmark.png">
-                            {$author->getCanonicalName()}
+                    {$post->isPostedOnBehalfOfGroup() ? tr("post_writes_g") : ($author->isFemale() ? tr("post_writes_f") : tr("post_writes_m"))}
-                        </b>
-                    </a>
-                    {if $author->isVerified()}<img class="name-checkmark" src="/assets/packages/static/openvk/img/checkmark.png">{/if}
-                    {$post->isPostedOnBehalfOfGroup() ? "опубликовали" : ($author->isFemale() ? tr("post_writes_f") : tr("post_writes_m"))}
                     {if ($onWallOf ?? false) &&!$post->isPostedOnBehalfOfGroup() && $post->getOwnerPost() !== $post->getTargetWall()}
                         {var wallId  = $post->getTargetWall()}
                         {var wallURL = $wallId > -1 ? "/id$wallId" : "/club" . abs($wallId)}
@@ -43,10 +32,7 @@
                     {/if}
                     <br/>
                     <a href="/wall{$post->getPrettyId()}" class="date">
-                        {$post->getPublicationTime()}
+                        {$post->getPublicationTime()}{if $post->isPinned()}, {_pinned}{/if}
-                        {if $post->isPinned()}
-                        , {_pinned}
-                        {/if}
                     </a>
                 </div>
                 <div class="post-content" id="{$post->getPrettyId()}">
@@ -64,68 +50,54 @@
                         &nbsp;! Этот пост был размещён за взятку.
                     </div>
                     <div n:if="$post->isSigned()" class="post-signature">
-                        {var acutalAuthor = $post->getOwner(false)}
+                        {var actualAuthor = $post->getOwner(false)}
                         <span>
-                            Автор:
+                            {_author}:
-                            <a href="{$acutalAuthor->getURL()}">
+                            <a href="{$actualAuthor->getURL()}">
-                               {$acutalAuthor->getCanonicalName()}
+                               {$actualAuthor->getCanonicalName()}
                             </a>
                         </span>
                     </div>
                 </div>
                 <div n:if="isset($thisUser) &&! ($compact ?? false)" class="post-menu">
                     {if $post->canBeDeletedBy($thisUser) && !($forceNoDeleteLink ?? false)}
-                        <a href="/wall{$post->getPrettyId()}/delete">{_"delete"}</a>&nbsp;|&nbsp;
+                        <a href="/wall{$post->getPrettyId()}/delete">{_delete}</a> &nbsp;|&nbsp;
                     {/if}
                     
                     {if $post->canBePinnedBy($thisUser) && !($forceNoPinLink ?? false)}
                         {if $post->isPinned()}
-                            <a href="/wall{$post->getPrettyId()}/pin?act=unpin&hash={rawurlencode($csrfToken)}">{_unpin}</a>&nbsp;|&nbsp;
+                            <a href="/wall{$post->getPrettyId()}/pin?act=unpin&hash={rawurlencode($csrfToken)}">{_unpin}</a>
                         {else}
-                            <a href="/wall{$post->getPrettyId()}/pin?act=pin&hash={rawurlencode($csrfToken)}">{_pin}</a>&nbsp;|&nbsp;
+                            <a href="/wall{$post->getPrettyId()}/pin?act=pin&hash={rawurlencode($csrfToken)}">{_pin}</a>
                         {/if}
+                        &nbsp;|&nbsp;
                     {/if}
                     
-                    {if !($forceNoCommentsLink ?? false)}
+                    <a n:if="!($forceNoCommentsLink ?? false)" href="/wall{$post->getPrettyId()}#comments">
-                        <a href="/wall{$post->getPrettyId()}#comments">
+                        {_comments}
-                            {if $post->getCommentsCount() > 0}
+                        {if $post->getCommentsCount() > 0}
-                                {_"comments"} (<b>{$post->getCommentsCount()}</b>)
+                            (<b>{$post->getCommentsCount()}</b>)
-                            {else}
+                        {/if}
-                                {_"comments"}
+                    </a>
-                            {/if}
-                        </a>
-                    {/if}
 
                     {if !($forceNoCommentsLink ?? false) && !($forceNoShareLink ?? false)}
                         &nbsp;|&nbsp;
                     {/if}
                     
-                    {if !($forceNoShareLink ?? false)}
+                    <a n:if="!($forceNoShareLink ?? false)" class="post-share-button" href="javascript:repostPost('{$post->getPrettyId()}', '{rawurlencode($csrfToken)}')">
-                        <a class="post-share-button" href="javascript:repostPost('{$post->getPrettyId()}', '{rawurlencode($csrfToken)}')">
+                        {_share}
-                            {if $post->getRepostCount() > 0}
+                        {if $post->getRepostCount() > 0}
-                                {_"share"}
+                            (<b>{$post->getRepostCount()}</b>)
-                                (<b>{$post->getRepostCount()}</b>)
+                        {/if}
-                            {else}
+                    </a>
-                                {_"share"}
-                            {/if}
-                        </a>
-                    {/if}
 
-                    {if !($forceNoLike ?? false)}
+                    <div n:if="!($forceNoLike ?? false)" class="like_wrap">
-                        <div class="like_wrap">
+                        {var liked = $post->hasLikeFrom($thisUser)}
-                            {var liked = $post->hasLikeFrom($thisUser)}
+                        <a href="/wall{$post->getPrettyId()}/like?hash={rawurlencode($csrfToken)}" class="post-like-button" data-liked="{(int) $liked}" data-likes="{$post->getLikesCount()}">
-                            <a href="/wall{$post->getPrettyId()}/like?hash={rawurlencode($csrfToken)}"
+                            <div class="heart" id="{if $liked}liked{/if}"></div>
-                            class="post-like-button"
+                            <span class="likeCnt">{if $post->getLikesCount() > 0}{$post->getLikesCount()}{/if}</span>
-                                    data-liked="{(int) $liked}"
+                        </a>
-                                    data-likes="{$post->getLikesCount()}">
+                    </div>
-                                <div class="heart" id="{if $liked}liked{/if}"></div>
-                                <span class="likeCnt">{if $post->getLikesCount() > 0}{$post->getLikesCount()}{/if}</span>
-                            </a>
-                        </div>
-                    {/if}
-                </div>
-                <div n:if="isset($thisUser) &&! ($compact ?? false)" class="post-menu-s">
-                    <!-- kosfurler -->
                 </div>
             </td>
         </tr>

Web/Presenters/templates/components/textArea.xml

@@ -27,25 +27,25 @@
                         </script>
                         
                         <label>
-                            <input type="checkbox" name="as_group" onchange="onWallAsGroupClick(this)" /> {_"post_as_group"}
+                            <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" /> {_"add_signature"}
+                            <input type="checkbox" name="force_sign" /> {_add_signature}
                         </label>
                     {/if}
                 {/if}
                 
                 <label n:if="$anonEnabled" id="octoberAnonOpt">
-                    <input type="checkbox" name="anon" /> {_"as_anonymous"}
+                    <input type="checkbox" name="anon" /> {_as_anonymous}
                 </label>
                 
                 <label>
-                    <input type="checkbox" name="nsfw" /> {_"contains_nsfw"}
+                    <input type="checkbox" name="nsfw" /> {_contains_nsfw}
                 </label>
             </div>
             <div n:if="!($postOpts ?? true) && !is_null($thisUser) && !is_null($club ?? NULL) && $club->canBeModifiedBy($thisUser)" class="post-opts">
                 <label>
-                    <input type="checkbox" name="as_group" /> {_"comment_as_group"}
+                    <input type="checkbox" name="as_group" /> {_comment_as_group}
                 </label>
             </div>
             <input type="file" class="postFileSel" id="postFilePic" name="_pic_attachment" accept="image/*" style="display:none;" />
@@ -53,7 +53,7 @@
             <input type="hidden" name="type" value="1" />
             <input type="hidden" name="hash" value="{$csrfToken}" />
             <br/>
-            <input type="submit" value="{_'write'}" class="button" />
+            <input type="submit" value="{_write}" class="button" />
             <div style="float: right; display: flex; flex-direction: column;">
                 <a href="javascript:void(u('#post-buttons{$textAreaId} #wallAttachmentMenu').toggleClass('hidden'));">
                     {_attach}

Web/Presenters/templates/components/wall.xml

@@ -1,9 +1,9 @@
 <div class="content_divider">
     <div class="content_title_expanded" onclick="hidePanel(this);">
-        {_"wall"} 
+        {_wall} 
         <nobold>
-        {tr("wall", $count)}
+            {tr("wall", $count)}
-        <a href="/wall{$owner}" class="float-right lowercase">{_all_title}</a>
+            <a href="/wall{$owner}" class="float-right lowercase">{_all_title}</a>
         </nobold>
     </div>
     <div>