X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fgettext.c;h=f1b2f8a2713b109aa2912da3ddfd37e9c34fd179;hb=3892cdfd49dcf859d9cdcb504a3542843f408097;hp=58facf12135de46e1d5509b570630fe439d4aace;hpb=872126a0434d55d26d5c337673e33f61f60427c3;p=citadel.git diff --git a/webcit/gettext.c b/webcit/gettext.c index 58facf121..f1b2f8a27 100644 --- a/webcit/gettext.c +++ b/webcit/gettext.c @@ -1,5 +1,19 @@ /* - * $Id$ + * Copyright (c) 1996-2011 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. + * + * 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" @@ -10,18 +24,27 @@ /* actual supported locales */ const char *AvailLang[] = { "C", + "bg_BG", + "cs_CZ", "en_US", + "da_DK", "de_DE", - "it_IT", - "es_ES", + "el_GR", "en_GB", - "da_DK", + "es_ES", + "et_EE", + "fi_FI", "fr_FR", + "hu_HU", + "it_IT", "nl_NL", "pt_BR", - "hu_HU", - "et_EE", "ru_RU", + "zh_CN", + "he_IL", + "kk_KK", + "ro_RO", + "sl_SL", "" }; @@ -32,7 +55,7 @@ long nLocalesLoaded = 0; locale_t *wc_locales; /**< here we keep the parsed stuff */ #endif -/** Keep information about one locale */ +/* Keep information about one locale */ typedef struct _lang_pref{ char lang[16]; /**< the language locale string */ char region[16]; /**< the region locale string */ @@ -41,15 +64,15 @@ typedef struct _lang_pref{ int selectedlang; /**< is this the selected language? */ } LangStruct; -/* \brief parse browser locale header - * seems as most browsers just do a one after coma value even if more than 10 locales are available. Sample strings: +/* parse browser locale header + * + * seems as most browsers just do a one after comma value even if more than 10 locales are available. Sample strings: * opera: * Accept-Language: sq;q=1.0,de;q=0.9,as;q=0.8,ar;q=0.7,bn;q=0.6,zh-cn;q=0.5,kn;q=0.4,ch;q=0.3,fo;q=0.2,gn;q=0.1,ce;q=0.1,ie;q=0.1 * Firefox * Accept-Language: 'de-de,en-us;q=0.7,en;q=0.3' * Accept-Language: de,en-ph;q=0.8,en-us;q=0.5,de-at;q=0.3 * Accept-Language: de,en-us;q=0.9,it;q=0.9,de-de;q=0.8,en-ph;q=0.7,de-at;q=0.7,zh-cn;q=0.6,cy;q=0.5,ar-om;q=0.5,en-tt;q=0.4,xh;q=0.3,nl-be;q=0.3,cs;q=0.2,sv;q=0.1,tk;q=0.1 - * \param LocaleString the string from the browser http headers */ void httplang_to_locale(StrBuf *LocaleString, wcsession *sess) @@ -121,7 +144,7 @@ void httplang_to_locale(StrBuf *LocaleString, wcsession *sess) ls->region[blen] = '\0'; } - /** area codes are uppercase */ + /* area codes are uppercase */ blen = strlen(&ls->region[0]); for (j = 0; j < blen; j++) { @@ -174,13 +197,13 @@ void httplang_to_locale(StrBuf *LocaleString, wcsession *sess) nBest=0; } sess->selected_language = nBest; - lprintf(9, "language found: %s\n", AvailLangLoaded[WC->selected_language]); + syslog(9, "language found: %s\n", AvailLangLoaded[WC->selected_language]); FreeStrBuf(&Buf); FreeStrBuf(&SBuf); } -/** - * \brief show the language chooser on the login dialog +/* + * show the language chooser on the login dialog * depending on the browser locale change the sequence of the * language chooser. */ @@ -200,7 +223,7 @@ void tmplput_offer_languages(StrBuf *Target, WCTemplputParams *TP) return; } - wc_printf("\n"); for (i=0; i < nLocalesLoaded; ++i) { #ifndef HAVE_USELOCALE @@ -216,9 +239,8 @@ void tmplput_offer_languages(StrBuf *Target, WCTemplputParams *TP) wc_printf("\n"); } -/** - * \brief Set the selected language for this session. - * \param lang the locale to set. +/* + * Set the selected language for this session. */ void set_selected_language(const char *lang) { #ifdef HAVE_USELOCALE @@ -231,8 +253,8 @@ void set_selected_language(const char *lang) { #endif } -/** - * \brief Activate the selected language for this session. +/* + * Activate the selected language for this session. */ void go_selected_language(void) { #ifdef HAVE_USELOCALE @@ -248,8 +270,8 @@ void go_selected_language(void) { #endif } -/** - * \brief Deactivate the selected language for this session. +/* + * Deactivate the selected language for this session. */ void stop_selected_language(void) { #ifdef HAVE_USELOCALE @@ -262,16 +284,14 @@ void stop_selected_language(void) { locale_t Empty_Locale; #endif -/** - * \brief Create a locale_t for each available language +/* + * Create a locale_t for each available language */ void initialize_locales(void) { int nLocales; int i; char buf[32]; char *language = NULL; - char *locale; - nLocales = 0; while (!IsEmptyStr(AvailLang[nLocales])) @@ -279,7 +299,7 @@ void initialize_locales(void) { language = getenv("WEBCIT_LANG"); if ((language) && (!IsEmptyStr(language)) && (strcmp(language, "UNLIMITED") != 0)) { - lprintf(9, "Nailing locale to %s\n", language); + syslog(9, "Nailing locale to %s\n", language); } else language = NULL; @@ -311,13 +331,13 @@ void initialize_locales(void) { (((i > 0) && (wc_locales[0] != NULL)) ? wc_locales[0] : Empty_Locale) ); if (wc_locales[nLocalesLoaded] == NULL) { - lprintf(1, "locale for "LOCALEDIR"locale/%s: %s; disabled\n", + syslog(1, "locale for "LOCALEDIR"locale/%s: %s; disabled\n", buf, strerror(errno) ); } else { - lprintf(3, "Found locale: %s\n", buf); + syslog(3, "Found locale: %s\n", buf); AvailLangLoaded[nLocalesLoaded] = AvailLang[i]; nLocalesLoaded++; } @@ -336,7 +356,7 @@ void initialize_locales(void) { #endif } if ((language != NULL) && (nLocalesLoaded == 0)) { - lprintf(1, "Your selected locale [%s] isn't available on your system. falling back to C\n", language); + 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), @@ -349,17 +369,13 @@ void initialize_locales(void) { AvailLangLoaded[0] = AvailLang[0]; nLocalesLoaded = 1; } -#ifndef HAVE_USELOCALE - - -#endif #ifdef ENABLE_NLS - locale = setlocale(LC_ALL, ""); + /*locale = */setlocale(LC_ALL, ""); - lprintf(9, "Message catalog directory: %s\n", bindtextdomain("webcit", LOCALEDIR"/locale")); - lprintf(9, "Text domain: %s\n", textdomain("webcit")); - lprintf(9, "Text domain Charset: %s\n", bind_textdomain_codeset("webcit","UTF8")); + 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,24 +400,27 @@ ServerShutdownModule_GETTEXT const char *AvailLang[] = { "C", ""}; -/** \brief dummy for non NLS enabled systems */ +/* dummy for non NLS enabled systems */ void tmplput_offer_languages(StrBuf *Target, WCTemplputParams *TP) { wc_printf("English (US)"); } -/** \brief dummy for non NLS enabled systems */ -void set_selected_language(char *lang) { +/* dummy for non NLS enabled systems */ +void set_selected_language(const char *lang) { } -/** \brief dummy for non NLS enabled systems */ +/* dummy for non NLS enabled systems */ void go_selected_language(void) { } -/** \brief dummy for non NLS enabled systems */ +/* dummy for non NLS enabled systems */ void stop_selected_language(void) { } +void initialize_locales(void) { +} + #endif /* ENABLE_NLS */ @@ -433,6 +452,7 @@ void Header_HandleAcceptLanguage(StrBuf *Line, ParsedHttpHdrs *hdr) hdr->HR.browser_language = Line; } + void InitModule_GETTEXT (void) @@ -452,8 +472,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