- i18n fixes from Ralf:
authorpmatilai <pmatilai>
Fri, 30 Jun 2006 08:47:23 +0000 (08:47 +0000)
committerpmatilai <pmatilai>
Fri, 30 Jun 2006 08:47:23 +0000 (08:47 +0000)
  * Eliminate silly Dir::Locale config variable
  * Call bindtextdomain in libapt's initialization

apt-pkg/Makefile.am
apt-pkg/Makefile.in
apt-pkg/init.cc
apt-pkg/rpm/rpmsystem.cc

index 85391de..a634054 100644 (file)
@@ -6,7 +6,7 @@ libapt_pkg_la_LIBADD = @RPMLIBS@
 libapt_pkg_la_LDFLAGS = -version-info 2:0:0 -release @GLIBC_VER@-@LIBSTDCPP_VER@
 
 AM_CPPFLAGS = -DLIBDIR=\"$(libdir)\" -DPKGDATADIR=\"$(pkgdatadir)\"
-AM_CPPFLAGS += -DLOCALEDIR=\"$(localedir)\"
+AM_CPPFLAGS += -DLOCALEDIR=\"$(localedir)\" -DAPT_DOMAIN=\"$(PACKAGE)\"
 AM_CPPFLAGS += -I$(top_srcdir)/lua/include -I$(top_srcdir)/lua/local
 
 if WITH_LUA
index 0240b88..a70c9a0 100644 (file)
@@ -242,8 +242,8 @@ lib_LTLIBRARIES = libapt-pkg.la
 libapt_pkg_la_LIBADD = @RPMLIBS@ $(am__append_1)
 libapt_pkg_la_LDFLAGS = -version-info 2:0:0 -release @GLIBC_VER@-@LIBSTDCPP_VER@
 AM_CPPFLAGS = -DLIBDIR=\"$(libdir)\" -DPKGDATADIR=\"$(pkgdatadir)\" \
-       -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/lua/include \
-       -I$(top_srcdir)/lua/local
+       -DLOCALEDIR=\"$(localedir)\" -DAPT_DOMAIN=\"$(PACKAGE)\" \
+       -I$(top_srcdir)/lua/include -I$(top_srcdir)/lua/local
 libapt_pkg_la_SOURCES = \
        contrib/cdromutl.cc \
        contrib/cdromutl.h \
index 1c392c2..8d99c4d 100644 (file)
@@ -101,13 +101,7 @@ bool pkgInitConfig(Configuration &Cnf)
    if (Cnf.FindB("Debug::pkgInitConfig",false) == true)
       Cnf.Dump();
    
-#ifdef APT_DOMAIN
-   if (Cnf.Exists("Dir::Locale"))
-   {  
-      bindtextdomain(APT_DOMAIN,Cnf.FindDir("Dir::Locale").c_str());
-      bindtextdomain(textdomain(0),Cnf.FindDir("Dir::Locale").c_str());
-   }
-#endif
+   bindtextdomain(APT_DOMAIN,LOCALEDIR);
    
    return true;
 }
index ce710c7..5d4bbf7 100644 (file)
@@ -142,7 +142,6 @@ bool rpmSystem::Initialize(Configuration &Cnf)
    Cnf.CndSet("Dir::Etc::translatelist", "translate.list");
    Cnf.CndSet("Dir::Etc::translateparts", "translate.list.d");
    Cnf.CndSet("Dir::State::prefetch", "prefetch");
-   Cnf.CndSet("Dir::Locale",LOCALEDIR);
    Cnf.CndSet("Acquire::DistroID","Conectiva"); // hee hee
    Cnf.CndSet("Acquire::CDROM::Mount", "/mnt/cdrom");
    Cnf.CndSet("Acquire::CDROM::Copy-All", "true");