[GRASS-SVN] r73040 - grass/branches/releasebranch_7_4/lib/vector/Vlib

[svn_grass at osgeo.org]

Author: mmetz
Date: 2018-08-03 14:20:28 -0700 (Fri, 03 Aug 2018)
New Revision: 73040

Modified:
   grass/branches/releasebranch_7_4/lib/vector/Vlib/merge_lines.c
Log:
Vlib, Vect_merge_lines(): use correct line type in messages (backport trunk r72944)

Modified: grass/branches/releasebranch_7_4/lib/vector/Vlib/merge_lines.c
===================================================================
--- grass/branches/releasebranch_7_4/lib/vector/Vlib/merge_lines.c	2018-08-03 21:18:24 UTC (rev 73039)
+++ grass/branches/releasebranch_7_4/lib/vector/Vlib/merge_lines.c	2018-08-03 21:20:28 UTC (rev 73040)
@@ -237,8 +237,18 @@
 	/* nlines = Vect_get_num_lines(Map); */
     }
 
-    G_verbose_message(_("%d boundaries merged"), merged);
-    G_verbose_message(_("%d new boundaries"), newl);
+    if (type == GV_LINE) {
+	G_verbose_message(_("%d lines merged"), merged);
+	G_verbose_message(_("%d new lines"), newl);
+    }
+    else if (type == GV_BOUNDARY) {
+	G_verbose_message(_("%d boundaries merged"), merged);
+	G_verbose_message(_("%d new boundaries"), newl);
+    }
+    else {
+	G_verbose_message(_("%d lines and boundaries merged"), merged);
+	G_verbose_message(_("%d new lines and boundaries"), newl);
+    }
 
     if (new_lines)
 	*new_lines = newl;