Gettext stuff

Author: jgg
Date: 2002-10-16 05:21:33 GMT
Gettext stuff

diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 3c702af9b7b6a12e41730383c53fc6be83fe3548..5a2e6761f5b1ad4d39c2096ae834730d3ba05286 100644 (file)
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: init.cc,v 1.17 2001/12/05 07:22:39 tausq Exp $
+// $Id: init.cc,v 1.18 2002/10/16 05:21:33 jgg Exp $
 /* ######################################################################
 
    Init - Initialize the package library
@@ -93,7 +93,13 @@ bool pkgInitConfig(Configuration &Cnf)
    
    if (Cnf.FindB("Debug::pkgInitConfig",false) == true)
       Cnf.Dump();
-      
+   
+   if (Cnf.Exists("Dir::Locale"))
+   {  
+      bindtextdomain(DOMAIN,Cnf.FindDir("Dir::Locale").c_str());
+      bindtextdomain(textdomain(0),Cnf.FindDir("Dir::Locale").c_str());
+   }
+   
    return true;
 }
                                                                        /*}}}*/

diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index f8cb1ddca599a08ce4557f54278ba4e3a0023503..3a51849ba8fcc3ed020ce4fdf2dc7894fab0bf31 100644 (file)
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -9,12 +9,14 @@ HEADER_TARGETDIRS = apt-pkg
 # Bring in the default rules
 include ../buildlib/defaults.mak
 
-# The library name, don't forget to update init.h
+# The library name, don't forget to update init.h and the copy in 
+# methods/makefile - FIXME
 LIBRARY=apt-pkg
 LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
 MAJOR=3.3
 MINOR=0
 SLIBS=$(PTHREADLIB)
+DOMAIN:=libapt-pkg$(MAJOR)
 
 # Source code for the contributed non-core things
 SOURCE = contrib/mmap.cc contrib/error.cc contrib/strutl.cc \