Changeset 255

Timestamp:

04/04/03 19:59:32 (6 years ago)

Author:

jajcus

Message:

- perliminary gettext support

Files:

• trunk (modified) (1 prop)
• trunk/.cvsignore (modified) (1 diff)
• trunk/Makefile.am (modified) (1 diff)
• trunk/autogen.sh (modified) (1 diff)
• trunk/configure.ac (modified) (2 diffs)
• trunk/po (added)
• trunk/po/.cvsignore (added)
• trunk/po/POTFILES.in (added)
• trunk/po/pl.po (added)
• trunk/src/ggtrans.h (modified) (2 diffs)
• trunk/src/main.c (modified) (21 diffs)

trunk/.cvsignore

@@ -21 +21 @@
-jabber-gg-transport-*.tar.gz
-autom4te.cache
+intl

trunk/Makefile.am

@@ -1 +1 @@
-
-libxode src
+intl libxode src po
-
-EXTRA_DIST = jggtrans.xml jggtrans.xml.Pl TODO BUGS README.Pl INSTALL.Pl

trunk/autogen.sh

@@ -3 +3 @@
-( cd libxode ; ./autogen.sh ) || exit 1
-
-
-
+
+
+
+
-autoheader
-automake -a 

trunk/configure.ac

@@ -49 +49 @@
-AC_CHECK_HEADERS([sys/socket.h netdb.h netinet/in.h])
-AC_CHECK_HEADERS([sys/time.h unistd.h errno.h fcntl.h])
-AC_NEED_STDINT_H
-
-# Checks for typedefs, structures, and compiler characteristics.
@@ -67 +66 @@
-AC_CONFIG_SUBDIRS([libxode])
-
-
+ intl/Makefile po/Makefile.in
-AC_OUTPUT

trunk/src/ggtrans.h

@@ -1 @@
-6 2003/01/15 14:13:1
+7 2003/04/04 17:59:3
-
-/*
@@ -22 +22 @@
-
-#include <libxode.h>
+#include <libintl.h>
-#include <glib.h>
-#include "../config.h"
+
+/* gettext shortcut for translating messages */
+#define _(String) gettext (String)
+
+/* dummy gettext shortcut for translating error/debug messages after log handler is set */
+#define __(String) gettext (String)
-
-extern GMainLoop *main_loop;

trunk/src/main.c

