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

kdecore: bind text domain once from KCatalog constructor

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-05-30 17:15:25 +03:00
parent 92f1429bb8
commit 3bee5ef4a1
1 changed files with 16 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
kdecore/localization/kcatalog.cpp
View file

@ -52,24 +52,15 @@ static QByteArray gettextHack(const char* const msgctxt, const char* const msgid
class KCatalogPrivate
{
public:
KCatalogPrivate()
#ifdef HAVE_LIBINTL
: bindDone(false)
#endif
{}
QByteArray language;
QByteArray name;
QByteArray localeDir;
#ifdef HAVE_LIBINTL
QByteArray systemLanguage;
bool bindDone;
static QByteArray currentLanguage;
void setupGettextEnv ();
void resetSystemLanguage ();
void setupGettextEnv();
void resetSystemLanguage();
#endif
};
@ -78,28 +69,27 @@ QDebug operator<<(QDebug debug, const KCatalog &c)
return debug << c.d->language << " " << c.d->name << " " << c.d->localeDir;
}
#ifdef HAVE_LIBINTL
QByteArray KCatalogPrivate::currentLanguage;
#endif
KCatalog::KCatalog(const QString & name, const QString & language )
KCatalog::KCatalog(const QString &name, const QString &language)
: d( new KCatalogPrivate )
{
setlocale(LC_ALL, "");
// Find locale directory for this catalog.
QString localeDir = catalogLocaleDir( name, language );
QString localeDir = catalogLocaleDir(name, language);
d->language = QFile::encodeName( language );
d->name = QFile::encodeName( name );
d->localeDir = QFile::encodeName( localeDir );
d->language = QFile::encodeName(language);
d->name = QFile::encodeName(name);
d->localeDir = QFile::encodeName(localeDir);
#ifdef HAVE_LIBINTL
// Always get translations in UTF-8, regardless of user's environment.
bind_textdomain_codeset( d->name, "UTF-8" );
// Point Gettext to current language, recording system value for recovery.
d->systemLanguage = qgetenv("LANGUAGE");
// Invalidate current language, to trigger binding at next translate call.
KCatalogPrivate::currentLanguage.clear();
// Always get translations in UTF-8, regardless of user's environment.
bind_textdomain_codeset(d->name.constData(), "UTF-8");
//kDebug() << << name << language << localeDir;
bindtextdomain(d->name.constData(), d->localeDir.constData());
#endif
}
@ -145,37 +135,15 @@ QString KCatalog::localeDir() const
}
#ifdef HAVE_LIBINTL
void KCatalogPrivate::setupGettextEnv ()
void KCatalogPrivate::setupGettextEnv()
{
// Point Gettext to current language, recording system value for recovery.
systemLanguage = qgetenv("LANGUAGE");
if (systemLanguage != language) {
if (language != systemLanguage) {
// it is enough to change the string set there.
char langenv[langenvMaxlen];
::memset(langenv, 0, langenvMaxlen * sizeof(char));
snprintf(langenv, langenvMaxlen, "LANGUAGE=%s", language.constData());
putenv(strdup(langenv));
}
// Rebind text domain if language actually changed from the last time,
// as locale directories may differ for different languages of same catalog.
if (language != currentLanguage || !bindDone) {
currentLanguage = language;
bindDone = true;
//kDebug() << "bindtextdomain" << name << localeDir;
bindtextdomain(name, localeDir);
#ifdef __GLIBC__
// Magic to make sure Gettext doesn't use stale cached translation
// from previous language.
extern int _nl_msg_cat_cntr;
++_nl_msg_cat_cntr;
#else
#warning is the catalog workaround needed?
#endif
}
}
void KCatalogPrivate::resetSystemLanguage ()