瀏覽代碼

improve override projection message

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@65684 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 9 年之前
父節點
當前提交
411c3608f7

+ 3 - 2
raster/r.external/proj.c

@@ -104,8 +104,9 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, int override)
 			    cellhd->proj, cellhd->zone);
 	    }
 	    strcat(error_msg,
-		   _("\nYou can use the -o flag to r.external to override this check and "
-		     "use the location definition for the dataset.\n"));
+		   _("\nIn case of no significant differences in the projection definitions,"
+		     " use the -o flag to ignore them and use"
+		     " current location definition.\n"));
 	    strcat(error_msg,
 		   _("Consider generating a new location from the input dataset using "
 		     "the 'location' parameter.\n"));

+ 3 - 2
raster/r.in.gdal/main.c

@@ -502,8 +502,9 @@ int main(int argc, char *argv[])
 				cellhd.proj, cellhd.zone);
 		}
 		strcat(error_msg,
-		       _("\nYou can use the -o flag to r.in.gdal to override this check and "
-			"use the location definition for the dataset.\n"));
+		       _("\nIn case of no significant differences in the projection definitions,"
+			 " use the -o flag to ignore them and use"
+			 " current location definition.\n"));
 		strcat(error_msg,
 		       _("Consider generating a new location from the input dataset using "
 			"the 'location' parameter.\n"));

+ 3 - 2
raster/r.in.lidar/main.c

@@ -445,8 +445,9 @@ int main(int argc, char *argv[])
 		}
 	    }
 	    sprintf(error_msg + strlen(error_msg),
-		    _("\nYou can use the -o flag to %s to override this projection check.\n"),
-		    G_program_name());
+		    _("\nIn case of no significant differences in the projection definitions,"
+		      " use the -o flag to ignore them and use"
+		      " current location definition.\n"));
 	    strcat(error_msg,
 		   _("Consider generating a new location with 'location' parameter"
 		    " from input data set.\n"));

+ 4 - 1
scripts/r.unpack/r.unpack.py

@@ -128,7 +128,10 @@ def main():
             if diff_result_2:
                 grass.warning(_("Difference between PROJ_UNITS file of packed map "
                                 "and of current location:\n{diff}").format(diff=''.join(diff_result_2)))
-            grass.fatal(_("Projection information does not match. Aborting."))
+            grass.fatal(_("Projection of dataset does not appear to match current location."
+                          " In case of no significant differences in the projection definitions,"
+                          " use the -o flag to ignore them and use"
+                          " current location definition."))
 
     # install in $MAPSET
     for element in ['cats', 'cell', 'cellhd', 'cell_misc', 'colr', 'fcell', 'hist']:

+ 4 - 1
scripts/v.unpack/v.unpack.py

@@ -131,7 +131,10 @@ def main():
             if diff_result_2:
                 grass.warning(_("Difference between PROJ_UNITS file of packed map "
                                 "and of current location:\n{diff}").format(diff=''.join(diff_result_2)))
-            grass.fatal(_("Projection information does not match. Aborting."))
+            grass.fatal(_("Projection of dataset does not appear to match current location."
+                          " In case of no significant differences in the projection definitions,"
+                          " use the -o flag to ignore them and use"
+                          " current location definition."))
 
     # new db
     fromdb = os.path.join(tmp_dir, 'db.sqlite')

+ 3 - 1
vector/v.in.lidar/main.c

@@ -465,7 +465,9 @@ int main(int argc, char *argv[])
 		}
 	    }
 	    sprintf(error_msg + strlen(error_msg),
-		    _("\nYou can use the -o flag to %s to override this projection check.\n"),
+		    _("\nIn case of no significant differences in the projection definitions,"
+		      " use the -o flag to ignore them and use"
+		      " current location definition.\n"),
 		    G_program_name());
 	    strcat(error_msg,
 		   _("Consider generating a new location with 'location' parameter"

+ 3 - 1
vector/v.in.ogr/main.c

@@ -693,7 +693,9 @@ int main(int argc, char *argv[])
 		}
 	    }
 	    sprintf(error_msg + strlen(error_msg),
-		    _("\nYou can use the -o flag to %s to override this projection check.\n"),
+		    _("\nIn case of no significant differences in the projection definitions,"
+		      " use the -o flag to ignore them and use"
+		      " current location definition.\n"),
 		    G_program_name());
 	    strcat(error_msg,
 		   _("Consider generating a new location with 'location' parameter"