X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fgettext.c;h=4df641a28e7ce01f4eb1a8fda82878ae59140fa1;hb=faa7bc4175fa88b5fd6548b2e92cdc5497dfe692;hp=145b7b598fc178d9c80548ecae191b8a6e8f48be;hpb=a13d1d34c6f9bb9b2ffd448e177200151ce42e79;p=citadel.git diff --git a/webcit/gettext.c b/webcit/gettext.c index 145b7b598..4df641a28 100644 --- a/webcit/gettext.c +++ b/webcit/gettext.c @@ -1,19 +1,13 @@ /* - * Copyright (c) 1996-2010 by the citadel.org team + * Copyright (c) 1996-2012 by the citadel.org team * * This program is open source software. You can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 3 of the - * License, or (at your option) any later version. + * modify it under the terms of the GNU General Public License version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "webcit.h" @@ -33,12 +27,19 @@ const char *AvailLang[] = { "en_GB", "es_ES", "et_EE", + "fi_FI", "fr_FR", "hu_HU", "it_IT", "nl_NL", "pt_BR", "ru_RU", + "zh_CN", + "he_IL", + "kk_KK", + "ro_RO", + "sl_SL", + "tr_TR", "" }; @@ -46,16 +47,16 @@ const char **AvailLangLoaded; long nLocalesLoaded = 0; #ifdef HAVE_USELOCALE -locale_t *wc_locales; /**< here we keep the parsed stuff */ +locale_t *wc_locales; /* here we keep the parsed stuff */ #endif /* Keep information about one locale */ typedef struct _lang_pref{ - char lang[16]; /**< the language locale string */ - char region[16]; /**< the region locale string */ - long priority; /**< which priority does it have */ - int availability; /**< do we know it? */ - int selectedlang; /**< is this the selected language? */ + char lang[16]; /* the language locale string */ + char region[16]; /* the region locale string */ + long priority; /* which priority does it have */ + int availability; /* do we know it? */ + int selectedlang; /* is this the selected language? */ } LangStruct; /* parse browser locale header @@ -102,37 +103,40 @@ void httplang_to_locale(StrBuf *LocaleString, wcsession *sess) ls = &wanted_locales[i]; StrBufExtract_token(Buf, LocaleString, i, ','); - /** we are searching, if this list item has something like ;q=n*/ + /* we are searching, if this list item has something like ;q=n*/ if (StrBufNum_tokens(Buf, '=') > 1) { int sbuflen, k; StrBufExtract_token(SBuf, Buf, 1, '='); sbuflen = StrLength(SBuf); - for (k = 0; k < sbuflen; k++) - if (ChrPtr(SBuf)[k] == '.') + for (k = 0; k < sbuflen; k++) { + if (ChrPtr(SBuf)[k] == '.') { StrBufPeek(SBuf, NULL, k, '0'); + } + } ls->priority = StrTol(SBuf); } else { ls->priority = 1000; } - /** get the locale part */ + /* get the locale part */ StrBufExtract_token(SBuf, Buf, 0, ';'); - /** get the lang part, which should be allways there */ + /* get the lang part, which should be allways there */ extract_token(&ls->lang[0], ChrPtr(SBuf), 0, '-', sizeof(ls->lang)); - /** get the area code if any. */ + /* get the area code if any. */ if (StrBufNum_tokens(SBuf, '-') > 1) { extract_token(&ls->region[0], ChrPtr(SBuf), 1, '-', - sizeof(ls->region)); + sizeof(ls->region) + ); } - else { /** no ara code? use lang code */ + else { /* no ara code? use lang code */ blen=strlen(&ls->lang[0]); memcpy(&ls->region[0], ls->lang, blen); ls->region[blen] = '\0'; @@ -144,7 +148,7 @@ void httplang_to_locale(StrBuf *LocaleString, wcsession *sess) { int chars; chars = toupper(ls->region[j]); - ls->region[j] = (char)chars;/** \todo ?! */ + ls->region[j] = (char)chars; /* todo ? */ } snprintf(&lbuf[0], sizeof(lbuf), @@ -152,18 +156,18 @@ void httplang_to_locale(StrBuf *LocaleString, wcsession *sess) &ls->lang[0], &ls->region[0]); - /** check if we have this lang */ + /* check if we have this lang */ ls->availability = 1; ls->selectedlang = -1; for (j = 0; j < nLocalesLoaded; j++) { int result; - /** match against the LANG part */ + /* match against the LANG part */ result = strcasecmp(&ls->lang[0], AvailLangLoaded[j]); if ((result < 0) && (result < ls->availability)){ ls->availability = result; ls->selectedlang = j; } - /** match against lang and locale */ + /* match against lang and locale */ if (0 == strcasecmp(&lbuf[0], AvailLangLoaded[j])){ ls->availability = 0; ls->selectedlang = j; @@ -177,25 +181,27 @@ void httplang_to_locale(StrBuf *LocaleString, wcsession *sess) nBest = -1; for (i = 0; ((i < nParts) && (iavailability <= 0) && - (av < ls->availability) && - (prio < ls->priority) && - (ls->selectedlang != -1)) { + if ( (ls->availability <= 0) + && (av < ls->availability) + && (prio < ls->priority) + && (ls->selectedlang != -1) + ) { nBest = ls->selectedlang; av = ls->availability; prio = ls->priority; } } if (nBest == -1) { - /** fall back to C */ + /* fall back to C */ nBest=0; } sess->selected_language = nBest; - syslog(9, "language found: %s\n", AvailLangLoaded[WC->selected_language]); + syslog(9, "language found: %s", AvailLangLoaded[WC->selected_language]); FreeStrBuf(&Buf); FreeStrBuf(&SBuf); } + /* * show the language chooser on the login dialog * depending on the browser locale change the sequence of the @@ -203,26 +209,12 @@ void httplang_to_locale(StrBuf *LocaleString, wcsession *sess) */ void tmplput_offer_languages(StrBuf *Target, WCTemplputParams *TP) { +#ifdef HAVE_USELOCALE int i; -#ifndef HAVE_USELOCALE - char *Lang = getenv("LANG"); - - if (Lang == NULL) - Lang = "C"; -#endif - - if (nLocalesLoaded == 1) { - wc_printf("

