GETTEXT: represent C as en_US to the user - no one speaks C that fluently after all ;-)

[citadel.git] / webcit / gettext.c

diff --git a/webcit/gettext.c b/webcit/gettext.c
index 58a0edd8d78bb48437893ecab62f4a47ccf37ab4..acb0331ce74ae6bbe19eb5fc9a8b38f306a4ad5d 100644 (file)
--- a/webcit/gettext.c
+++ b/webcit/gettext.c
@@ -17,7 +17,8 @@
 #ifdef ENABLE_NLS
 /* actual supported locales */
 const char *AvailLang[] = {
-       "C",
+       "en_US",
+       "ar_AE",
        "bg_BG",
        "cs_CZ",
        "en_US",
@@ -51,7 +52,7 @@ locale_t *wc_locales; /* here we keep the parsed stuff */
 #endif
 
 /* Keep information about one locale */
-typedef struct _lang_pref{
+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 */
@@ -196,7 +197,7 @@ void httplang_to_locale(StrBuf *LocaleString, wcsession *sess)
                nBest=0;
        }
        sess->selected_language = nBest;
-       syslog(9, "language found: %s", AvailLangLoaded[WC->selected_language]);
+       syslog(LOG_DEBUG, "language found: %s", AvailLangLoaded[WC->selected_language]);
        FreeStrBuf(&Buf);
        FreeStrBuf(&SBuf);
 }
@@ -293,20 +294,13 @@ void initialize_locales(void) {
        char buf[32];
        char *language = NULL;
 
-#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]))
                nLocales++;
 
        language = getenv("WEBCIT_LANG");
        if ((language) && (!IsEmptyStr(language)) && (strcmp(language, "UNLIMITED") != 0)) {
-               syslog(9, "Nailing locale to %s", language);
+               syslog(LOG_INFO, "Nailing locale to %s", language);
        }
        else language = NULL;
 
@@ -323,7 +317,8 @@ void initialize_locales(void) {
                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 */
+                       sprintf(buf, "C");      /* locale 0 (C) is ascii, not utf-8 */
+                       
                }
                else {
                        sprintf(buf, "%s.UTF8", AvailLang[i]);
@@ -332,18 +327,13 @@ void initialize_locales(void) {
                wc_locales[nLocalesLoaded] = newlocale(
                        (LC_MESSAGES_MASK|LC_TIME_MASK),
                        buf,
-                       Empty_Locale
+                       (((i > 0) && (wc_locales[0] != NULL)) ? wc_locales[0] : Empty_Locale)
                );
                if (wc_locales[nLocalesLoaded] == NULL) {
-                       syslog(1, "locale for %s disabled: %s (domain: %s, path: %s)",
-                               buf,
-                               strerror(errno),
-                               textdomain(NULL),
-                               bindtextdomain(textdomain(NULL), NULL)
-                       );
+                       syslog(LOG_NOTICE, "locale for %s disabled: %s", buf, strerror(errno));
                }
                else {
-                       syslog(3, "Found locale: %s", buf);
+                       syslog(LOG_INFO, "Found locale: %s - %s", buf, AvailLang[i]);
                        AvailLangLoaded[nLocalesLoaded] = AvailLang[i];
                        nLocalesLoaded++;
                }
@@ -362,7 +352,7 @@ void initialize_locales(void) {
 #endif
        }
        if ((language != NULL) && (nLocalesLoaded == 0)) {
-               syslog(1, "Your selected locale [%s] isn't available on your system. falling back to C", language);
+               syslog(LOG_WARNING, "Your selected locale [%s] isn't available on your system. falling back to C", language);
 #ifdef HAVE_USELOCALE
                wc_locales[0] = newlocale(
                        (LC_MESSAGES_MASK|LC_TIME_MASK),
@@ -376,6 +366,13 @@ void initialize_locales(void) {
                AvailLangLoaded[0] = AvailLang[0];
                nLocalesLoaded = 1;
        }
+
+#ifdef ENABLE_NLS
+       setlocale(LC_ALL, "");
+       syslog(LOG_DEBUG, "Text domain: %s", textdomain("webcit"));
+       syslog(LOG_DEBUG, "Text domain Charset: %s", bind_textdomain_codeset("webcit", "UTF8"));
+       syslog(LOG_DEBUG, "Message catalog directory: %s", bindtextdomain(textdomain(NULL), LOCALEDIR"/locale"));
+#endif
 }
 
 
@@ -402,6 +399,13 @@ const char *AvailLang[] = {
 };
 
 /* dummy for non NLS enabled systems */
+void 
+ServerShutdownModule_GETTEXT
+(void)
+{
+}
+
+
 void tmplput_offer_languages(StrBuf *Target, WCTemplputParams *TP)
 {
        wc_printf("English (US)");
@@ -424,10 +428,11 @@ void initialize_locales(void) {
 
 #endif /* ENABLE_NLS */
 
-
 void TmplGettext(StrBuf *Target, WCTemplputParams *TP)
 {
-       StrBufAppendBufPlain(Target, _(TP->Tokens->Params[0]->Start), -1, 0);
+       const char *Text = _(TP->Tokens->Params[0]->Start);
+
+       StrBufAppendTemplateStr(Target, TP, Text, 1);
 }
 
 
@@ -438,7 +443,7 @@ void TmplGettext(StrBuf *Target, WCTemplputParams *TP)
 const char *get_selected_language(void) {
 #ifdef ENABLE_NLS
 #ifdef HAVE_USELOCALE
-       return AvailLang[WC->selected_language];
+       return AvailLangLoaded[WC->selected_language];
 #else
        return "en";
 #endif