Package: dpkg
Version: 1.13.22
Tags: patch
Severity: minor
An ubuntu user reported here
https://launchpad.net/distros/ubuntu/+source/dpkg/+bug/63744
that dependency descriptions are constructed in a way that makes
problems for translators. I believe the patch below improves the
situation and has no adverse effects.
Here is the changelog bullet point:
* dpkg: describedepcon uses more l10n-friendly approach. (LP 63744.)
Regards,
Ian.
diff -Nru /tmp/InoaTvHgRd/dpkg-1.13.22ubuntu6/src/depcon.c
/tmp/PIGkcmiEoT/dpkg-1.13.22ubuntu7/src/depcon.c
--- /tmp/InoaTvHgRd/dpkg-1.13.22ubuntu6/src/depcon.c 2006-07-21
17:20:25.000000000 +0100
+++ /tmp/PIGkcmiEoT/dpkg-1.13.22ubuntu7/src/depcon.c 2006-10-03
16:59:27.000000000 +0100
@@ -148,18 +148,25 @@
}
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_conflicts: varbufaddstr(addto, _(" conflicts with ")); break;
- case dep_suggests: varbufaddstr(addto, _(" suggests ")); break;
- case dep_enhances: varbufaddstr(addto, _(" enhances ")); break;
- case dep_breaks: varbufaddstr(addto, _(" breaks ")); break;
+ 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_conflicts: fmt= _("%s conflicts with %s"); break;
+ case dep_suggests: fmt= _("%s suggests %s"); break;
+ case dep_enhances: fmt= _("%s enhances %s"); break;
+ case dep_breaks: fmt= _("%s breaks %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,
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
