Changeset 366

Timestamp:

04/22/03 10:44:29 (6 years ago)

Author:

jajcus

Message:

- new log translation handling

Files:

• trunk/configure.ac (modified) (1 diff)
• trunk/src/acl.c (modified) (3 diffs)
• trunk/src/ggtrans.h (modified) (2 diffs)
• trunk/src/jabber.c (modified) (5 diffs)
• trunk/src/jid.c (modified) (3 diffs)
• trunk/src/main.c (modified) (16 diffs)
• trunk/src/register.c (modified) (8 diffs)
• trunk/src/stream.c (modified) (6 diffs)

trunk/configure.ac

@@ -61 +61 @@
-
-MKINSTALLDIRS="${MKINSTALLDIRS} -m 755"
+XGETTEXT="${XGETTEXT} --keyword=L_"
-
-AC_CONFIG_FILES([Makefile src/Makefile intl/Makefile po/Makefile.in])

trunk/src/acl.c

@@ -1 @@
-3 2003/04/16 11:10:17
+4 2003/04/22 08:44:29
-
-/*
@@ -47 +47 @@
-                if (!strcmp(str,"allow")) allow=1;
-                else if (!strcmp(str,"deny")) allow=0;
-N
+L
-                what=xmlnode_get_attrib(node,"what");
-                if (!what || what[0]=='\000' || !strcmp(what,"*")) what=NULL;
@@ -97 +97 @@
-        xmlnode_free(x);
-        g_free(jid);
-"Allowed"
-"Denied"
+L_("Allowed")
+L_("Denied")
-        return result;
-}

trunk/src/ggtrans.h

@@ -1 @@
-1 2003/04/14 09:07
+2 2003/04/22 08:44
-
-/*
@@ -29 +29 @@
-#define _(String) gettext (String)
-
-ng error/debug messages after log handler is set
+ons out-of-place
-#define N_(String) (String)
+
+/* gettext shortcut for translating error/debug messages (locale/encoding must be switched) */
+#define L_(String) local_translate(String)
+
+const char *local_translate(const char *str);
-
-extern GMainLoop *main_loop;

trunk/src/jabber.c

