From 04f270b9bca8d4722019236c440977b019f762d2 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Wed, 4 Dec 2019 12:18:44 +0800 Subject: [PATCH 1/3] Fix missing translations in search plugins dialog Closes #11551. --- src/webui/www/private/scripts/dynamicTable.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/webui/www/private/scripts/dynamicTable.js b/src/webui/www/private/scripts/dynamicTable.js index 3eca7efc4..dec5bfa8d 100644 --- a/src/webui/www/private/scripts/dynamicTable.js +++ b/src/webui/www/private/scripts/dynamicTable.js @@ -1602,14 +1602,14 @@ window.qBittorrent.DynamicTable = (function() { this.columns['enabled'].updateTd = function(td, row) { const value = this.getRowValue(row); if (value) { - td.set('text', "Yes"); - td.set('title', "Yes"); + td.set('text', 'QBT_TR(Yes)QBT_TR[CONTEXT=SearchPluginsTable]'); + td.set('title', 'QBT_TR(Yes)QBT_TR[CONTEXT=SearchPluginsTable]'); td.getParent("tr").addClass("green"); td.getParent("tr").removeClass("red"); } else { - td.set('text', "No"); - td.set('title', "No"); + td.set('text', 'QBT_TR(No)QBT_TR[CONTEXT=SearchPluginsTable]'); + td.set('title', 'QBT_TR(No)QBT_TR[CONTEXT=SearchPluginsTable]'); td.getParent("tr").addClass("red"); td.getParent("tr").removeClass("green"); } From 5f165c4c00340e6921d296fed8d55cf14f7a7b1f Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Wed, 4 Dec 2019 12:24:37 +0800 Subject: [PATCH 2/3] Fix HTML elements size in search tab Specifying a height/width value might cut the displayed text or obstruct centering the text in the button, so let it auto decide instead. Closes #11553. --- src/webui/www/private/views/search.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/webui/www/private/views/search.html b/src/webui/www/private/views/search.html index f9f052a24..eb1bfb0ce 100644 --- a/src/webui/www/private/views/search.html +++ b/src/webui/www/private/views/search.html @@ -11,17 +11,14 @@ #categorySelect { width: 150px; - height: 20px; } #pluginsSelect { width: 150px; - height: 20px; } #startSearchButton { width: 90px; - height: 20px; } #searchResultsNoPlugins { @@ -49,7 +46,6 @@ } #manageSearchPlugins { - line-height: 1.5em; float: right; } From c896982efb19028c57400e81d46cc0fe9eea5681 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Wed, 4 Dec 2019 12:41:40 +0800 Subject: [PATCH 3/3] Fix incorrect translation displayed after language change It is expected in WebUI that the language change applies immediately (without a program restart) and this static caching prevents that. --- src/base/search/searchpluginmanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/base/search/searchpluginmanager.cpp b/src/base/search/searchpluginmanager.cpp index 77520c35b..d18e9a98f 100644 --- a/src/base/search/searchpluginmanager.cpp +++ b/src/base/search/searchpluginmanager.cpp @@ -318,7 +318,7 @@ SearchHandler *SearchPluginManager::startSearch(const QString &pattern, const QS QString SearchPluginManager::categoryFullName(const QString &categoryName) { - static const QHash categoryTable { + const QHash categoryTable { {"all", tr("All categories")}, {"movies", tr("Movies")}, {"tv", tr("TV shows")},