[GRASS-SVN] r56649 - in grass/branches/releasebranch_6_4/imagery: i.cluster i.gensig i.gensigset i.maxlik i.smap/shapiro

[svn_grass at osgeo.org]

Author: neteler
Date: 2013-06-09 05:47:58 -0700 (Sun, 09 Jun 2013)
New Revision: 56649

Modified:
   grass/branches/releasebranch_6_4/imagery/i.cluster/open_files.c
   grass/branches/releasebranch_6_4/imagery/i.gensig/parse.c
   grass/branches/releasebranch_6_4/imagery/i.gensigset/parse.c
   grass/branches/releasebranch_6_4/imagery/i.maxlik/open.c
   grass/branches/releasebranch_6_4/imagery/i.smap/shapiro/parse.c
Log:
i18n: more understandable error messages since I_find_group() only searches in the current mapset; re-use existing messages

Modified: grass/branches/releasebranch_6_4/imagery/i.cluster/open_files.c
===================================================================
--- grass/branches/releasebranch_6_4/imagery/i.cluster/open_files.c	2013-06-09 12:37:33 UTC (rev 56648)
+++ grass/branches/releasebranch_6_4/imagery/i.cluster/open_files.c	2013-06-09 12:47:58 UTC (rev 56649)
@@ -14,7 +14,7 @@
 
     G_strip(group);
     if (!I_find_group(group))
-	G_fatal_error(_("Group <%s> not found"), group);
+	G_fatal_error(_("Group <%s> not found in current mapset"), group);
 
     G_strip(subgroup);
     if (!I_find_subgroup(group, subgroup))

Modified: grass/branches/releasebranch_6_4/imagery/i.gensig/parse.c
===================================================================
--- grass/branches/releasebranch_6_4/imagery/i.gensig/parse.c	2013-06-09 12:37:33 UTC (rev 56648)
+++ grass/branches/releasebranch_6_4/imagery/i.gensig/parse.c	2013-06-09 12:47:58 UTC (rev 56649)
@@ -36,10 +36,10 @@
 	G_fatal_error(_("Raster map <%s> not found"), parms->training_map);
 
     if (!I_find_group(parms->group))
-	G_fatal_error(_("Group <%s> not found"), parms->group);
+	G_fatal_error(_("Group <%s> not found in current mapset"), parms->group);
 
     if (!I_find_subgroup(parms->group, parms->subgroup))
-	G_fatal_error(_("Subgroup <%s> not found"), parms->subgroup);
+	G_fatal_error(_("Subgroup <%s> in group <%s> not found"), parms->subgroup, parms->group);
 
     return 0;
 }

Modified: grass/branches/releasebranch_6_4/imagery/i.gensigset/parse.c
===================================================================
--- grass/branches/releasebranch_6_4/imagery/i.gensigset/parse.c	2013-06-09 12:37:33 UTC (rev 56648)
+++ grass/branches/releasebranch_6_4/imagery/i.gensigset/parse.c	2013-06-09 12:47:58 UTC (rev 56649)
@@ -42,10 +42,10 @@
 	G_fatal_error(_("Raster map <%s> not found"), parms->training_map);
     }
     if (!I_find_group(parms->group)) {
-	G_fatal_error(_("Group <%s> not found"), parms->group);
+	G_fatal_error(_("Group <%s> not found in current mapset"), parms->group);
     }
     if (!I_find_subgroup(parms->group, parms->subgroup)) {
-	G_fatal_error(_("Subgroup <%s> not found"), parms->subgroup);
+	G_fatal_error(_("Subgroup <%s> in group <%s> not found"), parms->subgroup, parms->group);
     }
     if (sscanf(maxsig->answer, "%d", &parms->maxsubclasses) != 1 ||
 	parms->maxsubclasses <= 0) {

Modified: grass/branches/releasebranch_6_4/imagery/i.maxlik/open.c
===================================================================
--- grass/branches/releasebranch_6_4/imagery/i.maxlik/open.c	2013-06-09 12:37:33 UTC (rev 56648)
+++ grass/branches/releasebranch_6_4/imagery/i.maxlik/open.c	2013-06-09 12:47:58 UTC (rev 56649)
@@ -13,7 +13,7 @@
 
     I_init_group_ref(&Ref);
     if (!I_find_group(group))
-	G_fatal_error(_("Group <%s> not found"), group);
+	G_fatal_error(_("Group <%s> not found in current mapset"), group);
 
     if (!I_find_subgroup(group, subgroup))
 	G_fatal_error(_("Subgroup <%s> in group <%s> not found"),

Modified: grass/branches/releasebranch_6_4/imagery/i.smap/shapiro/parse.c
===================================================================
--- grass/branches/releasebranch_6_4/imagery/i.smap/shapiro/parse.c	2013-06-09 12:37:33 UTC (rev 56648)
+++ grass/branches/releasebranch_6_4/imagery/i.smap/shapiro/parse.c	2013-06-09 12:47:58 UTC (rev 56649)
@@ -55,10 +55,10 @@
 
     /* check all the inputs */
     if (!I_find_group(parms->group))
-	G_fatal_error(_("Group <%s> not found"), parms->group);
+	G_fatal_error(_("Group <%s> not found in current mapset"), parms->group);
 
     if (!I_find_subgroup(parms->group, parms->subgroup))
-	G_fatal_error(_("Subgroup <%s> not found"), parms->subgroup);
+	G_fatal_error(_("Subgroup <%s> in group <%s> not found"), parms->subgroup, parms->group);
 
     if (sscanf(blocksize->answer, "%d", &parms->blocksize) != 1
 	|| parms->blocksize <= 8)