r.patch 1015 B

12345678910111213141516171819202122232425262728293031323334
  1. Index: src/main/errors.c
  2. --- src/main/errors.c.orig 2005-06-12 10:47:32 +0200
  3. +++ src/main/errors.c 2005-06-25 13:53:16 +0200
  4. @@ -354,8 +354,12 @@
  5. cntxt.cend = &cleanup_PrintWarnings;
  6. inPrintWarnings = 1;
  7. +#ifdef ENABLE_NLS
  8. header = ngettext("Warning message:\n", "Warning messages:\n",
  9. R_CollectWarnings);
  10. +#else
  11. + header = "Warning message:\n";
  12. +#endif
  13. if( R_CollectWarnings == 1 ) {
  14. REprintf(header);
  15. names = CAR(ATTRIB(R_Warnings));
  16. Index: src/main/util.c
  17. --- src/main/util.c.orig 2005-06-12 10:47:32 +0200
  18. +++ src/main/util.c 2005-06-25 13:54:52 +0200
  19. @@ -803,9 +803,13 @@
  20. void checkArity(SEXP op, SEXP args)
  21. {
  22. if (PRIMARITY(op) >= 0 && PRIMARITY(op) != length(args))
  23. +#ifdef ENABLE_NLS
  24. error(ngettext("%d argument passed to '%s' which requires %d",
  25. "%d arguments passed to '%s' which requires %d",
  26. length(args)),
  27. +#else
  28. + error("%d argument passed to '%s' which requires %d",
  29. +#endif
  30. length(args), PRIMNAME(op), PRIMARITY(op));
  31. }