[GRASS-SVN] r33634 - in grass/branches/develbranch_6/display:
d.geodesic d.rhumbline
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Oct 1 00:36:21 EDT 2008
Author: hamish
Date: 2008-10-01 00:36:21 -0400 (Wed, 01 Oct 2008)
New Revision: 33634
Modified:
grass/branches/develbranch_6/display/d.geodesic/main.c
grass/branches/develbranch_6/display/d.rhumbline/main.c
Log:
i18n, EXIT_SUCCESS, no opts should launch interactive mouse mode
Modified: grass/branches/develbranch_6/display/d.geodesic/main.c
===================================================================
--- grass/branches/develbranch_6/display/d.geodesic/main.c 2008-10-01 03:44:25 UTC (rev 33633)
+++ grass/branches/develbranch_6/display/d.geodesic/main.c 2008-10-01 04:36:21 UTC (rev 33634)
@@ -7,7 +7,7 @@
* Bernhard Reiter <bernhard intevation.de>,
* Eric G. Miller <egm2 jps.net>,
* Glynn Clements <glynn gclements.plus.com>,
- * Hamish Bowman <hamish_nospam yahoo.com>,
+ * Hamish Bowman <hamish_b yahoo.com>,
* Jan-Oliver Wagner <jan intevation.de>
* PURPOSE: displays a geodesic line in the active frame on the user's
* graphics monitor
@@ -32,7 +32,6 @@
int text_color;
int use_mouse;
double lon1, lat1, lon2, lat2;
- char msg[100];
char *deftcolor;
struct GModule *module;
struct
@@ -45,22 +44,22 @@
module = G_define_module();
module->keywords = _("display");
module->description =
- "Displays a geodesic line, tracing the shortest distance "
+ _("Displays a geodesic line, tracing the shortest distance "
"between two geographic points along a great circle, in "
- "a longitude/latitude data set.";
+ "a longitude/latitude data set.");
parm.coor = G_define_option();
parm.coor->key = "coor";
parm.coor->key_desc = "lon1,lat1,lon2,lat2";
parm.coor->type = TYPE_STRING;
parm.coor->required = NO;
- parm.coor->description = "Starting and ending coordinates";
+ parm.coor->description = _("Starting and ending coordinates");
parm.lcolor = G_define_option();
parm.lcolor->key = "lcolor";
parm.lcolor->type = TYPE_STRING;
parm.lcolor->required = NO;
- parm.lcolor->description = "Line color";
+ parm.lcolor->description = _("Line color");
parm.lcolor->options = D_color_list();
parm.lcolor->answer = DEFAULT_FG_COLOR;
@@ -68,41 +67,42 @@
parm.tcolor->key = "tcolor";
parm.tcolor->type = TYPE_STRING;
parm.tcolor->required = NO;
- parm.tcolor->description = "Text color or \"none\"";
+ parm.tcolor->description = _("Text color or \"none\"");
/* parm.tcolor->options = D_color_list(); */
- if (G_parser(argc, argv))
+ if (argc > 1 && G_parser(argc, argv))
exit(EXIT_FAILURE);
+
if (G_projection() != PROJECTION_LL)
- G_fatal_error(_("Database is not a %s"), G__projection_name(PROJECTION_LL));
+ G_fatal_error(_("Location is not %s"), G__projection_name(PROJECTION_LL));
use_mouse = 1;
if (parm.coor->answer) {
if (parm.coor->answers[0] == NULL)
- G_fatal_error("No coordinates given");
+ G_fatal_error(_("No coordinates given"));
if (!G_scan_easting(parm.coor->answers[0], &lon1, G_projection())) {
G_usage();
- G_fatal_error("%s - illegal longitude", parm.coor->answers[0]);
+ G_fatal_error(_("%s - illegal longitude"), parm.coor->answers[0]);
}
if (!G_scan_northing(parm.coor->answers[1], &lat1, G_projection())) {
G_usage();
- G_fatal_error("%s - illegal longitude", parm.coor->answers[1]);
+ G_fatal_error(_("%s - illegal longitude"), parm.coor->answers[1]);
}
if (!G_scan_easting(parm.coor->answers[2], &lon2, G_projection())) {
G_usage();
- G_fatal_error("%s - illegal longitude", parm.coor->answers[2]);
+ G_fatal_error(_("%s - illegal longitude"), parm.coor->answers[2]);
}
if (!G_scan_northing(parm.coor->answers[3], &lat2, G_projection())) {
G_usage();
- G_fatal_error("%s - illegal longitude", parm.coor->answers[3]);
+ G_fatal_error(_("%s - illegal longitude"), parm.coor->answers[3]);
}
use_mouse = 0;
}
if (R_open_driver() != 0)
- G_fatal_error("No graphics device selected");
+ G_fatal_error(_("No graphics device selected"));
line_color = D_translate_color(parm.lcolor->answer);
if (!line_color)
@@ -131,5 +131,5 @@
D_add_to_list(G_recreate_command());
R_close_driver();
- exit(0);
+ exit(EXIT_SUCCESS);
}
Modified: grass/branches/develbranch_6/display/d.rhumbline/main.c
===================================================================
--- grass/branches/develbranch_6/display/d.rhumbline/main.c 2008-10-01 03:44:25 UTC (rev 33633)
+++ grass/branches/develbranch_6/display/d.rhumbline/main.c 2008-10-01 04:36:21 UTC (rev 33634)
@@ -7,7 +7,7 @@
* Bernhard Reiter <bernhard intevation.de>,
* Eric G. Miller <egm2 jps.net>,
* Glynn Clements <glynn gclements.plus.com>,
- * Hamish Bowman <hamish_nospam yahoo.com>,
+ * Hamish Bowman <hamish_b yahoo.com>,
* Jan-Oliver Wagner <jan intevation.de>
* PURPOSE: displays the rhumbline joining two user-specified points
* COPYRIGHT: (C) 1999-2006 by the GRASS Development Team
@@ -44,21 +44,21 @@
module = G_define_module();
module->keywords = _("display");
module->description =
- "Displays the rhumbline joining two user-specified "
- "points, in the active frame on the user's graphics monitor.";
+ _("Displays the rhumbline joining two user-specified "
+ "points, in the active frame on the user's graphics monitor.");
parm.coor = G_define_option();
parm.coor->key = "coor";
parm.coor->key_desc = "lon1,lat1,lon2,lat2";
parm.coor->type = TYPE_STRING;
parm.coor->required = NO;
- parm.coor->description = "Starting and ending coordinates";
+ parm.coor->description = _("Starting and ending coordinates");
parm.lcolor = G_define_option();
parm.lcolor->key = "lcolor";
parm.lcolor->type = TYPE_STRING;
parm.lcolor->required = NO;
- parm.lcolor->description = "Line color";
+ parm.lcolor->description = _("Line color");
parm.lcolor->options = D_color_list();
parm.lcolor->answer = DEFAULT_FG_COLOR;
@@ -67,44 +67,45 @@
parm.tcolor->key = "tcolor";
parm.tcolor->type = TYPE_STRING;
parm.tcolor->required = NO;
- parm.tcolor->description = "Text color";
+ parm.tcolor->description = _("Text color");
parm.tcolor->options = D_color_list();
#endif
- if (G_parser(argc, argv))
+ if (argc > 1 && G_parser(argc, argv))
exit(EXIT_FAILURE);
+
if (G_projection() != PROJECTION_LL)
- G_fatal_error("%s: database is not a %s database",
- argv[0], G__projection_name(PROJECTION_LL));
+ G_fatal_error(_("Location is not %s"),
+ G__projection_name(PROJECTION_LL));
use_mouse = 1;
if (parm.coor->answer) {
if (parm.coor->answers[0] == NULL)
- G_fatal_error("No coordinates given");
+ G_fatal_error(_("No coordinates given"));
if (!G_scan_easting(parm.coor->answers[0], &lon1, G_projection())) {
G_usage();
- G_fatal_error("%s - illegal longitude", parm.coor->answers[0]);
+ G_fatal_error(_("%s - illegal longitude"), parm.coor->answers[0]);
}
if (!G_scan_northing(parm.coor->answers[1], &lat1, G_projection())) {
G_usage();
- G_fatal_error("%s - illegal longitude", parm.coor->answers[1]);
+ G_fatal_error(_("%s - illegal longitude"), parm.coor->answers[1]);
}
if (!G_scan_easting(parm.coor->answers[2], &lon2, G_projection())) {
G_usage();
- G_fatal_error("%s - illegal longitude", parm.coor->answers[2]);
+ G_fatal_error(_("%s - illegal longitude"), parm.coor->answers[2]);
}
if (!G_scan_northing(parm.coor->answers[3], &lat2, G_projection())) {
G_usage();
- G_fatal_error("%s - illegal longitude", parm.coor->answers[3]);
+ G_fatal_error(_("%s - illegal longitude"), parm.coor->answers[3]);
}
use_mouse = 0;
}
if (R_open_driver() != 0)
- G_fatal_error("No graphics device selected");
+ G_fatal_error(_("No graphics device selected"));
line_color = D_translate_color(parm.lcolor->answer);
if (!line_color)
@@ -133,5 +134,5 @@
}
R_close_driver();
- exit(0);
+ exit(EXIT_SUCCESS);
}
More information about the grass-commit
mailing list