From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 16:59:29 +0000 (+0000)
Subject: Gettext stuff
X-Git-Tag: 0.7.24ubuntu1~895
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/8c4bad46d421a38bee98a6979389764bc55d8979

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 3c702af9b..5a2e6761f 100644
--- 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 f8cb1ddca..3a51849ba 100644
--- 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 \