Author: guillem
Date: 2007-02-11 00:25:51 +0100 (Sun, 11 Feb 2007)
New Revision: 639
Modified:
trunk/ChangeLog
trunk/debian/changelog
trunk/src/depcon.c
Log:
Use l10n-friendlier strings to describe dependencies. Closes: #390916
Thanks to Ian Jackson.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-02-04 02:29:49 UTC (rev 638)
+++ trunk/ChangeLog 2007-02-10 23:25:51 UTC (rev 639)
@@ -1,3 +1,9 @@
+2007-02-11 Ian Jackson <[EMAIL PROTECTED]>
+ Guillem Jover <[EMAIL PROTECTED]>
+
+ * src/depcon.c (describedepcon): Use format arguments to make the
+ strings l10n-friendlier.
+
2007-02-04 Julien Cristau <[EMAIL PROTECTED]>
* scripts/dpkg-source.pl ($diff_ignore_default_regexp): Add
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-02-04 02:29:49 UTC (rev 638)
+++ trunk/debian/changelog 2007-02-10 23:25:51 UTC (rev 639)
@@ -24,6 +24,8 @@
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).
Modified: trunk/src/depcon.c
===================================================================
--- trunk/src/depcon.c 2007-02-04 02:29:49 UTC (rev 638)
+++ trunk/src/depcon.c 2007-02-10 23:25:51 UTC (rev 639)
@@ -148,18 +148,41 @@
}
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,
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