%s

", AvailLangLoaded[0]); - return; - } - - wc_printf("\n"); for (i=0; i < nLocalesLoaded; ++i) { -#ifndef HAVE_USELOCALE - if (strcmp(AvailLangLoaded[i], Lang) == 0) -#endif wc_printf("\n", ((WC->selected_language == i) ? "selected" : ""), AvailLangLoaded[i], @@ -231,6 +223,9 @@ void tmplput_offer_languages(StrBuf *Target, WCTemplputParams *TP) } wc_printf("\n"); +#else + wc_printf("%s", (getenv("LANG") ? getenv("LANG") : "C")); +#endif } /* @@ -242,6 +237,7 @@ void set_selected_language(const char *lang) { for (i = 0; iselected_language = i; + break; } } #endif @@ -254,8 +250,8 @@ void go_selected_language(void) { #ifdef HAVE_USELOCALE wcsession *WCC = WC; if (WCC->selected_language < 0) return; - uselocale(wc_locales[WCC->selected_language]); /** switch locales */ - textdomain(textdomain(NULL)); /** clear the cache */ + uselocale(wc_locales[WCC->selected_language]); /* switch locales */ + textdomain(textdomain(NULL)); /* clear the cache */ #else char *language; @@ -269,14 +265,11 @@ void go_selected_language(void) { */ void stop_selected_language(void) { #ifdef HAVE_USELOCALE - uselocale(LC_GLOBAL_LOCALE); /** switch locales */ - textdomain(textdomain(NULL)); /** clear the cache */ + uselocale(LC_GLOBAL_LOCALE); /* switch locales */ + textdomain(textdomain(NULL)); /* clear the cache */ #endif } -#ifdef HAVE_USELOCALE - locale_t Empty_Locale; -#endif /* * Create a locale_t for each available language @@ -284,10 +277,14 @@ void stop_selected_language(void) { void initialize_locales(void) { int nLocales; int i; - char buf[32]; char *language = NULL; - char *locale; +#ifdef ENABLE_NLS + setlocale(LC_ALL, ""); + syslog(9, "Text domain: %s", textdomain("webcit")); + syslog(9, "Message catalog directory: %s", bindtextdomain(textdomain(NULL), LOCALEDIR"/locale")); + syslog(9, "Text domain Charset: %s", bind_textdomain_codeset("webcit","UTF8")); +#endif nLocales = 0; while (!IsEmptyStr(AvailLang[nLocales])) @@ -295,7 +292,7 @@ void initialize_locales(void) { language = getenv("WEBCIT_LANG"); if ((language) && (!IsEmptyStr(language)) && (strcmp(language, "UNLIMITED") != 0)) { - syslog(9, "Nailing locale to %s\n", language); + syslog(9, "Nailing locale to %s", language); } else language = NULL; @@ -304,76 +301,52 @@ void initialize_locales(void) { #ifdef HAVE_USELOCALE wc_locales = malloc (sizeof(locale_t) * nLocales); memset(wc_locales,0, sizeof(locale_t) * nLocales); - /* create default locale */ - Empty_Locale = newlocale(LC_ALL_MASK, NULL, NULL); + wc_locales[0] = newlocale(LC_ALL_MASK, NULL, NULL); #endif - - - - for (i = 0; i < nLocales; ++i) { - if ((language != NULL) && (strcmp(AvailLang[i], language) != 0)) - continue; - if (i == 0) { - sprintf(buf, "%s", AvailLang[i]); /* locale 0 (C) is ascii, not utf-8 */ - } - else { - sprintf(buf, "%s.UTF8", AvailLang[i]); - } + for (i = 1; i < nLocales; ++i) { #ifdef HAVE_USELOCALE wc_locales[nLocalesLoaded] = newlocale( (LC_MESSAGES_MASK|LC_TIME_MASK), - buf, - (((i > 0) && (wc_locales[0] != NULL)) ? wc_locales[0] : Empty_Locale) + AvailLang[i], + wc_locales[0] ); if (wc_locales[nLocalesLoaded] == NULL) { - syslog(1, "locale for "LOCALEDIR"locale/%s: %s; disabled\n", - buf, - strerror(errno) + syslog(1, "locale for %s disabled: %s (domain: %s, path: %s)", + AvailLang[i], + strerror(errno), + textdomain(NULL), + bindtextdomain(textdomain(NULL), NULL) ); } else { - syslog(3, "Found locale: %s\n", buf); + syslog(3, "Found locale: %s", AvailLang[i]); AvailLangLoaded[nLocalesLoaded] = AvailLang[i]; nLocalesLoaded++; } #else if ((language != NULL) && (strcmp(language, AvailLang[i]) == 0)) { - setenv("LANG", buf, 1); + setenv("LANG", AvailLang[i], 1); AvailLangLoaded[nLocalesLoaded] = AvailLang[i]; setlocale(LC_MESSAGES, AvailLang[i]); nLocalesLoaded++; } else if (nLocalesLoaded == 0) { - setenv("LANG", buf, 1); + setenv("LANG", AvailLang[i], 1); AvailLangLoaded[nLocalesLoaded] = AvailLang[i]; nLocalesLoaded++; } #endif } if ((language != NULL) && (nLocalesLoaded == 0)) { - syslog(1, "Your selected locale [%s] isn't available on your system. falling back to C\n", language); -#ifdef HAVE_USELOCALE - wc_locales[0] = newlocale( - (LC_MESSAGES_MASK|LC_TIME_MASK), - AvailLang[0], - Empty_Locale); -#else + syslog(1, "Your selected locale [%s] isn't available on your system. falling back to C", language); +#ifndef HAVE_USELOCALE setlocale(LC_MESSAGES, AvailLang[0]); setenv("LANG", AvailLang[0], 1); #endif AvailLangLoaded[0] = AvailLang[0]; nLocalesLoaded = 1; } - -#ifdef ENABLE_NLS - locale = setlocale(LC_ALL, ""); - - syslog(9, "Message catalog directory: %s\n", bindtextdomain("webcit", LOCALEDIR"/locale")); - syslog(9, "Text domain: %s\n", textdomain("webcit")); - syslog(9, "Text domain Charset: %s\n", bind_textdomain_codeset("webcit","UTF8")); - -#endif } @@ -384,8 +357,7 @@ ServerShutdownModule_GETTEXT #ifdef HAVE_USELOCALE int i; for (i = 0; i < nLocalesLoaded; ++i) { - if (Empty_Locale != wc_locales[i]) - freelocale(wc_locales[i]); + freelocale(wc_locales[i]); } free(wc_locales); #endif @@ -394,7 +366,9 @@ ServerShutdownModule_GETTEXT #else /* ENABLE_NLS */ const char *AvailLang[] = { - "C", ""}; + "C", + "" +}; /* dummy for non NLS enabled systems */ void tmplput_offer_languages(StrBuf *Target, WCTemplputParams *TP) @@ -448,6 +422,7 @@ void Header_HandleAcceptLanguage(StrBuf *Line, ParsedHttpHdrs *hdr) hdr->HR.browser_language = Line; } + void InitModule_GETTEXT (void) @@ -467,8 +442,10 @@ SessionNewModule_GETTEXT (wcsession *sess) { #ifdef ENABLE_NLS - if (!sess->Hdr->HR.Static && - (sess->Hdr->HR.browser_language != NULL)) { + if ( (sess != NULL) + && (!sess->Hdr->HR.Static) + && (sess->Hdr->HR.browser_language != NULL) + ) { httplang_to_locale(sess->Hdr->HR.browser_language, sess); } #endif