Changeset 257

Timestamp:

04/05/03 13:02:57 (6 years ago)

Author:

jajcus

Message:

- i18n infrastructure seems complete. Now only testing, bugfixing and translations are needed.

Files:

• trunk/jggtrans.xml (modified) (1 diff)
• trunk/jggtrans.xml.Pl (modified) (1 diff)
• trunk/po/pl.po (modified) (4 diffs, 2 props)
• trunk/src/ggtrans.h (modified) (2 diffs)
• trunk/src/iq.c (modified) (3 diffs)
• trunk/src/main.c (modified) (15 diffs)
• trunk/src/message.c (modified) (4 diffs)
• trunk/src/presence.c (modified) (2 diffs)
• trunk/src/requests.c (modified) (3 diffs)
• trunk/src/sessions.c (modified) (3 diffs)
• trunk/src/users.c (modified) (7 diffs)
• trunk/src/users.h (modified) (3 diffs)

trunk/jggtrans.xml

@@ -88 +88 @@
- </vCard>
-
+ <!-- Default user locale (language). 
+      Empty means system locale setting, 
+      no (or commented-out) <default_locale> tag means no translations. -->
+ <!-- <default_locale>pl_PL</default_locale> -->
+
- <!-- Logger configuration. 
-      You may configure one logger of type "syslog" and/or one of type "file".

trunk/jggtrans.xml.Pl

@@ -95 +95 @@
- </vCard>
-
+ <!-- domyślne locale (język) użytkownika. 
+      Puste oznacza lokale systemowe, a brak to brak tłumaczeń -->
+ <default_locale>pl_PL</default_locale>
+
- <!-- 
-      Konfiguracja logów. 

trunk/po/pl.po

@@ -6 +6 @@
-msgstr ""
-"Project-Id-Version: jabber-gg-transport 1.4.1\n"
-4 19:39
+5 12:55
-"PO-Revision-Date: 2003-04-04 19:43+0200\n"
-"Last-Translator: Jacek Konieczny <jajcus@pld.org.pl>\n"
@@ -54 +54 @@
-msgstr ""
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#, c-format
-msgid ""
@@ -61 +79 @@
-msgstr ""
-
-1 src/main.c:290
+3 src/main.c:292
-msgid "\n"
-msgstr ""
-
-2
+4
-#, c-format
-msgid "\tUsage: %s [OPTIONS]... [<config file>]\n"
-msgstr ""
-
-3
+5
-msgid ""
-"\n"
@@ -76 +94 @@
-msgstr ""
-
-4
+6
-msgid "\t-h\t      This message\n"
-msgstr ""
-
-5
+7
-msgid ""
-"\t-f\t      Run in foreground. Debug/error messages will be sent to stderr\n"
-msgstr ""
-
-#: src/main.c:286
-msgid "\t-d <n>      Log level (0(default) - normal, >0 more, <0 less)\n"
-msgstr ""
-
-#: src/main.c:287
-msgid "\t-D <n>      libgg debug level (enables also -f)\n"
-msgstr ""
-
-#: src/main.c:288
-u <user>   Switch to uid of <user> on startup
+d <n>\tLog level (0(default) - normal, >0 more, <0 less)
-msgstr ""
-
-#: src/main.c:289
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-msgid "Cannot change user."
-msgstr ""
-
-3
+5
-msgid "Cannot change group."
-msgstr ""
-
-58
+60
-#, c-format
-msgid "Unknown command-line option: -%c.\n"
-msgstr "Nieznana opcja: -%c.\n"
-
-0
+2
-#, c-format
-msgid "Unknown command-line option: -\\%03o.\n"
-msgstr "Nieznana opcja: -\\%03o.\n"
-
-4
+6
-msgid "Error while processing command line options"
-msgstr ""
-
-0
+2
-#, c-format
-msgid "Unexpected argument: %s\n"
-msgstr ""
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/src/ggtrans.h

@@ -1 @@
-7 2003/04/04 17:59:32
+8 2003/04/05 11:02:57
-
-/*
@@ -30 +30 @@
-
-/* dummy gettext shortcut for translating error/debug messages after log handler is set */
-_
+N
-
-extern GMainLoop *main_loop;

trunk/src/iq.c