@@ -1 @@
-4 2003/03/24 14:43:37
+5 2003/04/04 17:59:32
-
-/*
@@ -162 +162 @@
-        switch(log_level){
-                case G_LOG_LEVEL_ERROR:
-"Fatal error: %s\n",message
+_("Fatal error: %s\n"),_(message)
-                        break;
-                case G_LOG_LEVEL_CRITICAL:
-"Error: %s\n",message
+_("Error: %s\n"),_(message)
-                        break;
-                case G_LOG_LEVEL_WARNING:
-"Warning: %s\n",message
+_("Warning: %s\n"),_(message)
-                        break;
-                case G_LOG_LEVEL_MESSAGE:
@@ -174 +174 @@
-                case G_LOG_LEVEL_INFO:
-                        if (debug_level<0) break;
-message
+_(message)
-                        break;
-                case G_LOG_LEVEL_DEBUG:
-                        if (debug_level>0)
-"Debug: %s\n",message
+_("Debug: %s\n"),_(message)
-                        break;
-                default:
-"Unknown: %s\n",message
+_("Unknown: %s\n"),_(message)
-                        break;
-        }
@@ -191 +191 @@
-        switch(log_level){
-                case G_LOG_LEVEL_ERROR:
-"Fatal error: %s",message
+_("Fatal error: %s"),_(message)
-                        break;
-                case G_LOG_LEVEL_CRITICAL:
-"Error: %s",message
+_("Error: %s"),_(message)
-                        break;
-                case G_LOG_LEVEL_WARNING:
-"Warning: %s",message
+_("Warning: %s"),_(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)
-"Debug: %s\n",message
+_("Debug: %s\n"),_(message)
-                        break;
-                default:
-"Unknown: %s\n",message
+_("Unknown: %s\n"),_(message)
-                        break;
-        }
@@ -220 +220 @@
-                        const gchar *message, gpointer user_data){
-
+char *lc_ctype,*lc_messages;
+
+        lc_ctype=setlocale(LC_CTYPE,NULL);
+        lc_messages=setlocale(LC_MESSAGES,NULL);
+        
-        log_level&=G_LOG_LEVEL_MASK;
-        if (foreground) log_handler_file(stderr,log_domain,log_level,message);
-        if (log_file) log_handler_file(log_file,log_domain,log_level,message);
-        if (use_syslog) log_handler_syslog(log_domain,log_level,message);
+        
+        setlocale(LC_CTYPE,lc_ctype);
+        setlocale(LC_MESSAGES,lc_ctype);
-}
-
@@ -231 +239 @@
-int fd;
-
-"Daemonizing..."
+__("Daemonizing...")
-        pid=fork();
-"Failed to fork(): %s"
+__("Failed to fork(): %s")
-        if (pid){
-                if (pidfile){
@@ -239 +247 @@
-                        fclose(pidfile);
-                }
-"Daemon born, pid %i."
+__("Daemon born, pid %i.")
-                exit(0);
-        }
@@ -261 +269 @@
-        if (sid==-1) abort();
-        foreground=FALSE;
-"I am a daemon, I think."
+__("I am a daemon, I think.")
-        return;
-}
@@ -270 +278 @@
-        p=strrchr(name,'/');
-        if (p) name=p+1;
-"\nJabber GaduGadu Transport %s\n"
-"\n"
-"\tUsage: %s [OPTIONS]... [<config file>]\n"
-"\nOptions:\n"
-"\t-h         This message\n"
-"\t-f         Run in foreground. Debug/error messages will be sent to stderr\n"
-"\t-d <n>      Log level (0(default) - normal, >0 more, <0 less)\n"
-"\t-D <n>      libgg debug level (enables also -f)\n"
-"\t-u <user>   Switch to uid of <user> on startup\n"
-"\t-g <group>  Switch to gid of <group> on startup\n"
-"\n"
+_("\nJabber GaduGadu Transport %s\n")
+_("\n")
+_("\tUsage: %s [OPTIONS]... [<config file>]\n")
+_("\nOptions:\n")
+_("\t-h       This message\n")
+_("\t-f       Run in foreground. Debug/error messages will be sent to stderr\n")
+_("\t-d <n>      Log level (0(default) - normal, >0 more, <0 less)\n")
+_("\t-D <n>      libgg debug level (enables also -f)\n")
+_("\t-u <user>   Switch to uid of <user> on startup\n")
+_("\t-g <group>  Switch to gid of <group> on startup\n")
+_("\n")
-}
-
@@ -311 +319 @@
-        newgid=0; user=NULL; group=NULL;
-
+        /* use local locale for error and debug messages */
+        setlocale(LC_MESSAGES,"");
+        setlocale(LC_CTYPE,"");
+        textdomain(PACKAGE);
+        
-        saved_pwd=getcwd(saved_pwd_b,1024);
-        opterr=0;
@@ -334 +347 @@
-                                break;
-                        case 'u':
-"Cannot change user."
+_("Cannot change user.")
-                                user=optarg;
-                                break;
-                        case 'g':
-"Cannot change group."
+_("Cannot change group.")
-                                group=optarg;
-                                break;
-                        case '?':
-                                if (isprint(optopt))
-"Unknown command-line option: -%c.\n"
+_("Unknown command-line option: -%c.\n")
-                                else
-"Unknown command-line option: -\\%03o.\n"
+_("Unknown command-line option: -\\%03o.\n")
-                                usage(argv[0]);
-                                return 1;
-                        default:
-"Error while processing command line options"
+_("Error while processing command line options")
-                                break;
-                }
@@ -355 +368 @@
-
-        if (optind<argc-1){
-"Unexpected argument: %s\n"
+_("Unexpected argument: %s\n")
-                usage(argv[0]);
-                return 1;
@@ -368 +381 @@
-                                | G_LOG_LEVEL_DEBUG,log_handler,NULL);
-
+        /* now the log handlers worry about the right language */
+        setlocale(LC_MESSAGES,"C");
+        setlocale(LC_CTYPE,"C");
+
-        config=xmlnode_file(config_file);
-        if (!config){
-"Couldn't load config!"
+__("Couldn't load config!")
-                return 1;
-        }
-        str=xmlnode_get_name(config);
-        if (!str || strcmp(str,"jggtrans")){
-"%s doesn't look like jggtrans config file."
+__("%s doesn't look like jggtrans config file.")
-                return 1;
-        }
@@ -386 +403 @@
-                if (!strcmp(log_type,"syslog")){
-                        if (log_facility!=-1){
-"Multiple syslog configs specified. Using only one."
+__("Multiple syslog configs specified. Using only one.")
-                                continue;
-                        }
@@ -397 +414 @@
-                                if (!strcmp(facilitynames[log_facility].name,str)) break;
-                        if (!facilitynames[log_facility].name)
-"Unknown syslog facility: %s"
+__("Unknown syslog facility: %s")
-                }
-                else if (!strcmp(log_type,"file")){
-"Multiple log files specified. Using only one."
+__("Multiple log files specified. Using only one.")
-                        else{
-                                data=xmlnode_get_data(tag);
@@ -407 +424 @@
-                        }
-                }
-"Ignoring unknown log type: %s"
+__("Ignoring unknown log type: %s")
-        }
-
@@ -424 +441 @@
-                        if (r==1 && pid>0){
-                                r=kill(pid,0);
-"jggtrans already running"
+__("jggtrans already running")
-                                if (r){
-"Stale pid file. Removing."
+__("Stale pid file. Removing.")
-                                        unlink(pid_filename);
-                                }
-                        }
-"Invalid pid file."
+__("Invalid pid file.")
-                }
-                pidfile=fopen(pid_filename,"w");
-                if (pidfile==NULL)
-"Couldn't open pidfile %s"
+__("Couldn't open pidfile %s")
-        }
-        else
@@ -441 +458 @@
-        if (group){
-                grp=getgrnam(group);
-"Couldn't find group %s"
+__("Couldn't find group %s")
-                newgid=grp->gr_gid;
-        }
-        if (user){
-                pwd=getpwnam(user);
-"Couldn't find user %s"
+__("Couldn't find user %s")
-                if (newgid<=0) newgid=pwd->pw_gid;
-                fchown(fileno(pidfile),pwd->pw_uid,newgid);
-"Couldn't change group: %s"
-"Couldn't init groups: %s"
-"Couldn't change user: %s"
-
-"Refusing to run with uid=0"
+__("Couldn't change group: %s")
+__("Couldn't init groups: %s")
+__("Couldn't change user: %s")
+
+__("Refusing to run with uid=0")
-
-        main_loop=g_main_new(0);
@@ -471 +488 @@
-        if (log_filename){
-                log_file=fopen(log_filename,"a");
-"Couldn't open log file '%s': %s"
+__("Couldn't open log file '%s': %s")
-                                                log_filename,g_strerror(errno));
-                if (log_file) setvbuf(log_file,NULL,_IOLBF,0);
@@ -503 +520 @@
-                int n;
-
-"Restarting in %i seconds.\n"
+__("Restarting in %i seconds.\n")
-                if (restart_timeout>0) sleep(restart_timeout);
-                if (saved_pwd) chdir(saved_pwd);
@@ -524 +541 @@
-        }
-
-"Exiting normally.\n"
+__("Exiting normally.\n")
-
-        g_log_remove_handler(NULL,lh);