[GRASS-SVN] r61846 - grass/trunk/lib/python/temporal

[svn_grass at osgeo.org]

Author: neteler
Date: 2014-09-09 11:28:57 -0700 (Tue, 09 Sep 2014)
New Revision: 61846

Modified:
   grass/trunk/lib/python/temporal/aggregation.py
   grass/trunk/lib/python/temporal/register.py
Log:
temporal: more clear user messages

Modified: grass/trunk/lib/python/temporal/aggregation.py
===================================================================
--- grass/trunk/lib/python/temporal/aggregation.py	2014-09-09 16:59:52 UTC (rev 61845)
+++ grass/trunk/lib/python/temporal/aggregation.py	2014-09-09 18:28:57 UTC (rev 61846)
@@ -123,7 +123,7 @@
 
     msgr = get_tgis_message_interface()
 
-    msgr.verbose(_("Aggregate %s raster maps") % (len(inputs)))
+    msgr.verbose(_("Aggregating %s raster maps") % (len(inputs)))
     output = "%s_%i" % (base, int(offset) + count)
 
     mapset = get_current_mapset()
@@ -141,7 +141,7 @@
                          "use overwrite flag to overwrite"%({"name":new_map.get_name()})))
             return
 
-    msgr.verbose(_("Compute aggregation of maps between %(st)s - %(end)s" % {
+    msgr.verbose(_("Computing aggregation of maps between %(st)s - %(end)s" % {
                    'st': str(start), 'end': str(end)}))
 
     # Create the r.series input file
@@ -166,7 +166,7 @@
 
     if ret != 0:
         dbif.close()
-        msgr.fatal(_("Error while r.series computation"))
+        msgr.fatal(_("Error occurred in r.series computation"))
 
     # Read the raster map data
     new_map.load()
@@ -266,7 +266,7 @@
                 aggregation_list.append(map_layer.get_name())
 
         if aggregation_list:
-            msgr.verbose(_("Aggregate %(len)i raster maps from %(start)s to %(end)s") \
+            msgr.verbose(_("Aggregating %(len)i raster maps from %(start)s to %(end)s") \
                            %({"len":len(aggregation_list),
                            "start":str(granule.temporal_extent.get_start_time()), 
                            "end":str(granule.temporal_extent.get_end_time())}))
@@ -284,7 +284,7 @@
 
             if map_layer.map_exists() is True and overwrite is False:
                 msgr.fatal(_("Unable to perform aggregation. Output raster map <%(name)s> "\
-                             "exists and overwrite flag is not set"%({"name":output_name})))
+                             "exists and overwrite flag was not set"%({"name":output_name})))
 
             output_list.append(map_layer)
 

Modified: grass/trunk/lib/python/temporal/register.py
===================================================================
--- grass/trunk/lib/python/temporal/register.py	2014-09-09 16:59:52 UTC (rev 61845)
+++ grass/trunk/lib/python/temporal/register.py	2014-09-09 18:28:57 UTC (rev 61846)
@@ -174,7 +174,7 @@
         
         if map.map_exists() is not True:
             msgr.fatal(_("Unable to update %(t)s map <%(id)s>. "
-                            "The map does not exists.") %
+                            "The map does not exist.") %
                             {'t': map.get_type(),
                             'id': map.get_map_id()})
 
@@ -388,12 +388,12 @@
             start_time = increment_datetime_by_string(
                 start_time, increment, mult)
             if start_time is None:
-                msgr.fatal(_("Error in increment computation"))
+                msgr.fatal(_("Error occurred in increment computation"))
             if interval:
                 end_time = increment_datetime_by_string(
                     start_time, increment, 1)
                 if end_time is None:
-                    msgr.fatal(_("Error in increment computation"))
+                    msgr.fatal(_("Error occurred in increment computation"))
 
         if map.get_layer():
             msgr.debug(1, _("Set absolute valid time for map <%(id)s> with "