From 40ae672dc82b35a9d59d3a26f37696f6c6a6a5fb Mon Sep 17 00:00:00 2001 From: jetfir3 <95306468+jetfir3@users.noreply.github.com> Date: Mon, 3 Oct 2022 14:46:49 -0400 Subject: [PATCH 1/2] Minor text corrections. --- Install.ps1 | 28 ++++++++++++++-------------- README.md | 4 ++-- scripts/installer-lang/en.ps1 | 6 +++--- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Install.ps1 b/Install.ps1 index cece3d1..837f26f 100644 --- a/Install.ps1 +++ b/Install.ps1 @@ -1,9 +1,9 @@ param ( - [Parameter(HelpMessage = 'Remove podcasts from homepage.')] + [Parameter(HelpMessage = 'Remove podcasts/episodes/audiobooks from homepage.')] [switch]$podcasts_off, - [Parameter(HelpMessage = 'Do not remove podcasts from homepage.')] + [Parameter(HelpMessage = 'Do not remove podcasts/episodes/audiobooks from homepage.')] [switch]$podcasts_on, [Parameter(HelpMessage = 'Block Spotify automatic updates.')] @@ -45,7 +45,7 @@ param [Parameter(HelpMessage = 'Do not hide the icon of collaborations in playlists.')] [switch]$hide_col_icon_off, - [Parameter(HelpMessage = 'Do not enable the made for you button on the left sidebar.')] + [Parameter(HelpMessage = 'Do not enable the Made For You button on the left sidebar.')] [switch]$made_for_you_off, [Parameter(HelpMessage = 'Do not enable enhance playlist.')] @@ -264,7 +264,7 @@ $lang = Set-ScriptLanguageStrings -LanguageCode $langCode # Set variable 'ru'. if ($langCode -eq 'ru') { $ru = $true } -# Set variable 'add transl line'. +# Set variable 'add translation line'. if ($langCode -match '^(it|tr|ka|pl|es|fr|hi|pt|id|vi)') { $line = $true } # Automatic length of stars @@ -326,7 +326,7 @@ function incorrectValue { function Check_verison_clients($param2) { - # checking the recommended version for spotx + # Checking the recommended version for spotx if ($param2 -eq "online") { $ProgressPreference = 'SilentlyContinue' # Hiding Progress Bars $readme = Invoke-WebRequest -UseBasicParsing -Uri https://raw.githubusercontent.com/SpotX-CLI/SpotX-Win/main/README.md @@ -900,7 +900,7 @@ function Helper($paramname, $addstring) { # Removing a billboard on the homepage Bilboard = '.(\?\[..\(..leaderboard,)', 'false$1' # Removing audio ads - AidioAds = '(case .:)return this.enabled=...+?(;case .:this.subscription=this.audioApi).+?(;case .)', '$1$2.cosmosConnector.increaseStreamTime(-100000000000)$3' + AudioAds = '(case .:)return this.enabled=...+?(;case .:this.subscription=this.audioApi).+?(;case .)', '$1$2.cosmosConnector.increaseStreamTime(-100000000000)$3' # Removing an empty block EmptyBlockAd = 'adsEnabled:!0', 'adsEnabled:!1' # Fullscreen act., removing upgrade menu, button @@ -922,7 +922,7 @@ function Helper($paramname, $addstring) { MostRecent = '("most-recent",value:")Most recent("\})', '$1Самые последние$2' } if ($bts) { - $offadson_fullscreen.Remove('Bilboard'), $offadson_fullscreen.Remove('AidioAds') + $offadson_fullscreen.Remove('Bilboard'), $offadson_fullscreen.Remove('AudioAds') } $ofline = Check_verison_clients -param2 "offline" if (!($ru) -or $ofline -le "1.1.94.872") { @@ -1276,7 +1276,7 @@ if (Test-Path $xpui_js_patch) { # Hide very high quality streaming $writer.Write([System.Environment]::NewLine + ' #desktop\.settings\.streamingQuality>option:nth-child(5) {display:none}') } - # new UI fix + # New UI fix if (!($navalt_off)) { $writer.Write([System.Environment]::NewLine + ' .nav-alt .Root__top-container {background: #00000085;gap: 6px;padding: 8px;}') $writer.Write([System.Environment]::NewLine + ' .Root__fixed-top-bar {background-color: #00000000}') @@ -1432,7 +1432,7 @@ If (Test-Path $xpui_spa_patch) { $writer.Write($xpuiContents_vendor) $writer.Close() - # minification of all *.js + # Minification of all *.js $zip.Entries | Where-Object FullName -like '*.js' | ForEach-Object { $readerjs = New-Object System.IO.StreamReader($_.Open()) $xpuiContents_js = $readerjs.ReadToEnd() @@ -1465,7 +1465,7 @@ If (Test-Path $xpui_spa_patch) { $writer.Write([System.Environment]::NewLine + ' #desktop\.settings\.streamingQuality>option:nth-child(5) {display:none}') } - # new UI fix + # New UI fix if (!($navalt_off)) { $writer.Write([System.Environment]::NewLine + ' .nav-alt .Root__top-container {background: #00000085;gap: 6px;padding: 8px;}') $writer.Write([System.Environment]::NewLine + ' .Root__fixed-top-bar {background-color: #00000000}') @@ -1568,7 +1568,7 @@ if ($ru) { Remove-Item $patch_lang -Exclude *en*, *ru* -Recurse } -# create a desktop shortcut +# Create a desktop shortcut $ErrorActionPreference = 'SilentlyContinue' if (!($no_shortcut)) { @@ -1587,7 +1587,7 @@ if (!($no_shortcut)) { } } -# create shortcut in start menu +# Create shortcut in start menu If (!(Test-Path $start_menu)) { $source = "$env:APPDATA\Spotify\Spotify.exe" $target = $start_menu @@ -1642,7 +1642,7 @@ if ($cache_install) { downloadScripts -param1 "run_ps" - # create a desktop shortcut + # Create a desktop shortcut if (!($no_shortcut)) { $source2 = "$cache_folder\hide_window.vbs" $target2 = "$desktop_folder\Spotify.lnk" @@ -1654,7 +1654,7 @@ if ($cache_install) { $Shortcut2.TargetPath = $source2 $Shortcut2.Save() } - # create shortcut in start menu + # Create shortcut in start menu $source2 = "$cache_folder\hide_window.vbs" $target2 = $start_menu $WorkingDir2 = "$cache_folder" diff --git a/README.md b/README.md index 26903a8..a301a7b 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ - Blocks all banner, video and audio ads in the client - Unlocks the skip function of any track -- Hiding podcasts and episodes from the homepage (optional) +- Hiding podcasts, episodes and audiobooks from the homepage (optional) - Block Spotify automatic updates (optional) - Automatic clearing of [audio cache](https://github.com/SpotX-CLI/SpotX-Win/discussions/2) (optional) - More experimental features have been activated ([see the full list](https://github.com/SpotX-CLI/SpotX-Win/discussions/50)) @@ -63,7 +63,7 @@ or - Automatic removal of Spotify MS if it was found - Automatic installation of the recommended version of Spotify (if another client has already been found, it will be installed over) - - Removal of podcasts from the main page + - Removal of podcasts/episodes/audiobooks from the main page - Automatic blocking of Spotify updates - All [experimental features](https://github.com/SpotX-CLI/SpotX-Win/discussions/50) included - After the installation is completed, the client will autorun. diff --git a/scripts/installer-lang/en.ps1 b/scripts/installer-lang/en.ps1 index 9f5bf15..81aa98c 100644 --- a/scripts/installer-lang/en.ps1 +++ b/scripts/installer-lang/en.ps1 @@ -12,7 +12,7 @@ StopScrpit = "Script is stopped" MsSpoti = "The Microsoft Store version of Spotify has been detected which is not supported" MsSpoti2 = "Uninstall Spotify Windows Store edition [Y/N]" - MsSpoti3 = "Automatic uninstalling Spotify MS..." + MsSpoti3 = "Automatically uninstalling Spotify MS..." MsSpoti4 = "Uninstalling Spotify MS..." Prem = "Modification for premium account..." OldV = "Found outdated version of Spotify" @@ -30,8 +30,8 @@ DownSpoti2 = "Please wait..." PodcatsOff = "Off Podcasts" PodcastsOn = "On Podcasts" - PodcatsSelect = "Do you want to disable podcasts from the main page? [Y/N]" - DowngradeNote = "It is recommended to block because there was a downgrade of Spotify" + PodcatsSelect = "Do you want to disable podcasts, episodes and audiobooks from the main page? [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]" From 0bc651fd3b8b035fc053e90bf00344f9cc8e485e Mon Sep 17 00:00:00 2001 From: amd64fox <62529699+amd64fox@users.noreply.github.com> Date: Tue, 4 Oct 2022 01:38:23 +0300 Subject: [PATCH 2/2] typo --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a301a7b..e1b698b 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ or - Automatic removal of Spotify MS if it was found - Automatic installation of the recommended version of Spotify (if another client has already been found, it will be installed over) - - Removal of podcasts/episodes/audiobooks from the main page + - Hiding podcasts/episodes/audiobooks from the homepage - Automatic blocking of Spotify updates - All [experimental features](https://github.com/SpotX-CLI/SpotX-Win/discussions/50) included - After the installation is completed, the client will autorun. @@ -136,7 +136,7 @@ or - Automatic removal of Spotify MS if it was found - Automatic installation of the recommended version of Spotify (if another client has already been found, it will be installed over) - - Removal of podcasts from the main page + - Hiding podcasts/episodes/audiobooks from the homepage - Automatic blocking of Spotify updates - All [experimental features](https://github.com/SpotX-CLI/SpotX-Win/discussions/50) included