Use l10n-friendlier strings to describe dependencies. Closes: #390916

Thanks to Ian Jackson.

diff --git a/ChangeLog b/ChangeLog
index 5c2dbf63f0e4eb76b6fc80e4919a735aae6f0911..b0f61f414f2742657a3b9e8101e1fed801af2d0f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-11  Ian Jackson  <iwj@ubuntu.com>
+           Guillem Jover  <guillem@debian.org>
+
+       * src/depcon.c (describedepcon): Use format arguments to make the
+       strings l10n-friendlier.
+
 2007-02-04  Julien Cristau  <jcristau@debian.org>
 
        * scripts/dpkg-source.pl ($diff_ignore_default_regexp): Add

diff --git a/debian/changelog b/debian/changelog
index 5ff807c1c0273692090fcfdea84b1082792f5d00..ad3988aa25eccff7d4cc19e52b468e3297ca7c5e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,8 @@ dpkg (1.14.0) UNRELEASED; urgency=low
     Thanks to Frank Lichtenheld.
   * Add '.gitignore' to the default dpkg-source -i regex. Closes: #409566
     Thanks to Julien Cristau.
+  * Use l10n-friendlier strings to describe dependencies. Closes: #390916
+    Thanks to Ian Jackson.
 
   [ Updated dpkg translations ]
   * Romanian (Eddy Petrișor).

diff --git a/src/depcon.c b/src/depcon.c
index 835c90ccace00880f7c0183c61e9be551e839811..a54279cbeaad8557320201235419946ba9f00768 100644 (file)
--- a/src/depcon.c
+++ b/src/depcon.c
@@ -148,18 +148,41 @@ int findbreakcycle(struct pkginfo *pkg) {
 }
 
 void describedepcon(struct varbuf *addto, struct dependency *dep) {
-  varbufaddstr(addto,dep->up->name);
+  const char *fmt;
+  struct varbuf depstr;
+
   switch (dep->type) {
-  case dep_depends:     varbufaddstr(addto, _(" depends on "));     break;
-  case dep_predepends:  varbufaddstr(addto, _(" pre-depends on ")); break;
-  case dep_recommends:  varbufaddstr(addto, _(" recommends "));     break;
-  case dep_breaks:      varbufaddstr(addto, _(" breaks "));         break;
-  case dep_conflicts:   varbufaddstr(addto, _(" conflicts with ")); break;
-  case dep_suggests:    varbufaddstr(addto, _(" suggests ")); break;
-  case dep_enhances:    varbufaddstr(addto, _(" enhances "));       break;
-  default:              internerr("unknown deptype");
+  case dep_depends:
+    fmt = _("%s depends on %s");
+    break;
+  case dep_predepends:
+    fmt = _("%s pre-depends on %s");
+    break;
+  case dep_recommends:
+    fmt = _("%s recommends %s");
+    break;
+  case dep_suggests:
+    fmt = _("%s suggests %s");
+    break;
+  case dep_breaks:
+    fmt = _("%s breaks %s");
+    break;
+  case dep_conflicts:
+    fmt = _("%s conflicts with %s");
+    break;
+  case dep_enhances:
+    fmt = _("%s enhances %s");
+    break;
+  default:
+    internerr("unknown deptype");
   }
-  varbufdependency(addto, dep);
+
+  varbufinit(&depstr);
+  varbufdependency(&depstr, dep);
+  varbufaddc(&depstr, 0);
+
+  varbufprintf(addto, fmt, dep->up->name, depstr.buf);
+  varbuffree(&depstr);
 }
   
 int depisok(struct dependency *dep, struct varbuf *whynot,