[gq-commit] gq/src util.c,1.45,1.46 util.h,1.16,1.17 search.c,1.24,1.25 schemabrowse.c,1.11,1.12

[<sta...@us...>]

Update of /cvsroot/gqclient/gq/src
In directory usw-pr-cvs1:/tmp/cvs-serv24332/src

Modified Files:
	util.c util.h search.c schemabrowse.c 
Log Message:
* Added support for singular/plural forms when translating messages including
  numbers. 
* Added support for the japanese Message catalog kindly provided by 
  Hatuka*nezumi <ne...@jc...>. The original patch I received from Hatuka 
  contained also some fogotten "_()"s. Thanks.


Index: util.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/util.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** util.c	10 Aug 2002 06:06:38 -0000	1.45
--- util.c	18 Sep 2002 07:22:04 -0000	1.46
***************
*** 566,588 ****
  }
  
! 
  void make_message(char *buffer, int bufsize, 
! 		  int cnt, char *singular, char *plural, char *suffix)
  {
  
       switch(cnt) {
       case 0:
! 	  snprintf(buffer, bufsize, _("no %s %s"), plural, suffix);
  	  break;
       case 1:
! 	  snprintf(buffer, bufsize, _("1 %s %s"), singular, suffix);
  	  break;
       default:
! 	  snprintf(buffer, bufsize, "%d %s %s", cnt, plural, suffix);
  	  break;
       }
  
  }
! 
  
  /*
--- 566,598 ----
  }
  
! #if 0
  void make_message(char *buffer, int bufsize, 
! 		  const char *none, const char *one, const char *many,
! 		  ...)
  {
+      int cnt;
+      va_list ap;
+ 
+      va_start (ap, many);
+      cnt = va_arg(ap, int);
+      va_end (ap);
+ 
+      va_start (ap, many);
  
       switch(cnt) {
       case 0:
! 	  vsnprintf(buffer, bufsize, none, ap);
  	  break;
       case 1:
! 	  vsnprintf(buffer, bufsize, one,  ap);
  	  break;
       default:
! 	  vsnprintf(buffer, bufsize, many, ap);
  	  break;
       }
  
+      va_end (ap);
  }
! #endif
  
  /*
***************
*** 1523,1528 ****
       close_connection(server, FALSE);
       
!      make_message(message, sizeof(message), num_suffixes,
! 		  _("suffix"), _("suffixes"), _("found"));
       statusbar_msg(message);
  
--- 1533,1546 ----
       close_connection(server, FALSE);
       
!      snprintf(message, sizeof(message),
! 	      ngettext("One suffix found", "%d suffixes found", num_suffixes),
! 	      num_suffixes);
! 
! /*       make_message(message, sizeof(message),  */
! /*  		  _("No suffixes found"), */
! /*  		  _("One suffix found"), */
! /*  		  _("%d suffixes found"), */
! /*  		  num_suffixes); */
! /*  		  _("suffix"), _("suffixes"), _("found")); */
       statusbar_msg(message);
  

Index: util.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/util.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** util.h	3 Jul 2002 20:13:05 -0000	1.16
--- util.h	18 Sep 2002 07:22:04 -0000	1.17
***************
*** 44,48 ****
  void set_busycursor(void);
  void set_normalcursor(void);
! void make_message(char *buffer, int bufsize, int cnt, char *singular, char *plural, char *suffix);
  int close_on_esc(GtkWidget *widget, GdkEventKey *event, gpointer obj);
  int func_on_esc(GtkWidget *widget, GdkEventKey *event, GtkWidget *window);
--- 44,59 ----
  void set_busycursor(void);
  void set_normalcursor(void);
! 
! #if 0
! /*  void make_message(char *buffer, int bufsize, int cnt, char *singular, char *plural, char *suffix); */
! 
! /* NOTE: The first variadic argument must be an "int" indication a
!    count value used to select among the *none, *one and *many messages */
! void make_message(char *buffer, int bufsize, 
! 		  const char *none, const char *one, const char *many, 
! 		  ...)
!      __attribute__ ((format (printf, 5, 6)));
! #endif
! 
  int close_on_esc(GtkWidget *widget, GdkEventKey *event, gpointer obj);
  int func_on_esc(GtkWidget *widget, GdkEventKey *event, GtkWidget *window);

Index: search.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/search.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** search.c	15 Jul 2002 18:44:03 -0000	1.24
--- search.c	18 Sep 2002 07:22:04 -0000	1.25
***************
*** 455,459 ****
       free(querystring);
  
!      snprintf(message, sizeof(message), "searching for %s", filter);
       statusbar_msg(message);
  
--- 455,459 ----
       free(querystring);
  
!      snprintf(message, sizeof(message), _("searching for %s"), filter);
       statusbar_msg(message);
  
***************
*** 623,628 ****
  	  statusbar_msg(ldap_err2string(msg));
       else {
! 	  make_message(message, sizeof(message), 
! 		       row, "entry", "entries", "found");
  	  statusbar_msg(message);
       }
--- 623,636 ----
  	  statusbar_msg(ldap_err2string(msg));
       else {
! 	  snprintf(message, sizeof(message),
! 		   ngettext("One entry found", "%d entries found", row),
! 		   row);
! 
! /*  	  make_message(message, sizeof(message),  */
! /*  		       _("No entries found"), */
! /*  		       _("One entry found"), */
! /*  		       _("%d entries found"), */
! /*  		       row); */
! /*  		       "entry", "entries", "found"); */
  	  statusbar_msg(message);
       }

Index: schemabrowse.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/schemabrowse.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** schemabrowse.c	18 Jun 2002 22:07:14 -0000	1.11
--- schemabrowse.c	18 Sep 2002 07:22:04 -0000	1.12
***************
*** 131,136 ****
       }
  
!      make_message(message, sizeof(message), 
! 		  server_cnt, _("server"), _("servers"), _("found"));
       statusbar_msg(message);
  
--- 131,144 ----
       }
  
!      snprintf(message, sizeof(message),
! 	      ngettext("One server found", "%d servers found", server_cnt),
! 	      server_cnt);
! 
! /*       make_message(message, sizeof(message),  */
! /*  		  _("No servers found"), */
! /*  		  _("One server found"), */
! /*  		  _("%d servers found"), */
! /*  		  server_cnt); */
! /*       _("server"), _("servers"), _("found")); */
       statusbar_msg(message);