From b4f5cc99f697473ec79b9d5b24f84fe22c6dd9df Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 15 Apr 2022 05:08:18 +0300 Subject: [PATCH] kio: use kio4 catalog in metadata plugins Signed-off-by: Ivailo Monev --- kio/kio/kfilemetadata.cpp | 3 +++ kio/kio/kfilemetadata.h | 6 ++++++ kio/kio/kfilemetainfo.cpp | 13 ++++++++----- kio/metadata/kfilemetadata_ffmpeg.cpp | 4 ++-- kio/metadata/kfilemetadata_taglib.cpp | 4 ++-- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/kio/kio/kfilemetadata.cpp b/kio/kio/kfilemetadata.cpp index a7eb1f7a..36d6327b 100644 --- a/kio/kio/kfilemetadata.cpp +++ b/kio/kio/kfilemetadata.cpp @@ -17,10 +17,13 @@ */ #include "kfilemetadata.h" +#include "kglobal.h" +#include "klocale.h" KFileMetaDataPlugin::KFileMetaDataPlugin(QObject *parent) : QObject(parent) { + KGlobal::locale()->insertCatalog("kio4"); } KFileMetaDataPlugin::~KFileMetaDataPlugin() diff --git a/kio/kio/kfilemetadata.h b/kio/kio/kfilemetadata.h index 19bdc5b3..bccf32df 100644 --- a/kio/kio/kfilemetadata.h +++ b/kio/kio/kfilemetadata.h @@ -30,6 +30,12 @@ /*! Base class for plugins to retrieve file metadata. + There are two template strings that are localized and can be used by plugins where appropriate: + @code + const QString bitratestring = i18nc("kfilemetadata", "%1 kb/s", bitrate); + const QString sampleratestring = i18nc("kfilemetadata", "%1 Hz", samplerate); + @endcode + @since 4.21 @note all virtual methods, despite not being pure-virtual, must be reimplemented */ diff --git a/kio/kio/kfilemetainfo.cpp b/kio/kio/kfilemetainfo.cpp index 235a3211..4aaa201d 100644 --- a/kio/kio/kfilemetainfo.cpp +++ b/kio/kio/kfilemetainfo.cpp @@ -231,6 +231,9 @@ QStringList KFileMetaInfo::supportedKeys() QString KFileMetaInfo::name(const QString& key) { + I18N_NOOP2("kfilemetadata", "%1 kb/s"); + I18N_NOOP2("kfilemetadata", "%1 Hz"); + typedef std::map TranslationMap; static const TranslationMap s_translations = { @@ -251,6 +254,11 @@ QString KFileMetaInfo::name(const QString& key) { "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#channels", i18nc("@label", "Channels") }, { "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#duration", i18nc("@label", "Duration") }, { "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#frameRate", i18nc("@label", "Frame Rate") }, + { "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#videoCodec", i18nc("@label", "Video Codec") }, + { "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#audioCodec", i18nc("@label", "Audio Codec") }, + { "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#subtitleCodec", i18nc("@label", "Subtitle Codec") }, + { "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#audioBitRate", i18nc("@label", "Audio Bit Rate") }, + { "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#videoBitRate", i18nc("@label", "Video Bit Rate") }, { "http://www.semanticdesktop.org/ontologies/2007/01/19/nie#copyright", i18nc("@label", "Copyright") }, { "http://www.semanticdesktop.org/ontologies/2007/01/19/nie#comment", i18nc("@label", "Comment") }, { "http://www.semanticdesktop.org/ontologies/2007/01/19/nie#title", i18nc("@label music title", "Title") }, @@ -285,11 +293,6 @@ QString KFileMetaInfo::name(const QString& key) { "http://www.semanticdesktop.org/ontologies/2007/05/10/nexif#isoSpeedRatings", i18nc("@label EXIF", "ISO Speed Ratings") }, { "http://www.semanticdesktop.org/ontologies/2007/05/10/nexif#meteringMode", i18nc("@label EXIF", "Metering Mode") }, { "http://www.semanticdesktop.org/ontologies/2007/05/10/nexif#whiteBalance", i18nc("@label EXIF", "White Balance") }, - { "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#videoCodec", i18nc("@label", "Video Codec") }, - { "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#audioCodec", i18nc("@label", "Audio Codec") }, - { "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#subtitleCodec", i18nc("@label", "Subtitle Codec") }, - { "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#audioBitRate", i18nc("@label", "Audio Bit Rate") }, - { "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#videoBitRate", i18nc("@label", "Video Bit Rate") }, // TODO: implement { "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#pageCount", i18nc("@label", "Page Count") }, { "http://www.semanticdesktop.org/ontologies/2007/03/22/nco#creator", i18nc("@label", "Creator") }, diff --git a/kio/metadata/kfilemetadata_ffmpeg.cpp b/kio/metadata/kfilemetadata_ffmpeg.cpp index f01ad769..1c98b75b 100644 --- a/kio/metadata/kfilemetadata_ffmpeg.cpp +++ b/kio/metadata/kfilemetadata_ffmpeg.cpp @@ -132,7 +132,7 @@ QList KFileMetaDataFFmpegPlugin::metaData(const KUrl &url, co ); } if (ffmpegcodec->bit_rate > 0) { - const QString ffmpegbitrate = i18n("%1 kb/s", ffmpegcodec->bit_rate / 1000); + const QString ffmpegbitrate = i18nc("kfilemetadata", "%1 kb/s", ffmpegcodec->bit_rate / 1000); result.append( KFileMetaInfoItem( QString::fromLatin1("http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#videoBitRate"), @@ -164,7 +164,7 @@ QList KFileMetaDataFFmpegPlugin::metaData(const KUrl &url, co ); } if (ffmpegcodec->bit_rate > 0) { - const QString ffmpegbitrate = i18n("%1 kb/s", ffmpegcodec->bit_rate / 1000); + const QString ffmpegbitrate = i18nc("kfilemetadata", "%1 kb/s", ffmpegcodec->bit_rate / 1000); result.append( KFileMetaInfoItem( QString::fromLatin1("http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#audioBitRate"), diff --git a/kio/metadata/kfilemetadata_taglib.cpp b/kio/metadata/kfilemetadata_taglib.cpp index fa257d49..9b94d96e 100644 --- a/kio/metadata/kfilemetadata_taglib.cpp +++ b/kio/metadata/kfilemetadata_taglib.cpp @@ -186,7 +186,7 @@ QList KFileMetaDataTagLibPlugin::metaData(const KUrl &url, co ) ); } - const QString taglibbitrate = i18n("%1 kb/s", taglibaudio->bitrate()); + const QString taglibbitrate = i18nc("kfilemetadata", "%1 kb/s", taglibaudio->bitrate()); if (!taglibbitrate.isEmpty() && taglibaudio->bitrate() > 0) { result.append( KFileMetaInfoItem( @@ -195,7 +195,7 @@ QList KFileMetaDataTagLibPlugin::metaData(const KUrl &url, co ) ); } - const QString taglibsamplerate = i18n("%1 Hz", taglibaudio->sampleRate()); + const QString taglibsamplerate = i18nc("kfilemetadata", "%1 Hz", taglibaudio->sampleRate()); if (!taglibsamplerate.isEmpty() && taglibaudio->sampleRate() > 0) { result.append( KFileMetaInfoItem(