diff --git a/src/core/fullscreenui_settings.cpp b/src/core/fullscreenui_settings.cpp index 31c6714fc..3f640c69d 100644 --- a/src/core/fullscreenui_settings.cpp +++ b/src/core/fullscreenui_settings.cpp @@ -3076,8 +3076,11 @@ void FullscreenUI::DrawCoverDownloaderWindow() FSUI_CSTR("In the form below, specify the URLs to download covers from, with one template URL " "per line. The following variables are available:")); ImGui::NewLine(); - ImGui::TextWrapped("%s", FSUI_CSTR("${title}: Title of the game.\n${filetitle}: Name component of the game's " - "filename.\n${serial}: Serial of the game.")); + ImGui::TextWrapped("%s", FSUI_CSTR("${title}: Title of the game.")); + ImGui::TextWrapped("%s", FSUI_CSTR("${savetitle}: Save title for the game, including the region suffix.")); + ImGui::TextWrapped("%s", FSUI_CSTR("${localizedtitle}: Localized title for the game in its native language.")); + ImGui::TextWrapped("%s", FSUI_CSTR("${filetitle}: Name component of the game's filename.")); + ImGui::TextWrapped("%s", FSUI_CSTR("${serial}: Serial of the game.")); ImGui::NewLine(); ImGui::TextWrapped("%s", FSUI_CSTR("Example: https://www.example-not-a-real-domain.com/covers/${serial}.jpg")); ImGui::NewLine(); @@ -3102,6 +3105,8 @@ void FullscreenUI::DrawCoverDownloaderWindow() if (HorizontalMenuButton(FSUI_ICONSTR(ICON_FA_DOWNLOAD, "Start Download"), download_enabled)) { + SaveCoverDownloaderURLs(); + // TODO: Remove release once using move_only_function std::unique_ptr progress = OpenModalProgressDialog(FSUI_STR("Cover Downloader"), 1000.0f); Host::QueueAsyncTask([progress = progress.release(), @@ -3127,10 +3132,7 @@ void FullscreenUI::DrawCoverDownloaderWindow() Host::RunOnCoreThread([]() { VideoThread::RunOnThread([]() { if (IsFixedPopupDialogOpen(COVER_DOWNLOADER_DIALOG_NAME)) - { - SaveCoverDownloaderURLs(); CloseFixedPopupDialog(); - } }); }); } diff --git a/src/core/fullscreenui_strings.h b/src/core/fullscreenui_strings.h index 6b3c4aa51..79dd47fbf 100644 --- a/src/core/fullscreenui_strings.h +++ b/src/core/fullscreenui_strings.h @@ -17,7 +17,11 @@ #if 0 // TRANSLATION-STRING-AREA-BEGIN TRANSLATE_NOOP("FullscreenUI", " (%u MB on disk)"); -TRANSLATE_NOOP("FullscreenUI", "${title}: Title of the game.\n${filetitle}: Name component of the game's filename.\n${serial}: Serial of the game."); +TRANSLATE_NOOP("FullscreenUI", "${filetitle}: Name component of the game's filename."); +TRANSLATE_NOOP("FullscreenUI", "${localizedtitle}: Localized title for the game in its native language."); +TRANSLATE_NOOP("FullscreenUI", "${savetitle}: Save title for the game, including the region suffix."); +TRANSLATE_NOOP("FullscreenUI", "${serial}: Serial of the game."); +TRANSLATE_NOOP("FullscreenUI", "${title}: Title of the game."); TRANSLATE_NOOP("FullscreenUI", "%.1f ms"); TRANSLATE_NOOP("FullscreenUI", "%.2f Seconds"); TRANSLATE_NOOP("FullscreenUI", "%d Frames"); diff --git a/src/core/game_list.cpp b/src/core/game_list.cpp index a79a30558..98d6bf184 100644 --- a/src/core/game_list.cpp +++ b/src/core/game_list.cpp @@ -1773,12 +1773,11 @@ bool GameList::DownloadCovers(const std::vector& url_templates, boo if (!has_serial && url_template.find("${serial}") != std::string::npos) has_serial = true; } - if (!has_title && !has_save_title && !has_file_title && !has_serial) + if (!has_title && !has_localized_title && !has_save_title && !has_file_title && !has_serial) { - Error::SetStringView( - error, - TRANSLATE_SV("GameList", - "URL template must contain at least one of ${title}, ${savetitle}, ${filetitle}, or ${serial}.")); + Error::SetStringView(error, + TRANSLATE_SV("GameList", "URL template must contain at least one of ${title}, " + "${localizedtitle}, ${savetitle}, ${filetitle}, or ${serial}.")); return false; } diff --git a/src/duckstation-qt/coverdownloadwindow.ui b/src/duckstation-qt/coverdownloadwindow.ui index 7b2b2ea37..8c7d4ddd0 100644 --- a/src/duckstation-qt/coverdownloadwindow.ui +++ b/src/duckstation-qt/coverdownloadwindow.ui @@ -51,7 +51,7 @@ - <html><head/><body><p>Depending on your jurisdiction, <span style=" font-weight:700;">game covers may be copyrighted</span>. You are only authorized to use this tool with <span style=" font-weight:700;">your own servers and images</span>.</p><p>In the box below, specify the URLs to download covers from, with one template URL per line. The following variables are available:</p><p><span style=" font-style:italic;">${title}:</span> Title of the game.<br/><span style=" font-style:italic;">${savetitle}:</span> Title of the game including the region.<br/><span style=" font-style:italic;">${localizedtitle}:</span> Localized (native language) title of the game.<br/><span style=" font-style:italic;">${filetitle}:</span> Name component of the game's filename.<br/><span style=" font-style:italic;">${serial}:</span> Serial of the game.</p><p><span style=" font-weight:700;">Example:</span> https://www.example-not-a-real-domain.com/covers/${serial}.jpg</p></body></html> + <html><head/><body><p>Depending on your jurisdiction, <span style=" font-weight:700;">game covers may be copyrighted</span>. You are only authorized to use this tool with <span style=" font-weight:700;">your own servers and images</span>.</p><p>In the box below, specify the URLs to download covers from, with one template URL per line. The following variables are available:</p><p><span style=" font-style:italic;">${title}:</span> Title of the game.<br/><span style=" font-style:italic;">${savetitle}:</span> Save title for the game, including the region suffix.<br/><span style=" font-style:italic;">${localizedtitle}:</span> Localized title for the game in its native language.<br/><span style=" font-style:italic;">${savetitle}:</span> Title of the game including the region.<br/><span style=" font-style:italic;">${localizedtitle}:</span> Localized (native language) title of the game.<br/><span style=" font-style:italic;">${filetitle}:</span> Name component of the game's filename.<br/><span style=" font-style:italic;">${serial}:</span> Serial of the game.</p><p><span style=" font-weight:700;">Example:</span> https://www.example-not-a-real-domain.com/covers/${serial}.jpg</p></body></html> true