nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix compiling with --disable-nls

Browse source
This commit is contained in:
Dana Jansens 2002-05-23 15:11:41 +00:00
parent d03852ad25
commit ac62af410d
1 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/i18n.cc
View file

@ -87,13 +87,17 @@ I18n::~I18n() {
} }
void I18n::openCatalog(const char *catalog) {
#if defined(NLS) && defined(HAVE_CATOPEN) #if defined(NLS) && defined(HAVE_CATOPEN)
string catalog_filename = LOCALEPATH; void I18n::openCatalog(const char *catalog) {
catalog_filename += '/'; int lp = strlen(LOCALEPATH), lc = strlen(locale),
catalog_filename += locale; ct = strlen(catalog), len = lp + lc + ct + 3;
catalog_filename += '/'; catalog_filename = new char[len];
catalog_filename += catalog;
strncpy(catalog_filename, LOCALEPATH, lp);
*(catalog_filename + lp) = '/';
strncpy(catalog_filename + lp + 1, locale, lc);
*(catalog_filename + lp + lc + 1) = '/';
strncpy(catalog_filename + lp + lc + 2, catalog, ct + 1);
# ifdef MCLoadBySet # ifdef MCLoadBySet
catalog_fd = catopen(catalog_filename.c_str(), MCLoadBySet); catalog_fd = catopen(catalog_filename.c_str(), MCLoadBySet);
@ -103,14 +107,23 @@ void I18n::openCatalog(const char *catalog) {
if (catalog_fd == (nl_catd) -1) if (catalog_fd == (nl_catd) -1)
fprintf(stderr, "failed to open catalog, using default messages\n"); fprintf(stderr, "failed to open catalog, using default messages\n");
#endif // HAVE_CATOPEN
} }
#else // !HAVE_CATOPEN
void I18n::openCatalog(const char *) {
catalog_filename = (char *) 0;
}
#endif // HAVE_CATOPEN
const char* I18n::operator()(int set, int msg, const char *msgString) const {
#if defined(NLS) && defined(HAVE_CATGETS) #if defined(NLS) && defined(HAVE_CATGETS)
const char *I18n::getMessage(int set, int msg, const char *msgString) const {
if (catalog_fd != (nl_catd) -1) if (catalog_fd != (nl_catd) -1)
return catgets(catalog_fd, set, msg, msgString); return catgets(catalog_fd, set, msg, msgString);
else else
#endif
return msgString; return msgString;
} }
#else
const char *I18n::getMessage(int, int, const char *msgString) const {
return msgString;
}
#endif