Selaa lähdekoodia

g.version + startup script: improved citation options msg

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@68658 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Neteler 9 vuotta sitten
vanhempi
commit
6365adbbd8
2 muutettua tiedostoa jossa 8 lisäystä ja 6 poistoa
  1. 5 5
      general/g.version/main.c
  2. 3 1
      lib/init/grass.py

+ 5 - 5
general/g.version/main.c

@@ -76,6 +76,11 @@ int main(int argc, char *argv[])
     copyright->description = _("Print also the copyright message");
     copyright->guisection = _("Additional info");
 
+    cite_flag = G_define_flag();
+    cite_flag->key = 'x';
+    cite_flag->description = _("Print also the citation options");
+    cite_flag->guisection = _("Additional info");
+
     build = G_define_flag();
     build->key = 'b';
     build->description = _("Print also the build information");
@@ -98,11 +103,6 @@ int main(int argc, char *argv[])
     shell->description = _("Print info in shell script style (including SVN revision number)");
     shell->guisection = _("Shell");
 
-    cite_flag = G_define_flag();
-    cite_flag->key = 'x';
-    cite_flag->description =
-        _("Display information on how to cite the GRASS GIS software and Addons");
-
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 

+ 3 - 1
lib/init/grass.py

@@ -1429,12 +1429,14 @@ r"""
 %-41s%s (%s)
 %-41sg.manual -i
 %-41sg.version -c
+%-41sg.version -x
 """ % (_("GRASS GIS homepage:"),
         # GTC Running through: SHELL NAME
        _("This version running through:"),
        shellname, os.getenv('SHELL'),
        _("Help is available with the command:"),
-       _("See the licence terms with:")))
+       _("See the licence terms with:"),
+       _("See citation options with:")))
 
     if grass_gui == 'wxpython':
         message("%-41sg.gui wxpython" % _("If required, restart the GUI with:"))