@@ -1 @@
-2 2003/04/14 10:18:47
+3 2003/04/22 08:44:29
-
-/*
@@ -63 +63 @@
-        }
-
-N
+L
-        jabber_state=JS_CONNECTED;
-        users_probe_all();
@@ -73 +73 @@
-        data=xmlnode_get_data(x);
-        if (data==NULL) data="-unknown-";
-N
+L
-        stream_close(s);
-        stop_it=1;
@@ -137 +137 @@
-                        break;
-                default:
-N
+L
-                        stop_it=1;
-                        stream_close(s);
@@ -217 +217 @@
-        node=xmlnode_get_tag(config,"service");
-        if (!node)
-N
+L
-
-        my_name=xmlnode_get_attrib(node,"jid");
-        if (!my_name)
-N
+L
-
-        server=config_load_string("connect/ip");
-        if (!server)
-N
+L
-
-        port=config_load_int("connect/port",0);
-        if (port<=0)
-N
+L
-
-        node=xmlnode_get_tag(config,"connect/secret");
-        if (node) secret=xmlnode_get_data(node);
-        if (!node || !secret)
-N
+L
-
-        register_instructions=config_load_formatted_string("register/instructions");
-        if (!register_instructions)
-N
+L
-
-        search_instructions=config_load_formatted_string("search/instructions");
-        if (!search_instructions)
-N
+L
-
-        gateway_desc=config_load_formatted_string("gateway/desc");
-        if (!gateway_desc)
-N
+L
-
-        gateway_prompt=config_load_formatted_string("gateway/prompt");
-        if (!gateway_prompt)
-N
+L
-
-        jabber_state=JS_NONE;

trunk/src/jid.c

@@ -1 @@
-0 2003/04/06 15:42:42 mmazur
+1 2003/04/22 08:44:29 jajcus
-
-/*
@@ -39 +39 @@
-                else if (jid[i]=='@')
-                        if (!just_digits){
-N
+L
-                                return 0;
-                        }
@@ -54 +54 @@
-        if (slash<0){
-                if ( g_strcasecmp(jid+at+1,my_name) ){
-N
+L
-                        return 0;
-                }
-        } else{
-                if ( slash-at-1!=strlen(my_name) ){
-N
+L
-                        return 0;
-                }
-
-                if ( g_strncasecmp(jid+at+1,my_name,slash-at-1) ){
-N
+L
-                        return 0;
-                }

trunk/src/main.c

@@ -1 @@
-7 2003/04/22 07:12:32
+8 2003/04/22 08:44:29
-
-/*
@@ -31 +31 @@
-#include <time.h>
-#include <locale.h>
+
+#ifdef HAVE_LANGINFO_CODESET
+#  include <langinfo.h>
+#endif
+
-#include "jabber.h"
-#include "sessions.h"
@@ -173 +178 @@
-        switch(log_level){
-                case G_LOG_LEVEL_ERROR:
-_(message)
+message
-                        break;
-                case G_LOG_LEVEL_CRITICAL:
-_(message)
+message
-                        break;
-                case G_LOG_LEVEL_WARNING:
-_(message)
+message
-                        break;
-                case G_LOG_LEVEL_MESSAGE:
@@ -185 +190 @@
-                case G_LOG_LEVEL_INFO:
-                        if (debug_level<0) break;
-_(message)
+message
-                        break;
-                case G_LOG_LEVEL_DEBUG:
-                        if (debug_level>0)
-_(message)
+message
-                        break;
-                default:
-_(message)
+message
-                        break;
-        }
@@ -202 +207 @@
-        switch(log_level){
-                case G_LOG_LEVEL_ERROR:
-_(message)
+message
-                        break;
-                case G_LOG_LEVEL_CRITICAL:
-_(message)
+message
-                        break;
-                case G_LOG_LEVEL_WARNING:
-_(message)
+message
-                        break;
-                case G_LOG_LEVEL_MESSAGE:
-                        if (debug_level<-1) break;
-_(message)
+message
-                        break;
-                case G_LOG_LEVEL_INFO:
-                        if (debug_level<0) break;
-_(message)
+message
-                        break;
-                case G_LOG_LEVEL_DEBUG:
-                        if (debug_level>0)
-_(message)
+message
-                        break;
-                default:
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-        td_codeset=bind_textdomain_codeset(PACKAGE,NULL);
-        lc_ctype=setlocale(LC_CTYPE,NULL);
-        lc_messages=setlocale(LC_MESSAGES,NULL);
+        setlocale(LC_MESSAGES,"");
+        setlocale(LC_CTYPE,"");
+#ifdef HAVE_LANGINFO_CODESET
+        bind_textdomain_codeset(PACKAGE,nl_langinfo(CODESET));
+#endif
+/*      textdomain(PACKAGE);*/
+
+        ret=gettext(str);
+
+        setlocale(LC_CTYPE,lc_ctype);
+        setlocale(LC_MESSAGES,lc_ctype);
+        bind_textdomain_codeset(PACKAGE,td_codeset);
+
+        return ret;
+}
+
+void log_handler(const gchar *log_domain, GLogLevelFlags log_level,
+                        const gchar *message, gpointer user_data){
+
+char *lc_ctype,*lc_messages,*td_codeset;
+
+        td_codeset=bind_textdomain_codeset(PACKAGE,NULL);
+        lc_ctype=setlocale(LC_CTYPE,NULL);
+        lc_messages=setlocale(LC_MESSAGES,NULL);
+        setlocale(LC_MESSAGES,"");
+        setlocale(LC_CTYPE,"");
+#ifdef HAVE_LANGINFO_CODESET
+        bind_textdomain_codeset(PACKAGE,nl_langinfo(CODESET));
+#endif
+/*      textdomain(PACKAGE);*/
-
-        log_level&=G_LOG_LEVEL_MASK;
@@ -252 +285 @@
-int fd;
-
-N
+L
-        pid=fork();
-N
+L
-        if (pid){
-                if (pidfile){
@@ -260 +293 @@
-                        fclose(pidfile);
-                }
-N
+L
-                exit(0);
-        }
@@ -282 +315 @@
-        if (sid==-1) abort();
-        foreground=FALSE;
-N
+L
-        return;
-}
@@ -406 +439 @@
-        config=xmlnode_file(config_file);
-        if (!config){
-N
+L
-                return 1;
-        }
-        str=xmlnode_get_name(config);
-        if (!str || strcmp(str,"jggtrans")){
-N
+L
-                return 1;
-        }
@@ -438 +471 @@
-                                if (!strcmp(facilitynames[log_facility].name,str)) break;
-                        if (!facilitynames[log_facility].name)
-N
+L
-                }
-                else if (!strcmp(log_type,"file")){
@@ -465 +498 @@
-                        if (r==1 && pid>0){
-                                r=kill(pid,0);
-N
+L
-                                if (r){
-                                        g_warning(N_("Stale pid file. Removing."));
@@ -471 +504 @@
-                                }
-                        }
-N
+L
-                }
-                pidfile=fopen(pid_filename,"w");
-                if (pidfile==NULL)
-N
+L
-        }
-        else
@@ -482 +515 @@
-        if (group){
-                grp=getgrnam(group);
-N
+L
-                newgid=grp->gr_gid;
-        }
-        if (user){
-                pwd=getpwnam(user);
-N
+L
-                if (newgid<=0) newgid=pwd->pw_gid;
-                fchown(fileno(pidfile),pwd->pw_uid,newgid);
-N
-N
-N
-
-N
+L
+L
+L
+
+L
-
-        main_loop=g_main_new(0);
@@ -513 +546 @@
-        if (log_filename){
-                log_file=fopen(log_filename,"a");
-N
+L
-                                                log_filename,g_strerror(errno));
-                if (log_file) setvbuf(log_file,NULL,_IOLBF,0);
@@ -548 +581 @@
-                int n;
-
-N
+L
-                if (restart_timeout>0) sleep(restart_timeout);
-                if (saved_pwd) chdir(saved_pwd);
@@ -571 +604 @@
-        }
-
-N
+L
-
-        g_log_remove_handler(NULL,lh);