@@ -1 @@
-5 2003/03/25 07:43:45
+6 2003/04/05 11:02:57
-
-/*
@@ -319 +319 @@
-void jabber_iq(Stream *s,xmlnode x){
-char *type;
+char *from;
+User *u;
-
-        if (jabber_state!=JS_CONNECTED){
@@ -324 +326 @@
-                return;
-        }
+
+        from=xmlnode_get_attrib(x,"from");
+        if (from) u=user_get_by_jid(from);
+        else u=NULL;
+        user_load_locale(u);
-
-        type=xmlnode_get_attrib(x,"type");

trunk/src/main.c

@@ -1 @@
-6 2003/04/05 10:24:50
+7 2003/04/05 11:02:57
-
-/*
@@ -220 +220 @@
-                        const gchar *message, gpointer user_data){
-
-
-
+
+
+
-        lc_ctype=setlocale(LC_CTYPE,NULL);
-        lc_messages=setlocale(LC_MESSAGES,NULL);
@@ -232 +233 @@
-        setlocale(LC_CTYPE,lc_ctype);
-        setlocale(LC_MESSAGES,lc_ctype);
+        bind_textdomain_codeset(PACKAGE,td_codeset);
-}
-
@@ -239 +241 @@
-int fd;
-
-_
+N
-        pid=fork();
-_
+N
-        if (pid){
-                if (pidfile){
@@ -247 +249 @@
-                        fclose(pidfile);
-                }
-_
+N
-                exit(0);
-        }
@@ -269 +271 @@
-        if (sid==-1) abort();
-        foreground=FALSE;
-_
+N
-        return;
-}
@@ -384 +386 @@
-        setlocale(LC_MESSAGES,"C");
-        setlocale(LC_CTYPE,"C");
+        bind_textdomain_codeset(PACKAGE,"UTF-8");
-
-        config=xmlnode_file(config_file);
-        if (!config){
-_
+N
-                return 1;
-        }
-        str=xmlnode_get_name(config);
-        if (!str || strcmp(str,"jggtrans")){
-_
+N
-                return 1;
-        }
@@ -403 +406 @@
-                if (!strcmp(log_type,"syslog")){
-                        if (log_facility!=-1){
-_
+N
-                                continue;
-                        }
@@ -414 +417 @@
-                                if (!strcmp(facilitynames[log_facility].name,str)) break;
-                        if (!facilitynames[log_facility].name)
-_
+N
-                }
-                else if (!strcmp(log_type,"file")){
-_
+N
-                        else{
-                                data=xmlnode_get_data(tag);
@@ -424 +427 @@
-                        }
-                }
-_
+N
-        }
-
@@ -441 +444 @@
-                        if (r==1 && pid>0){
-                                r=kill(pid,0);
-_
+N
-                                if (r){
-_
+N
-                                        unlink(pid_filename);
-                                }
-                        }
-_
+N
-                }
-                pidfile=fopen(pid_filename,"w");
-                if (pidfile==NULL)
-_
+N
-        }
-        else
@@ -458 +461 @@
-        if (group){
-                grp=getgrnam(group);
-_
+N
-                newgid=grp->gr_gid;
-        }
-        if (user){
-                pwd=getpwnam(user);
-_
+N
-                if (newgid<=0) newgid=pwd->pw_gid;
-                fchown(fileno(pidfile),pwd->pw_uid,newgid);
-_
-_
-_
-
-_
+N
+N
+N
+
+N
-
-        main_loop=g_main_new(0);
@@ -488 +491 @@
-        if (log_filename){
-                log_file=fopen(log_filename,"a");
-_
+N
-                                                log_filename,g_strerror(errno));
-                if (log_file) setvbuf(log_file,NULL,_IOLBF,0);
@@ -520 +523 @@
-                int n;
-
-_
+N
-                if (restart_timeout>0) sleep(restart_timeout);
-                if (saved_pwd) chdir(saved_pwd);
@@ -541 +544 @@
-        }
-
-_
+N
-
-        g_log_remove_handler(NULL,lh);

trunk/src/message.c

@@ -1 @@
-2 2003/03/24 14:43:3
+3 2003/04/05 11:02:5
-
-/*
@@ -430 +430 @@
-                }
-        }
-"\nAvailable commands (and abbreviations):"
+_("\nAvailable commands (and abbreviations):")
-        for(i=0;msg_commands[i].command;i++){
-                msg=g_strdup_printf("%s\n  %s (%s)%s",msg,
-                                msg_commands[i].command,
-                                msg_commands[i].abr,
-" EXPERIMENTAL!"
-
-"%s\nCurrent settings:"
-"%s\n  friends only: %s",msg,user->friends_only?"on":"off"
-"%s\n  invisible: %s",msg,user->invisible?"on":"off"
+_(" EXPERIMENTAL!")
+
+_("%s\nCurrent settings:")
+_("%s\n  friends only: %s"),msg,user->friends_only?_("on"):_("off")
+_("%s\n  invisible: %s"),msg,user->invisible?_("on"):_("off")
-        message_send(stream,to,from,1,msg,0);
-        g_free(msg);
@@ -456 +456 @@
-xmlnode body_n;
-Session *s;
+User *u;
-
-        body_n=xmlnode_get_tag(tag,"body");
@@ -467 +468 @@
-        from=xmlnode_get_attrib(tag,"from");
-        to=xmlnode_get_attrib(tag,"to");
+
+        if (from) u=user_get_by_jid(from);
+        else u=NULL;
+        user_load_locale(u);
-
-        type=xmlnode_get_attrib(tag,"type");

trunk/src/presence.c

@@ -1 @@
-4 2003/01/22 07:53:01
+5 2003/04/05 11:02:57
-
-/*
@@ -380 +380 @@
-char *show,*status;
-int priority;
+User *u;
-
-        type=xmlnode_get_attrib(tag,"type");
-        from=xmlnode_get_attrib(tag,"from");
-        to=xmlnode_get_attrib(tag,"to");
+
+        if (from) u=user_get_by_jid(from);
+        else u=NULL;
+        user_load_locale(u);
-
-        show_n=xmlnode_get_tag(tag,"show");

trunk/src/requests.c

@@ -1 @@
-2 2003/04/04 13:49:02
+3 2003/04/05 11:02:57
-
-/*
@@ -66 +66 @@
-int request_io_handler(GIOChannel *source,GIOCondition condition,gpointer data){
-Request *r;
+User *u;
-int t;
-GIOCondition cond;
@@ -71 +72 @@
-        r=(Request *)data;
-        g_assert(r!=NULL);
+
+        u=user_get_by_jid(r->from);
+        user_load_locale(u);
+
-        switch(r->type){
-                case RT_CHANGE:

trunk/src/sessions.c

@@ -1 @@
-8 2003/03/24 13:46:49
+9 2003/04/05 11:02:57
-
-/*
@@ -175 +175 @@
-        g_assert(data!=NULL);
-        s=(Session *)data;
+        user_load_locale(s->user);
-
-        g_warning("Timeout for server %u",
@@ -297 +298 @@
-
-        s=(Session *)data;
+        user_load_locale(s->user);
-        debug("Checking error conditions...");
-        if (condition&(G_IO_ERR|G_IO_NVAL)){

trunk/src/users.c

@@ -1 @@
-5 2003/01/22 07:53:01
+6 2003/04/05 11:02:57
-
-/*
@@ -32 +32 @@
-GHashTable *users_jid=NULL;
-static char *spool_dir;
+static char *default_user_locale="C";
-
-int users_init(){
-int r;
+
+        default_user_locale=config_load_string("default_locale");
-
-        spool_dir=config_load_string("spool");
@@ -109 +112 @@
-        if (u->invisible) tag=xmlnode_insert_tag(xml,"invisible");
-        if (u->friends_only) tag=xmlnode_insert_tag(xml,"friendsonly");
+        if (u->locale){
+                tag=xmlnode_insert_tag(xml,"locale");
+                xmlnode_insert_cdata(tag,u->locale,-1);
+        }
-
-        if (u->contacts){
@@ -203 +210 @@
-char *fn,*njid;
-xmlnode xml,tag,t;
-
+,*locale
-int last_sys_msg=0,invisible=0,friends_only=0;
-User *u;
@@ -253 +260 @@
-        tag=xmlnode_get_tag(xml,"invisible");
-        if (tag!=NULL) invisible=1;
+        tag=xmlnode_get_tag(xml,"locale");
+        if (tag!=NULL) locale=xmlnode_get_data(tag);
+        else locale=NULL;
-        tag=xmlnode_get_tag(xml,"userlist");
-        contacts=NULL;
@@ -361 +371 @@
-        u->friends_only=friends_only;
-        u->invisible=invisible;
+        u->locale=locale;
-        u->contacts=contacts;
-        xmlnode_free(xml);
@@ -536 +547 @@
-}
-
+void user_load_locale(User *u){
+
+        if (u && u->locale){
+                setlocale(LC_MESSAGES,u->locale);
+                setlocale(LC_CTYPE,u->locale);
+        }
+        else{
+                setlocale(LC_MESSAGES,default_user_locale);
+                setlocale(LC_CTYPE,default_user_locale);
+        }
+}
+
-int users_probe_all(){
-DIR *dir;

trunk/src/users.h

@@ -1 @@
-5 2003/01/15 08:04:56
+6 2003/04/05 11:02:57
-
-/*
@@ -49 +49 @@
-        int friends_only;
-        int invisible;
+        char *locale;
-
-        int confirmed;
@@ -72 +73 @@
-                                int more,uint32_t ip,uint16_t port,uint32_t version);
-
+void user_load_locale(User *u);
+
-void user_print(User *u,int indent);
-int users_probe_all();