[Lib-cvs] LIB ChangeLog,1.289,1.290 io.c,1.33,1.34 ostatnia_zmiana,1.179,1.180 rozne.c,1.12,1.13

[<os...@us...>]

Update of /cvsroot/lib/LIB
In directory usw-pr-cvs1:/tmp/cvs-serv22416

Modified Files:
	ChangeLog io.c ostatnia_zmiana rozne.c 
Log Message:
	* usuniêty komunikat o braku ./lib.data
	* rozgrzebane init_locale
	* uaktualnione intl/


Index: ChangeLog
===================================================================
RCS file: /cvsroot/lib/LIB/ChangeLog,v
retrieving revision 1.289
retrieving revision 1.290
diff -C2 -d -r1.289 -r1.290
*** ChangeLog	10 Jul 2002 15:01:11 -0000	1.289
--- ChangeLog	10 Jul 2002 22:13:49 -0000	1.290
***************
*** 1,2 ****
--- 1,7 ----
+ 2002/07/11  0:13:25 przewdnik
+ 	* usuniêty komunikat o braku ./lib.data
+ 	* rozgrzebane init_locale
+ 	* uaktualnione intl/
+ 
  2002/07/10 17:00:45 przewdnik
  	* drobna poprawka w zrob_locale

Index: io.c
===================================================================
RCS file: /cvsroot/lib/LIB/io.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** io.c	18 Feb 2002 15:44:55 -0000	1.33
--- io.c	10 Jul 2002 22:13:49 -0000	1.34
***************
*** 18,23 ****
--- 18,25 ----
      strcat(sciezka, "/.LIB");
  #ifdef DJGPP
+     if (!stat("./lib.dat",&st))
      otworz_plik("./lib.dat", data, &Plik);
  #else
+     if (!stat("./lib.data",&st))
      otworz_plik("./lib.data", data, &Plik);
  #endif

Index: ostatnia_zmiana
===================================================================
RCS file: /cvsroot/lib/LIB/ostatnia_zmiana,v
retrieving revision 1.179
retrieving revision 1.180
diff -C2 -d -r1.179 -r1.180
*** ostatnia_zmiana	10 Jul 2002 15:01:12 -0000	1.179
--- ostatnia_zmiana	10 Jul 2002 22:13:49 -0000	1.180
***************
*** 1 ****
! 	* drobna poprawka w zrob_locale
--- 1,3 ----
! 	* usuniêty komunikat o braku ./lib.data
! 	* rozgrzebane init_locale
! 	* uaktualnione intl/

Index: rozne.c
===================================================================
RCS file: /cvsroot/lib/LIB/rozne.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** rozne.c	24 Sep 2001 14:53:36 -0000	1.12
--- rozne.c	10 Jul 2002 22:13:49 -0000	1.13
***************
*** 36,58 ****
  {
  #ifdef OPT
!     setlocale(LC_ALL, "");
!     old_loc = setlocale(LC_ALL, NULL);
      sav_loc = strdup(old_loc);
!     if (getenv("LC_ALL"))
! 	strncpy(loc_env, getenv("LC_ALL"), 50);
      strncpy(_locale, sav_loc, 15);
      if (strcmp(_locale, "pl_PL") && (strcmp(_locale, "pl"))) {
  #ifdef LINUX
! 	setenv("LC_ALL", "en", 1);
  	strcpy(_locale, "en");
  #endif
  #if defined(CYGWIN) || defined(_DJGPP)
! 	setenv("LC_ALL", "pl", 1);
  	strcpy(_locale, "pl");
  #endif
! 	setlocale(LC_ALL, "");
!     }
!     bindtextdomain(PACKAGE, LOCALEDIR);
!     textdomain(PACKAGE);
  #endif
  }
--- 36,73 ----
  {
  #ifdef OPT
!     setlocale(LC_CTYPE, "");
!     setlocale(LC_MESSAGES, "");
!     printf(LOCALEDIR);
!     printf("/");
!     printf(PACKAGE);
!     printf("\n");
!     old_loc = setlocale(LC_MESSAGES, NULL);
      sav_loc = strdup(old_loc);
!     if (getenv("LC_MESSAGES"))
! 	strncpy(loc_env, getenv("LC_MESSAGES"), 50);
      strncpy(_locale, sav_loc, 15);
+     printf(sav_loc);
+     printf("\n");
      if (strcmp(_locale, "pl_PL") && (strcmp(_locale, "pl"))) {
  #ifdef LINUX
! 	printf("EN\n");
! 	setenv("LC_MESSAGES", "en", 1);
  	strcpy(_locale, "en");
  #endif
  #if defined(CYGWIN) || defined(_DJGPP)
! 	setenv("LC_MESSAGES", "pl", 1);
  	strcpy(_locale, "pl");
  #endif
! 	setlocale(LC_MESSAGES, "");
!     } 
!     fprintf(stderr,"Ustawiam\n");
!     fprintf(stderr,PACKAGE ", " LOCALEDIR, "\n\n\n\n\n");
!     fprintf(stderr,"\n");
!     fprintf(stderr,"\n");
! 
!    fprintf(stderr,bindtextdomain(PACKAGE, LOCALEDIR));
!     fprintf(stderr,textdomain(PACKAGE));
!     fprintf(stderr,"\n");
!     fprintf(stderr,gettext("Dupa\n"));
  #endif
  }
***************
*** 61,67 ****
  {
  #ifdef OPT
!     setlocale(LC_ALL, sav_loc);
      my_free(sav_loc);
!     setenv("LC_ALL", loc_env, 1);
  #endif
  }
--- 76,82 ----
  {
  #ifdef OPT
!     setlocale(LC_MESSAGES, sav_loc);
      my_free(sav_loc);
!     setenv("LC_MESSAGES", loc_env, 1);
  #endif
  }