Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 19:02:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/fluxer/kdelibs into devinfo

Browse source
This commit is contained in:
Ivailo Monev 2021-07-05 23:01:42 +00:00
commit cffcb74232
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
kdecore/localization/klocalizedstring.cpp
View file

@ -89,7 +89,7 @@ public:
}
};
K_GLOBAL_STATIC(KLocalizedStringPrivateStatics, staticsKLSP)
Q_GLOBAL_STATIC(QMutex, staticsKLSPLock)
Q_GLOBAL_STATIC(QMutex, staticsKLSPMutex)
KLocalizedString::KLocalizedString ()
: d(new KLocalizedStringPrivate)
@ -212,21 +212,13 @@ QString KLocalizedStringPrivate::toString (const KLocale *locale,
QString KLocalizedStringPrivate::selectForEnglish () const
{
QString trans;
if (!plural.isEmpty()) {
if (number == 1) {
trans = QString::fromUtf8(msg);
}
else {
trans = QString::fromUtf8(plural);
return QString::fromUtf8(msg);
}
return QString::fromUtf8(plural);
}
else {
trans = QString::fromUtf8(msg);
}
return trans;
return QString::fromUtf8(msg);
}
QString KLocalizedStringPrivate::substituteSimple (const QString &trans,
@ -357,7 +349,7 @@ QString KLocalizedStringPrivate::postFormat (const QString &text,
const QString &lang,
const QString &ctxt) const
{
QMutexLocker lock(staticsKLSPLock());
QMutexLocker lock(staticsKLSPMutex());
const KLocalizedStringPrivateStatics *s = staticsKLSP;
// Transform any semantic markup into visual formatting.
if (s->formatters.contains(lang)) {
@ -537,7 +529,7 @@ KLocalizedString ki18ncp (const char* ctxt,
void KLocalizedString::notifyCatalogsUpdated (const QStringList &languages,
const QList<KCatalogName> &catalogs)
{
QMutexLocker lock(staticsKLSPLock());
QMutexLocker lock(staticsKLSPMutex());
if (staticsKLSP.isDestroyed()) {
return;
}