From d254c051edb0a481039abea994872979a3f84ace Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 3 Sep 2023 02:20:43 +0300 Subject: [PATCH] kdecore: do not insert the solid_qt catalog by default that means to get the translations linking to solid library or calling KGlobal::locale()->insertCatalog("solid_qt") is required Signed-off-by: Ivailo Monev --- kdecore/localization/klocale.cpp | 3 +- solid/solid/CMakeLists.txt | 3 +- .../solid/backends/devinfo/devinfodevice.cpp | 11 ++- solid/solid/backends/udev/udevdevice.cpp | 98 +++++++++---------- solid/solid/deviceinterface.cpp | 41 ++++---- solid/solid/solidnamespace.cpp | 18 ++-- 6 files changed, 89 insertions(+), 85 deletions(-) diff --git a/kdecore/localization/klocale.cpp b/kdecore/localization/klocale.cpp index 2f9b75a3..032344b7 100644 --- a/kdecore/localization/klocale.cpp +++ b/kdecore/localization/klocale.cpp @@ -47,8 +47,7 @@ enum KLocaleDuration static QStringList s_defaultcatalogs = QStringList() << QString::fromLatin1("kio4") << QString::fromLatin1("kdelibs4") - << QString::fromLatin1("kdeqt") - << QString::fromLatin1("solid_qt"); + << QString::fromLatin1("kdeqt"); static const QLatin1String s_localenamec = QLatin1String("C"); static const QLatin1Char s_localeexponentc = QLatin1Char('e'); diff --git a/solid/solid/CMakeLists.txt b/solid/solid/CMakeLists.txt index b7a127aa..06e47161 100644 --- a/solid/solid/CMakeLists.txt +++ b/solid/solid/CMakeLists.txt @@ -165,7 +165,7 @@ if(UDEV_FOUND) Support for m-p-i is included even if not found during build" ) - set(solid_OPTIONAL_LIBS ${solid_OPTIONAL_LIBS} ${QT_QTDBUS_LIBRARY} ${UDEV_LIBRARIES} kdecore) + set(solid_OPTIONAL_LIBS ${solid_OPTIONAL_LIBS} ${QT_QTDBUS_LIBRARY} ${UDEV_LIBRARIES}) endif(UDEV_FOUND) if(DEVINFO_FOUND) @@ -195,6 +195,7 @@ target_link_libraries(solid PUBLIC ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY} + kdecore ) set_target_properties(solid PROPERTIES diff --git a/solid/solid/backends/devinfo/devinfodevice.cpp b/solid/solid/backends/devinfo/devinfodevice.cpp index 87b07468..26aade34 100644 --- a/solid/solid/backends/devinfo/devinfodevice.cpp +++ b/solid/solid/backends/devinfo/devinfodevice.cpp @@ -25,6 +25,7 @@ #include "devinfographic.h" #include "kdevicedatabase.h" +#include "klocale.h" #include @@ -197,17 +198,17 @@ QStringList DevinfoDevice::emblems() const QString DevinfoDevice::description() const { if (m_device == DEVINFO_ROOT_UDI || parentUdi().isEmpty()) { - return QObject::tr("Computer"); + return i18n("Computer"); } else if (queryDeviceInterface(Solid::DeviceInterface::Processor)) { - return QObject::tr("Processor"); + return i18n("Processor"); } else if (queryDeviceInterface(Solid::DeviceInterface::NetworkInterface)) { const NetworkInterface networkIface(const_cast(this)); if (networkIface.isWireless()) { - return QObject::tr("WLAN Interface"); + return i18n("WLAN Interface"); } - return QObject::tr("Networking Interface"); + return i18n("Networking Interface"); } else if (queryDeviceInterface(Solid::DeviceInterface::Graphic)) { - return QObject::tr("Graphic display"); + return i18n("Graphic display"); } return deviceProperty(DevinfoDevice::DeviceDescription); } diff --git a/solid/solid/backends/udev/udevdevice.cpp b/solid/solid/backends/udev/udevdevice.cpp index 0fb3b31a..540ba4ec 100644 --- a/solid/solid/backends/udev/udevdevice.cpp +++ b/solid/solid/backends/udev/udevdevice.cpp @@ -333,7 +333,7 @@ QStringList UDevDevice::emblems() const QString UDevDevice::description() const { if (parentUdi().isEmpty()) { - return QObject::tr("Computer"); + return i18n("Computer"); } #if defined(LIBCDIO_FOUND) @@ -344,56 +344,56 @@ QString UDevDevice::description() const QString first; QString second; - first = QObject::tr("CD-ROM"); + first = i18n("CD-ROM"); if (mediumTypes & Solid::OpticalDrive::Cdr) - first = QObject::tr("CD-R"); + first = i18n("CD-R"); if (mediumTypes & Solid::OpticalDrive::Cdrw) - first = QObject::tr("CD-RW"); + first = i18n("CD-RW"); if (mediumTypes & Solid::OpticalDrive::Dvd) - second = QObject::tr("/DVD-ROM"); + second = i18n("/DVD-ROM"); if (mediumTypes & Solid::OpticalDrive::Dvdplusr) - second = QObject::tr("/DVD+R"); + second = i18n("/DVD+R"); if (mediumTypes & Solid::OpticalDrive::Dvdplusrw) - second = QObject::tr("/DVD+RW"); + second = i18n("/DVD+RW"); if (mediumTypes & Solid::OpticalDrive::Dvdr) - second = QObject::tr("/DVD-R"); + second = i18n("/DVD-R"); if (mediumTypes & Solid::OpticalDrive::Dvdrw) - second = QObject::tr("/DVD-RW"); + second = i18n("/DVD-RW"); if (mediumTypes & Solid::OpticalDrive::Dvdram) - second = QObject::tr("/DVD-RAM"); + second = i18n("/DVD-RAM"); if ((mediumTypes & Solid::OpticalDrive::Dvdr) && (mediumTypes & Solid::OpticalDrive::Dvdplusr)) { if (mediumTypes & Solid::OpticalDrive::Dvdplusdl) { - second = QObject::tr("/DVD±R DL"); + second = i18n("/DVD±R DL"); } else { - second = QObject::tr("/DVD±R"); + second = i18n("/DVD±R"); } } if ((mediumTypes & Solid::OpticalDrive::Dvdrw) && (mediumTypes & Solid::OpticalDrive::Dvdplusrw)) { if((mediumTypes & Solid::OpticalDrive::Dvdplusdl) || (mediumTypes & Solid::OpticalDrive::Dvdplusdlrw)) { - second = QObject::tr("/DVD±RW DL"); + second = i18n("/DVD±RW DL"); } else { - second = QObject::tr("/DVD±RW"); + second = i18n("/DVD±RW"); } } if (mediumTypes & Solid::OpticalDrive::Bd) - second = QObject::tr("/BD-ROM"); + second = i18n("/BD-ROM"); if (mediumTypes & Solid::OpticalDrive::Bdr) - second = QObject::tr("/BD-R"); + second = i18n("/BD-R"); if (mediumTypes & Solid::OpticalDrive::Bdre) - second = QObject::tr("/BD-RE"); + second = i18n("/BD-RE"); if (mediumTypes & Solid::OpticalDrive::HdDvd) - second = QObject::tr("/HD DVD-ROM"); + second = i18n("/HD DVD-ROM"); if (mediumTypes & Solid::OpticalDrive::HdDvdr) - second = QObject::tr("/HD DVD-R"); + second = i18n("/HD DVD-R"); if (mediumTypes & Solid::OpticalDrive::HdDvdrw) - second = QObject::tr("/HD DVD-RW"); + second = i18n("/HD DVD-RW"); QString description; if (opticalDrive.isHotpluggable()) { - description = QObject::tr("External %1%2 Drive"); + description = i18n("External %1%2 Drive"); } else { - description = QObject::tr("%1%2 Drive"); + description = i18n("%1%2 Drive"); } description = description.arg(first, second); @@ -406,21 +406,21 @@ QString UDevDevice::description() const const QString storagesize = KGlobal::locale()->formatByteSize(storageIface.size()); if (drivetype == Solid::StorageDrive::HardDisk) { - return QObject::tr("%1 Hard Drive").arg(storagesize); + return i18n("%1 Hard Drive").arg(storagesize); } else if (drivetype == Solid::StorageDrive::CdromDrive) { - return QObject::tr("%1 CD-ROM Drive").arg(storagesize); + return i18n("%1 CD-ROM Drive").arg(storagesize); } else if (drivetype == Solid::StorageDrive::Floppy) { - return QObject::tr("%1 Floppy Drive").arg(storagesize); + return i18n("%1 Floppy Drive").arg(storagesize); } else if (drivetype == Solid::StorageDrive::Tape) { - return QObject::tr("%1 Tape Drive").arg(storagesize); + return i18n("%1 Tape Drive").arg(storagesize); } else if (drivetype == Solid::StorageDrive::CompactFlash) { - return QObject::tr("%1 Compact Flash Drive").arg(storagesize); + return i18n("%1 Compact Flash Drive").arg(storagesize); } else if (drivetype == Solid::StorageDrive::MemoryStick) { - return QObject::tr("%1 Memory Stick Drive").arg(storagesize); + return i18n("%1 Memory Stick Drive").arg(storagesize); } else if (drivetype == Solid::StorageDrive::SmartMedia) { - return QObject::tr("%1 Smart Media Drive").arg(storagesize); + return i18n("%1 Smart Media Drive").arg(storagesize); } else if (drivetype == Solid::StorageDrive::SdMmc) { - return QObject::tr("%1 SD/MMC Drive").arg(storagesize); + return i18n("%1 SD/MMC Drive").arg(storagesize); } } else if (queryDeviceInterface(Solid::DeviceInterface::StorageVolume)) { const StorageVolume storageIface(const_cast(this)); @@ -433,25 +433,25 @@ QString UDevDevice::description() const } return desc; } else if (queryDeviceInterface(Solid::DeviceInterface::AcAdapter)) { - return QObject::tr("A/C Adapter"); + return i18n("A/C Adapter"); } else if (queryDeviceInterface(Solid::DeviceInterface::Battery)) { const QString powersupplytechnology(deviceProperty("POWER_SUPPLY_TECHNOLOGY")); if (powersupplytechnology == QLatin1String("NiMH")) { - return QObject::tr("Nickel Metal Hydride Battery"); + return i18n("Nickel Metal Hydride Battery"); } else if (powersupplytechnology == QLatin1String("Li-ion")) { - return QObject::tr("Lithium Ion Battery"); + return i18n("Lithium Ion Battery"); } else if (powersupplytechnology == QLatin1String("Li-poly")) { - return QObject::tr("Lithium Polymer Battery"); + return i18n("Lithium Polymer Battery"); } else if (powersupplytechnology == QLatin1String("LiFe")) { - return QObject::tr("Lithium Iron Disulfide Battery"); + return i18n("Lithium Iron Disulfide Battery"); } else if (powersupplytechnology == QLatin1String("NiCd")) { - return QObject::tr("Nickel Cadmium Battery"); + return i18n("Nickel Cadmium Battery"); } else if (powersupplytechnology == QLatin1String("LiMn")) { - return QObject::tr("Lithium Manganese Dioxide Battery"); + return i18n("Lithium Manganese Dioxide Battery"); } - return QObject::tr("Unknown Battery"); + return i18n("Unknown Battery"); } else if (queryDeviceInterface(Solid::DeviceInterface::Processor)) { - return QObject::tr("Processor"); + return i18n("Processor"); } else if (queryDeviceInterface(Solid::DeviceInterface::PortableMediaPlayer)) { /* * HACK: As Media player is very generic return the device product instead @@ -462,10 +462,10 @@ QString UDevDevice::description() const return product(); } else { // TODO: check out special cases like iPod - return QObject::tr("Portable Media Player"); + return i18n("Portable Media Player"); } } else if (queryDeviceInterface(Solid::DeviceInterface::Camera)) { - return QObject::tr("Camera"); + return i18n("Camera"); } else if (queryDeviceInterface(Solid::DeviceInterface::Video)) { return product(); } else if (queryDeviceInterface(Solid::DeviceInterface::AudioInterface)) { @@ -473,26 +473,26 @@ QString UDevDevice::description() const } else if (queryDeviceInterface(Solid::DeviceInterface::NetworkInterface)) { const NetworkInterface networkIface(const_cast(this)); if (networkIface.isWireless()) { - return QObject::tr("WLAN Interface"); + return i18n("WLAN Interface"); } - return QObject::tr("Networking Interface"); + return i18n("Networking Interface"); } else if (queryDeviceInterface(Solid::DeviceInterface::Button)) { const Button buttonIface(const_cast(this)); switch (buttonIface.type()) { case Solid::Button::LidButton: - return QObject::tr("Lid Switch"); + return i18n("Lid Switch"); case Solid::Button::PowerButton: - return QObject::tr("Power Button"); + return i18n("Power Button"); case Solid::Button::SleepButton: - return QObject::tr("Sleep Button"); + return i18n("Sleep Button"); case Solid::Button::TabletButton: - return QObject::tr("Tablet Button"); + return i18n("Tablet Button"); case Solid::Button::UnknownButtonType: - return QObject::tr("Unknown Button"); + return i18n("Unknown Button"); } return QString(); } else if (queryDeviceInterface(Solid::DeviceInterface::Graphic)) { - return QObject::tr("Graphic display"); + return i18n("Graphic display"); } return QString(); diff --git a/solid/solid/deviceinterface.cpp b/solid/solid/deviceinterface.cpp index 135acf8f..fa08defc 100644 --- a/solid/solid/deviceinterface.cpp +++ b/solid/solid/deviceinterface.cpp @@ -20,11 +20,10 @@ #include "deviceinterface.h" #include "deviceinterface_p.h" +#include "solid/ifaces/deviceinterface.h" +#include "klocale.h" -#include - -#include - +#include Solid::DeviceInterface::DeviceInterface(DeviceInterfacePrivate &dd, QObject *backendObject) : d_ptr(&dd) @@ -66,39 +65,39 @@ QString Solid::DeviceInterface::typeDescription(Type type) switch (type) { case Unknown: - return QObject::tr("Unknown"); + return i18n("Unknown"); case Processor: - return QObject::tr("Processor"); + return i18n("Processor"); case Block: - return QObject::tr("Block"); + return i18n("Block"); case StorageAccess: - return QObject::tr("Storage Access"); + return i18n("Storage Access"); case StorageDrive: - return QObject::tr("Storage Drive"); + return i18n("Storage Drive"); case OpticalDrive: - return QObject::tr("Optical Drive"); + return i18n("Optical Drive"); case StorageVolume: - return QObject::tr("Storage Volume"); + return i18n("Storage Volume"); case OpticalDisc: - return QObject::tr("Optical Disc"); + return i18n("Optical Disc"); case Camera: - return QObject::tr("Camera"); + return i18n("Camera"); case PortableMediaPlayer: - return QObject::tr("Portable Media Player"); + return i18n("Portable Media Player"); case NetworkInterface: - return QObject::tr("Network Interface"); + return i18n("Network Interface"); case AcAdapter: - return QObject::tr("Ac Adapter"); + return i18n("Ac Adapter"); case Battery: - return QObject::tr("Battery"); + return i18n("Battery"); case Button: - return QObject::tr("Button"); + return i18n("Button"); case AudioInterface: - return QObject::tr("Audio Interface"); + return i18n("Audio Interface"); case Video: - return QObject::tr("Video"); + return i18n("Video"); case Graphic: - return QObject::tr("Graphic"); + return i18n("Graphic"); case Last: return QString(); } diff --git a/solid/solid/solidnamespace.cpp b/solid/solid/solidnamespace.cpp index 4977158e..0560e761 100644 --- a/solid/solid/solidnamespace.cpp +++ b/solid/solid/solidnamespace.cpp @@ -19,6 +19,10 @@ */ #include "solidnamespace.h" +#include "kglobal.h" +#include "klocale.h" + +static const KCatalogLoader loader("solid_qt"); static int registerSolidMetaTypes() { @@ -33,19 +37,19 @@ QString Solid::errorString(const ErrorType error) case Solid::NoError: return QString(); case Solid::UnauthorizedOperation: - return QObject::tr("Unauthorized operation"); + return i18n("Unauthorized operation"); case Solid::DeviceBusy: - return QObject::tr("Device is busy"); + return i18n("Device is busy"); case Solid::OperationFailed: - return QObject::tr("Operation failed"); + return i18n("Operation failed"); case Solid::UserCanceled: - return QObject::tr("Canceled by user"); + return i18n("Canceled by user"); case Solid::InvalidOption: - return QObject::tr("Invalid option"); + return i18n("Invalid option"); case Solid::MissingDriver: - return QObject::tr("Missing driver"); + return i18n("Missing driver"); case Solid::Insecure: - return QObject::tr("The filesystem type has been deemed insecure"); + return i18n("The filesystem type has been deemed insecure"); } return QString(); }