4

мб пофиксит 842 янеипу

.gitignore

@@ -14,3 +14,5 @@ themepacks/*
 !themepacks/midnight
 storage/*
 !storage/.gitkeep
+
+.idea

Web/Models/Entities/Photo.php

@@ -283,6 +283,14 @@ class Photo extends Media
         return [$x, $y];
     }
 
+    function getPageURL(): string
+    {
+        if($this->isAnonymous())
+            return "/photos/" . base_convert((string) $this->getId(), 10, 32);
+
+        return "/photo" . $this->getPrettyId();
+    }
+
     function getAlbum(): ?Album
     {
         return (new Albums)->getAlbumByPhotoId($this);

Web/Presenters/templates/components/attachment.xml

@@ -1,7 +1,6 @@
 {if $attachment instanceof \openvk\Web\Models\Entities\Photo}
     {if !$attachment->isDeleted()}
-        {var $link = "/photo" . ($attachment->isAnonymous() ? ("s/" . base_convert((string) $attachment->getId(), 10, 32)) : $attachment->getPrettyId())}
+        <a href="{$attachment->getPageUrl()}">
-        <a href="{$link}">
             <img class="media" src="{$attachment->getURLBySizeId('normal')}" alt="{$attachment->getDescription()}" />
         </a>
     {else}

Web/Presenters/templates/components/notifications/4/_18_13_.xml

@@ -1,4 +1,4 @@
 {var $user = $notification->getModel(0)}
 {var $post = $notification->getModel(1)}
 
-{_nt_you_were_mentioned_u} <a href="{$user->getURL()}"><b>{$user->getCanonicalName()}</b></a> {$notification->getDateTime()} <a href="/photo{$post->getURL()}"><b>{_nt_mention_in_photo}</b></a>: "{$notification->getData()}"
+{_nt_you_were_mentioned_u} <a href="{$user->getURL()}"><b>{$user->getCanonicalName()}</b></a> {$notification->getDateTime()} <a href="/photo{$post->getPageURL()}"><b>{_nt_mention_in_photo}</b></a>: "{$notification->getData()}"

locales/en.strings

@@ -1,5 +1,5 @@
 "__locale" = "en_US.UTF-8;Eng";
-"__transNames" = "Russian-Latin/BGN; Any-Latin";
+"__transNames" = "[\P{script=Han}]; Russian-Latin/BGN; Any-Latin";
 
 /* Check for https://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html */