From 5fc6490b043f58d198c93f453b0cb3be7069f851 Mon Sep 17 00:00:00 2001
From: lalka2018 <99399973+lalka2016@users.noreply.github.com>
Date: Sat, 11 Nov 2023 16:55:13 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- В пикере аудиозаписей "more..." заменено на "показать больше аудиозаписей"
- Если включен режим показа оставшегося времени, то при окончании песни больше не показывается "--1:--1"
- В пикере аудиозаписей, если у вас нет аудиозаписей и вы ничего не искали, показывается "Вы ещё не добавляли аудиозаписей"
- <hr>'ы стали серыми
- Добавлены title'ы у кнопок в большом плеере
- Проставлены alt'ы у плейлистов
---
 Web/Presenters/templates/Audio/EditPlaylist.xml | 2 +-
 Web/Presenters/templates/Audio/List.xml         | 2 +-
 Web/Presenters/templates/Audio/NewPlaylist.xml  | 2 +-
 Web/Presenters/templates/Audio/bigplayer.xml    | 8 ++++----
 Web/static/css/main.css                         | 4 +++-
 Web/static/js/al_music.js                       | 6 ++++--
 locales/en.strings                              | 5 +++++
 locales/ru.strings                              | 5 +++++
 8 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/Web/Presenters/templates/Audio/EditPlaylist.xml b/Web/Presenters/templates/Audio/EditPlaylist.xml
index 32d43d92..50dfcc2a 100644
--- a/Web/Presenters/templates/Audio/EditPlaylist.xml
+++ b/Web/Presenters/templates/Audio/EditPlaylist.xml
@@ -16,7 +16,7 @@
     <div class="playlistBlock" style="display: flex;margin-top: 0px;">
         <div class="playlistCover">
             <a>
-                <img src="{$playlist->getCoverURL('normal')}">
+                <img src="{$playlist->getCoverURL('normal')}" alt="{_playlist_cover}">
             </a>
 
             <div class="profile_links" style="width: 139px;">
diff --git a/Web/Presenters/templates/Audio/List.xml b/Web/Presenters/templates/Audio/List.xml
index f270bdf6..ec24f3b3 100644
--- a/Web/Presenters/templates/Audio/List.xml
+++ b/Web/Presenters/templates/Audio/List.xml
@@ -93,7 +93,7 @@
                     <div class="infObj" n:foreach="$playlists as $playlist">
                         <a href="/playlist{$playlist->getPrettyId()}">
                             <div class="playlistCover">
-                                <img src="{$playlist->getCoverURL()}">
+                                <img src="{$playlist->getCoverURL()}" alt="{_playlist_cover}">
                             </div>
                         </a>
 
diff --git a/Web/Presenters/templates/Audio/NewPlaylist.xml b/Web/Presenters/templates/Audio/NewPlaylist.xml
index b7546749..42efae7f 100644
--- a/Web/Presenters/templates/Audio/NewPlaylist.xml
+++ b/Web/Presenters/templates/Audio/NewPlaylist.xml
@@ -33,7 +33,7 @@
     <div style="display:flex;">
         <div class="playlistCover" onclick="document.querySelector(`#newPlaylistForm input[name='cover']`).click()">
             <a>
-                <img src="/assets/packages/static/openvk/img/song.jpg">
+                <img src="/assets/packages/static/openvk/img/song.jpg" alt="{_playlist_cover}">
             </a>
         </div>
 
diff --git a/Web/Presenters/templates/Audio/bigplayer.xml b/Web/Presenters/templates/Audio/bigplayer.xml
index 7ec8a89f..7e8ffbe9 100644
--- a/Web/Presenters/templates/Audio/bigplayer.xml
+++ b/Web/Presenters/templates/Audio/bigplayer.xml
@@ -2,7 +2,7 @@
     <audio class="audio" />
     <div class="paddingLayer">
         <div class="playButtons">
-            <div class="playButton musicIcon"></div>
+            <div class="playButton musicIcon" title="{_play_tip} [Space]"></div>
                 
             <div class="arrowsButtons">
                 <div>
@@ -48,9 +48,9 @@
         </div>
 
         <div class="additionalButtons">
-            <div class="repeatButton musicIcon"></div>
-            <div class="shuffleButton musicIcon"></div>
-            <div class="deviceButton musicIcon"></div>
+            <div class="repeatButton musicIcon" title="{_repeat_tip} [R]" ></div>
+            <div class="shuffleButton musicIcon" title="{_shuffle_tip}"></div>
+            <div class="deviceButton musicIcon" title="{_mute_tip} [M]"></div>
         </div>
     </div>
 </div>
diff --git a/Web/static/css/main.css b/Web/static/css/main.css
index 4dd38356..7a087705 100644
--- a/Web/static/css/main.css
+++ b/Web/static/css/main.css
@@ -2974,7 +2974,9 @@ body.article .floating_sidebar, body.article .page_content {
 }
 
 hr {
-    color: #d0cdcd;
+    background-color: #d8d8d8;
+    border: none;
+    height: 1px;
 }
 
 .searchList hr {
diff --git a/Web/static/js/al_music.js b/Web/static/js/al_music.js
index 5adb037e..fbbe7c82 100644
--- a/Web/static/js/al_music.js
+++ b/Web/static/js/al_music.js
@@ -12,6 +12,8 @@ function fastError(message) {
 function getElapsedTime(fullTime, time) {
     let timer = fullTime - time
 
+    if(timer < 0) return "-00:00"
+
     return "-" + fmtTime(timer)
 }
 
@@ -1187,7 +1189,7 @@ $(document).on("click", "#_audioAttachment", (e) => {
         let count = Number(result.querySelector("input[name='count']").value)
 
         if(count < 1) {
-            document.querySelector(".audiosInsert").innerHTML = tr("no_results")
+            document.querySelector(".audiosInsert").innerHTML = thisc.context_type == "entity_audios" ? tr("no_audios_thisuser") : tr("no_results")
             return
         }
 
@@ -1210,7 +1212,7 @@ $(document).on("click", "#_audioAttachment", (e) => {
         if(thisc.page < pagesCount) {
             document.querySelector(".audiosInsert").insertAdjacentHTML("beforeend", `
             <div id="showMoreAudios" data-pagesCount="${pagesCount}" data-page="${thisc.page + 1}" class="showMore">
-                <span>more...</span>
+                <span>${tr("show_more_audios")}</span>
             </div>`)
         }
     }
diff --git a/locales/en.strings b/locales/en.strings
index be6ec594..7fbe255e 100644
--- a/locales/en.strings
+++ b/locales/en.strings
@@ -837,6 +837,11 @@
 "audios_group" = "Audios from group";
 "playlists_group" = "Playlists from group";
 
+"play_tip" = "Play/pause";
+"repeat_tip" = "Repeat";
+"shuffle_tip" = "Shuffle";
+"mute_tip" = "Mute";
+
 /* Notifications */
 
 "feedback" = "Feedback";
diff --git a/locales/ru.strings b/locales/ru.strings
index 49855f82..63f40462 100644
--- a/locales/ru.strings
+++ b/locales/ru.strings
@@ -791,6 +791,11 @@
 "audios_group" = "Аудиозаписи группы";
 "playlists_group" = "Плейлисты группы";
 
+"play_tip" = "Проигрывание/пауза";
+"repeat_tip" = "Повторение";
+"shuffle_tip" = "Перемешать";
+"mute_tip" = "Заглушить";
+
 /* Notifications */
 
 "feedback" = "Ответы";