diff --git a/.github/ISSUE_TEMPLATE/installer-new-translation.yml b/.github/ISSUE_TEMPLATE/installer-new-translation.yml index 36f8a4c..4e8405a 100644 --- a/.github/ISSUE_TEMPLATE/installer-new-translation.yml +++ b/.github/ISSUE_TEMPLATE/installer-new-translation.yml @@ -42,30 +42,30 @@ body: Download5 = "Downloading Spotify" StopScript = "Script is stopped" MsSpoti = "The Microsoft Store version of Spotify has been detected which is not supported" - MsSpoti2 = "Uninstall Spotify Microsoft Store edition [Y/N]" + MsSpoti2 = "Uninstall Spotify Microsoft Store edition ? [Y/N]" MsSpoti3 = "Automatically uninstalling Spotify MS..." MsSpoti4 = "Uninstalling Spotify MS..." Prem = "Modification for premium account..." OldV = "Found outdated version of Spotify" - OldV2 = "Your Spotify {0} version is outdated, it is recommended to upgrade to {1}" + OldV2 = "Your Spotify version ({0}) is outdated, the current latest version is — {1}" OldV3 = "Want to update ? [Y/N]" AutoUpd = "Automatic update to the recommended version" - DelOrOver = "Do you want to uninstall the current version of {0} or install over it? Y [Uninstall] / N [Install Over]" + DelOrOver = "Remove the current version ({0}) or install over it? Y [Remove] / N [Install Over]" DelOld = "Uninstalling old Spotify..." NewV = "Unsupported version of Spotify found" - NewV2 = "Your Spotify {0} version hasn't been tested yet, currently it's a stable {1} version" - NewV3 = "Do you want to continue with {0} version (errors possible) ? [Y/N]" - Recom = "Do you want to install the recommended {0} version ? [Y/N]" + NewV2 = "Your Spotify version ({0}) has not been tested. The stable version for SpotX is {1}" + NewV3 = "Continue with {0} (errors may occur) ? [Y/N]" + Recom = "Install the latest version {0} ? [Y/N]" DelNew = "Uninstalling an untested Spotify..." DownSpoti = "Downloading and installing Spotify" DownSpoti2 = "Please wait..." PodcatsOff = "Off Podcasts" PodcastsOn = "On Podcasts" - PodcatsSelect = "Do you want to disable podcasts, episodes and audiobooks from the main page? [Y/N]" + PodcatsSelect = "Hide podcasts, shows, and audiobooks on the homepage ? [Y/N]" DowngradeNote = "It is recommended to block because Spotify was downgraded" UpdBlock = "Spotify updates blocked" UpdUnblock = "Spotify updates are not blocked" - UpdSelect = "Want to block Spotify updates? [Y/N]" + UpdSelect = "Block Spotify updates ? [Y/N]" ModSpoti = "Patching Spotify..." Error = "Error" FileLocBroken = "Location of Spotify files is broken, uninstall Spotify client and run the script again" diff --git a/js-helper/sectionBlock.js b/js-helper/sectionBlock.js index 38383ff..59f5186 100644 --- a/js-helper/sectionBlock.js +++ b/js-helper/sectionBlock.js @@ -1,18 +1,5 @@ function sectionBlock(e, type) { - -// block subfeeds - if (type === "podcast" || type === "all") { - const style = document.createElement("style"); - style.innerHTML = ` - .cj6vRk3nFAi80HSVqX91, - .zbU90jX5VWUhVlpUda7B { - display: none !important; - } - `; - document.body.appendChild(style); - } - const body = e?.data?.home; const sections = body?.sectionContainer?.sections?.items; diff --git a/patches/Augmented translation/ru.json b/patches/Augmented translation/ru.json index d57c197..3b52e4e 100644 --- a/patches/Augmented translation/ru.json +++ b/patches/Augmented translation/ru.json @@ -1,11 +1,11 @@ { "lang": { - "version": "1.2.44", + "version": "1.2.55", "language": "Russian" }, "1": { - "match": "\"The Stage Experience\"", - "replace": "\"Сценический опыт\"" + "match": "\"Spacious\"", + "replace": "\"Просторный\"" }, "2": { "match": "\"Confirm your age\"", @@ -124,12 +124,12 @@ "replace": "Динамическое управление громкостью для подкастов - активное поддержание оптимального уровня громкости подкаста для четкого и сбалансированного звукового восприятия" }, "31": { - "match": "Prerelease Radar", - "replace": "Пререлизный радар" + "match": "\"All genres\"", + "replace": "\"Все жанры\"" }, "32": { - "match": "\"Your destination for upcoming albums curated for you.\"", - "replace": "\"Место назначения для предстоящих альбомов, подобранных специально для вас.\"" + "match": "\"Clear\"", + "replace": "\"Очистить\"" }, "33": { "match": "\"Build .0. is available\"", @@ -152,12 +152,12 @@ "replace": "\"Особенности\"" }, "38": { - "match": "\"prev-related-video\"", - "replace": "\"предыдущее связанное видео\"" + "match": "\"Done\"", + "replace": "\"Готово\"" }, "39": { - "match": "\"next-related-video\"", - "replace": "\"следующее связанное видео\"" + "match": "\"Expand playing view\"", + "replace": "\"Развернуть\"" }, "40": { "match": "\"Do not translate\"", @@ -180,8 +180,8 @@ "replace": "\"мини-плеер Spotify\"" }, "45": { - "match": "\"Date\"", - "replace": "\"Дата\"" + "match": "\"Show artwork\"", + "replace": "\"Показать обложку\"" }, "46": { "match": "\"Venue\"", @@ -232,11 +232,39 @@ "replace": "\"все время указано по месту проведения\"" }, "58": { - "match": "\"Presale access\"", - "replace": "\"Предварительный доступ\"" + "match": "\"Show artist image\"", + "replace": "\"Показать фото артиста\"" }, "59": { - "match": "\"We.ve ran out of codes. Visit our ticketing partner for more information\"", - "replace": "\"У нас закончились коды. Посетите нашего партнера по продаже билетов для получения дополнительной информации\"" + "match": "\"Exit full screen\"", + "replace": "\"Выйти из полноэкранного режима\"" + }, + "60": { + "match": "\"Enter Full screen\"", + "replace": "\"Развернуть на весь экран\"" + }, + "61": { + "match": "\"Spotify Spotlight Presale\"", + "replace": "\"Предпродажа Spotify Spotlight\"" + }, + "62": { + "match": "\"Get access\"", + "replace": "\"Получить доступ\"" + }, + "63": { + "match": "\"Continue playing\"", + "replace": "\"Продолжить воспроизведение\"" + }, + "64": { + "match": "\"Fans First\"", + "replace": "\"Для фанатов\"" + }, + "65": { + "match": "\"Offer ends in .0.:.1.:.2.\"", + "replace": "\"До конца предложения: {0}:{1}:{2}\"" + }, + "66": { + "match": "\"Minimize playing view\"", + "replace": "\"Свернуть\"" } -} +} \ No newline at end of file diff --git a/patches/patches.json b/patches/patches.json index c6fc7fc..78b9b68 100644 --- a/patches/patches.json +++ b/patches/patches.json @@ -1874,6 +1874,13 @@ "" ] }, + "block_subfeeds": { + "version": { + "fr": "1.2.30", + "to": "" + }, + "add": " .LVMjmN2CaPruPAo62RAY { display: none !important }" + }, "downloadquality": { "version": { "fr": "1.2.30", diff --git a/run.ps1 b/run.ps1 index 9f08a2d..471b514 100644 --- a/run.ps1 +++ b/run.ps1 @@ -362,7 +362,7 @@ if ($version) { $old_os = $win7 -or $win8 -or $win8_1 -# Recommended version for Win 7-8.1 +# latest tested version for Win 7-8.1 $last_win7_full = "1.2.5.1006.g22820f93-1078" if (!($version -and $version -match $match_v)) { @@ -370,8 +370,8 @@ if (!($version -and $version -match $match_v)) { $onlineFull = $last_win7_full } else { - # Recommended version for Win 10-12 - $onlineFull = "1.2.53.440.g7b2f582a-58" + # latest tested version for Win 10-12 + $onlineFull = "1.2.55.235.g5eaa0904-463" } } else { @@ -791,6 +791,7 @@ if ($spotifyInstalled) { catch { Write-Host 'Unable to submit new version of Spotify' Write-Host "error description: "$Error[0] + Write-Host } if ($confirm_spoti_recomended_over -or $confirm_spoti_recomended_uninstall) { @@ -1271,6 +1272,8 @@ function Helper($paramname) { if ($not_block_update) { Remove-Json -j $binary -p 'block_update' } + if ($premium) { Remove-Json -j $binary -p 'block_slots_2', 'block_slots_3' } + $name = "patches.json.others.binary." $n = "Spotify.exe" $contents = $webjson.others.binary.psobject.properties.name @@ -1295,6 +1298,7 @@ function Helper($paramname) { $VarJs = $webjson.VariousJs + if ($premium) { Remove-Json -j $VarJs -p 'mock', 'upgradeButton', 'upgradeMenu' } if ($topsearchbar -or ([version]$offline -ne [version]"1.2.45.451" -and [version]$offline -ne [version]"1.2.45.454")) { Remove-Json -j $VarJs -p "fixTitlebarHeight" @@ -1755,6 +1759,11 @@ If ($test_spa) { $css += $webjson.others.veryhighstream.add } } + # block subfeeds + if ($type -eq "all" -or $type -eq "podcast") { + $css += $webjson.others.block_subfeeds.add + } + if ($null -ne $css ) { extract -counts 'one' -method 'zip' -name 'xpui.css' -add $css } diff --git a/scripts/installer-lang/en.ps1 b/scripts/installer-lang/en.ps1 index 6c9c030..b7f81bd 100644 --- a/scripts/installer-lang/en.ps1 +++ b/scripts/installer-lang/en.ps1 @@ -12,30 +12,30 @@ Download5 = "Downloading Spotify" StopScript = "Script is stopped" MsSpoti = "The Microsoft Store version of Spotify has been detected which is not supported" - MsSpoti2 = "Uninstall Spotify Microsoft Store edition [Y/N]" + MsSpoti2 = "Uninstall Spotify Microsoft Store edition ? [Y/N]" MsSpoti3 = "Automatically uninstalling Spotify MS..." MsSpoti4 = "Uninstalling Spotify MS..." Prem = "Modification for premium account..." OldV = "Found outdated version of Spotify" - OldV2 = "Your Spotify {0} version is outdated, it is recommended to upgrade to {1}" + OldV2 = "Your Spotify version ({0}) is outdated, the current latest version is — {1}" OldV3 = "Want to update ? [Y/N]" AutoUpd = "Automatic update to the recommended version" - DelOrOver = "Do you want to uninstall the current version of {0} or install over it? Y [Uninstall] / N [Install Over]" + DelOrOver = "Remove the current version ({0}) or install over it? Y [Remove] / N [Install Over]" DelOld = "Uninstalling old Spotify..." NewV = "Unsupported version of Spotify found" - NewV2 = "Your Spotify {0} version hasn't been tested yet, currently it's a stable {1} version" - NewV3 = "Do you want to continue with {0} version (errors possible) ? [Y/N]" - Recom = "Do you want to install the recommended {0} version ? [Y/N]" + NewV2 = "Your Spotify version ({0}) has not been tested. The stable version for SpotX is {1}" + NewV3 = "Continue with {0} (errors may occur) ? [Y/N]" + Recom = "Install the latest version {0} ? [Y/N]" DelNew = "Uninstalling an untested Spotify..." DownSpoti = "Downloading and installing Spotify" DownSpoti2 = "Please wait..." PodcatsOff = "Off Podcasts" PodcastsOn = "On Podcasts" - PodcatsSelect = "Do you want to disable podcasts, episodes and audiobooks from the main page? [Y/N]" + PodcatsSelect = "Hide podcasts, shows, and audiobooks on the homepage ? [Y/N]" DowngradeNote = "It is recommended to block because Spotify was downgraded" UpdBlock = "Spotify updates blocked" UpdUnblock = "Spotify updates are not blocked" - UpdSelect = "Want to block Spotify updates? [Y/N]" + UpdSelect = "Block Spotify updates ? [Y/N]" ModSpoti = "Patching Spotify..." Error = "Error" FileLocBroken = "Location of Spotify files is broken, uninstall Spotify client and run the script again" diff --git a/scripts/installer-lang/ru.ps1 b/scripts/installer-lang/ru.ps1 index ea684d3..9b4d5e2 100644 --- a/scripts/installer-lang/ru.ps1 +++ b/scripts/installer-lang/ru.ps1 @@ -12,30 +12,30 @@ Download5 = "Загрузка Spotify" StopScript = "Cкрипт остановлен" MsSpoti = "Обнаружена версия Spotify из Microsoft Store, которая не поддерживается" - MsSpoti2 = "Хотите удалить Spotify Microsoft Store ? [Y/N]" + MsSpoti2 = "Удалить Spotify Microsoft Store ? [Y/N]" MsSpoti3 = "Автоматическое удаление Spotify MS..." MsSpoti4 = "Удаление Spotify MS..." Prem = "Модификация для премиум аккаунта..." OldV = "Найдена устаревшая версия Spotify" - OldV2 = "Ваша версия Spotify {0} устарела, рекомендуется обновиться до {1}" + OldV2 = "Ваша версия Spotify ({0}) устарела. Текущая актуальная версия — {1}" OldV3 = "Обновить ? [Y/N]" AutoUpd = "Автоматическое обновление до рекомендуемой версии" - DelOrOver = "Вы хотите удалить текущую версию {0} или установить поверх нее? Y [Удалить] / N [Поверх]" + DelOrOver = "Удалить текущую версию ({0}) или установить поверх? Y [Удалить] / N [Поверх]" DelOld = "Удаление устаревшего Spotify..." NewV = "Найдена неподдерживаемая версия Spotify" - NewV2 = "Ваша версия Spotify {0} еще не тестировалась, стабильная версия сейчас {1}" - NewV3 = "Хотите продолжить с {0} (возможны ошибки) ? [Y/N]" - Recom = "Хотите установить рекомендуемую {0} версию ? [Y/N]" + NewV2 = "Ваша версия Spotify ({0}) не тестировалась. Стабильная версия для SpotX — {1}" + NewV3 = "Продолжить с {0} (возможны ошибки) ? [Y/N]" + Recom = "Установить последнюю версию {0} ? [Y/N]" DelNew = "Удаление неподдерживаемого Spotify..." DownSpoti = "Загружаю и устанавливаю Spotify" DownSpoti2 = "Пожалуйста подождите..." PodcatsOff = "Подкасты отключены" PodcastsOn = "Подкасты не отключены" - PodcatsSelect = "Хотите скрыть подкасты, шоу и аудиокниги на главной странице ? [Y/N]" + PodcatsSelect = "Скрыть подкасты, шоу и аудиокниги на главной странице ? [Y/N]" DowngradeNote = "Рекомендуется заблокировать т.к. было понижение версии Spotify" UpdBlock = "Обновления Spotify заблокированы" UpdUnblock = "Обновления Spotify не заблокированы" - UpdSelect = "Хотите заблокировать обновления Spotify ? [Y/N]" + UpdSelect = "Заблокировать обновления Spotify ? [Y/N]" ModSpoti = "Модифицирую Spotify..." Error = "Ошибка" FileLocBroken = "Расположение файлов Spotify нарушено, удалите клиент Spotify и снова запустите скрипт"