diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-06-23 08:04:29 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-24 01:24:45 +0000 |
| commit | 764363d1822e93cf281a20c83da2faa70821704a (patch) | |
| tree | 35c9cfdf0e72eafb608745875a8914132fcb8856 | |
| parent | fa9eaf41e53b7690825c5464c3f93409ede3e272 (diff) | |
Fix some translated messages
Give messages a context and use placeholders for arguments.
Change-Id: Ib07f74f6c9f0024c2851b3e4f2093f980115244d
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit dcaa369bc1659a28b8de4c9d619c72c485e72274)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/core/file_picker_controller.cpp | 6 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebengineview.cpp | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/core/file_picker_controller.cpp b/src/core/file_picker_controller.cpp index 02d40a054..1494d8aae 100644 --- a/src/core/file_picker_controller.cpp +++ b/src/core/file_picker_controller.cpp @@ -45,6 +45,7 @@ #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/file_select_listener.h" +#include <QtCore/qcoreapplication.h> #include <QDir> #include <QFileInfo> #include <QMimeDatabase> @@ -276,7 +277,10 @@ QStringList FilePickerController::nameFilters(const QStringList &acceptedMimeTyp } } - nameFilters.prepend(QObject::tr("Accepted types") + " (" + acceptedGlobs.join(" ") + ")"); + const QString filter = + QCoreApplication::translate("FilePickerController", + "Accepted types (%1)").arg(acceptedGlobs.join(' ')); + nameFilters.prepend(filter); return nameFilters; } diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp index 8a3ce81a0..9d5639ca2 100644 --- a/src/webenginewidgets/api/qwebengineview.cpp +++ b/src/webenginewidgets/api/qwebengineview.cpp @@ -215,7 +215,7 @@ QStringList QWebEngineViewPrivate::chooseFiles(QWebEnginePage::FileSelectionMode QFileDialog::HideNameFilterDetails); break; case QtWebEngineCore::FilePickerController::UploadFolder: - str = QFileDialog::getExistingDirectory(q, QObject::tr("Select folder to upload")); + str = QFileDialog::getExistingDirectory(q, QWebEngineView::tr("Select folder to upload")); if (!str.isNull()) ret << str; break; |