trunk/src/register.c

@@ -1 @@
-7 2003/04/20 14:09:3
+8 2003/04/22 08:44:2
-
-/*
@@ -391 +391 @@
-int change_password_error(struct request_s *r){
-
-N
+L
-        jabber_iq_send_error(r->stream,r->from,r->to,r->id,500,_("Internal Server Error"));
-        return 0;
@@ -405 +405 @@
-        }
-
-N
+L
-        if (r->data){
-                g_free(u->password);
@@ -470 +470 @@
-char *jid;
-
-N
+L
-        ses=session_get_by_jid(from,NULL);
-        if (ses)
@@ -500 +500 @@
-        }
-        presence_send_unsubscribed(s,NULL,jid);
-N
+L
-        g_free(jid);
-        return 0;
@@ -520 +520 @@
-        node=xmlnode_get_firstchild(q);
-        if (!node){
-N
+L
-                unregister(s,from,to,id,0);
-                return;
@@ -546 +546 @@
-        node=xmlnode_get_tag(q,"remove");
-        if (node){
-N
+L
-                unregister(s,from,to,id,0);
-                return;
@@ -606 +606 @@
-        if (!first && !last && !nick && !city && !born && !sex){
-                        if (!uin && !password){
-N
+L
-                                unregister(s,from,to,id,0);
-                                return;

trunk/src/stream.c

@@ -1 @@
-19 2003/04/15 16:33:04
+20 2003/04/22 08:44:29
-
-/*
@@ -74 +74 @@
-        fd=socket(PF_INET,SOCK_STREAM,0);
-        if (!fd){
-N
+L
-                g_free(s);
-                return NULL;
@@ -116 +116 @@
-        else{
-                if (r<0){
-N
+L
-                        g_free(s);
-                        return NULL;
@@ -150 +150 @@
-        }
-        if (errno==EALREADY) return 0;
-N
+L
-        return -1;
-}
@@ -163 +163 @@
-        s->xs->f(XSTREAM_CLOSE,NULL,s);
-        if (!s->connected)
-N
+L
-        else
-N
+L
-        do_restart=TRUE;
-        return FALSE;
@@ -197 +197 @@
-        g_assert(s);
-
-N
+L
-
-        if (!s->read_buf){