Changeset 29468

Timestamp:

Dec 18, 2007, 3:21:31 AM (17 years ago)

Author:

martinl

Message:

Fixing bug (Trac #1): latitude_of_center and longitude_of_center ignored.
Message standardization, i18n.

Location:

grass/trunk/general/g.setproj

Files:

• get_stp.c (modified) (10 diffs)
• main.c (modified) (15 diffs)
• proj.c (modified) (3 diffs)

grass/trunk/general/g.setproj/get_stp.c

@@ -3 +3 @@
 #include <stdlib.h>
 #include <grass/gis.h>
+#include <grass/glocale.h>
 #include "local_proto.h"
 
@@ -36 +37 @@
         }
         if (get_stp_code(code, string, buff) == 0)
-                G_fatal_error("This should not happen see your system admin");
+            G_fatal_error(_("This should not happen see your system admin"));
 
         return;
@@ -92 +93 @@
                 fipsfile = fopen(FIPSfile, "r");
                 if (fipsfile == NULL) {
-                        G_fatal_error("Can not open FIPS code file");
+                    G_fatal_error(_("Unable to open FIPS code file"));
                 }
                 ask_fips(fipsfile, &SFIPS, &CFIPS, &special_case);
@@ -117 +118 @@
                         break;
                 else {          /* no match */
-                        fprintf(stderr, "\nNo match of fips state %d county %d \n", SFIPS, CFIPS);
-                        fclose(fipsfile);
+                    G_warning(_("No match of fips state %d county %d"), SFIPS, CFIPS);
+                    fclose(fipsfile);
                 }
         }
@@ -153 +154 @@
         Tmp_file1 = G_tempfile();
         if (NULL == (Tmp_fd1 = fopen(Tmp_file1, "w")))
-                G_fatal_error("Cannot open temp file");
+            G_fatal_error(_("Unable to open temporary file <%s>"),
+                          Tmp_file1);
         Tmp_file2 = G_tempfile();
         if (NULL == (Tmp_fd2 = fopen(Tmp_file2, "w")))
-                G_fatal_error("Cannot open temp file");
-
+            G_fatal_error(_("Unable to open temporary file <%s>"),
+                          Tmp_file2);
         while (fgets(buff, 80, fp) != NULL) {
                 sscanf(buff, "%d%d%s%s%d", &sfips, &cfips, STabbr, COname, &NUM_ZON);
@@ -171 +173 @@
         sf_keys = G_read_key_value_file(Tmp_file2, &in_stat);
         if (in_stat != 0)
-                G_fatal_error("reading sf key_value temp file");
+            G_fatal_error(_("Reading sf key_value temp file"));
 
         for (;;) {
@@ -201 +203 @@
                         sprintf(buff, "You have chosen state %s, Correct", a);
                         if (a == NULL)
-                                fprintf(stderr, "\nInvalid State FIPS code\n");
+                            G_warning(_("Invalid State FIPS code"));
                         else if (G_yes(buff, 1))
                                 break;
@@ -268 +270 @@
         Tmp_file1 = G_tempfile();
         if (NULL == (Tmp_fd1 = fopen(Tmp_file1, "w"))) {
-                sprintf(buff, "Cannot open %s", Tmp_file1);
-                G_fatal_error(buff);
+            G_fatal_error(_("Unable to open temporary file <%s>"),
+                          Tmp_file1);
         }
         Tmp_file2 = G_tempfile();
         if (NULL == (Tmp_fd2 = fopen(Tmp_file2, "w"))) {
-                sprintf(buff, "Cannot open %s", Tmp_file2);
-                G_fatal_error(buff);
+            G_fatal_error(_("Unable to open temporary file <%s>"),
+                          Tmp_file2);
         }
         while (fgets(buff, 80, fp) != NULL) {
@@ -289 +291 @@
         cf_keys = G_read_key_value_file(Tmp_file2, &in_stat);
         if (in_stat != 0)
-                G_fatal_error("reading cf key_value temp file");
+            G_fatal_error(_("Reading cf key_value temp file"));
 
         for (;;) {
@@ -318 +320 @@
                         sprintf(buff, "You have chosen %s county, correct", b);
                         if (b == NULL)
-                                fprintf(stderr, "\nInvalid County FIPS code\n");
+                            G_warning(_("Invalid County FIPS code"));
                         else if (G_yes(buff, 1))
                                 break;

grass/trunk/general/g.setproj/main.c

@@ -76 +76 @@
 
     module = G_define_module();
-    module->keywords = _("general");
+    module->keywords = _("general, projection");
     module->description =
         _("Interactively reset the location's projection settings.");
@@ -99 +99 @@
     stat = G__mapset_permissions(set_name);
     if (stat == 0) {
-        G_fatal_error(_("PERMANENT: permission denied."));
+        G_fatal_error(_("PERMANENT: permission denied"));
     }
     G_get_default_window(&cellhd);
     if (-1 == G_set_window(&cellhd))
-        G_fatal_error(_("Current region cannot be set."));
+        G_fatal_error(_("Current region cannot be set"));
 
     if (G_get_set_window(&cellhd) == -1)
@@ -119 +119 @@
         buf = G_find_key_value("name", old_proj_keys);
         fprintf(stderr,
-            "\nWARNING!  A projection file already exists for this location\n(Filename '%s')\n",
+            "\nWARNING: A projection file already exists for this location\n(Filename '%s')\n",
                 path);
         fprintf(stderr,
@@ -131 +131 @@
 
         if (!G_yes(_("Would you still like to change some of the parameters?"), 0)) {
-            G_message(_("The projection information will not be updated."));
+            G_message(_("The projection information will not be updated"));
             leave(SP_NOCHANGE);
         }
@@ -143 +143 @@
         if (zone != old_zone) {
             G_warning(_("Zone in default geographic region definition: %d\n"
-                        " is different from zone in PROJ_INFO file: %d\n"),
-                            old_zone, zone);
+                        " is different from zone in PROJ_INFO file: %d"),
+                      old_zone, zone);
             old_zone = zone;
         }
@@ -152 +152 @@
         if (!exist) {
             /* leap frog over code, and just make sure we remove the file */
-            fprintf(stderr, "XY-location cannot be projected.\n");
+            G_warning (_("XY-location cannot be projected"));
             goto write_file;
             break;
@@ -205 +205 @@
             G_strip(lbuf);
             if ((i = G_get_datum_by_name(lbuf)) > 0) {
-                G_message(_("The current datum is %s (%s)."),
+                G_message(_("The current datum is %s (%s)"),
                         G_datum_name(i), G_datum_description(i));
                 if (G_yes(
@@ -215 +215 @@
                     sprintf(dat_ellps, G_datum_ellipsoid(i));
                     sph_check = 1;
-                    G_message(_("The datum information has not been changed."));
+                    G_message(_("The datum information has not been changed"));
                 }
             }
@@ -280 +280 @@
                             sph_check = G_ask_ellipse_name(spheroid);
                         else {
-                            G_message(_("The ellipse information has not been changed."));
+                            G_message(_("The ellipse information has not been changed"));
                             sph_check = 1;
                         }
@@ -428 +428 @@
                         G_message(_("The UTM zone is now set to %d"), old_zone);
                         if (!G_yes(_("Do you want to change the UTM zone?"), 0)) {
-                            G_message(_("UTM zone information has not been updated."));
+                            G_message(_("UTM zone information has not been updated"));
                             zone = old_zone;
                             break;
@@ -434 +434 @@
                         else {
                             G_message(_("But if you change zone, all the existing "
-                                "data will be interpreted by projection software. "
-                                "GRASS will not automatically re-project or even "
-                                "change the headers for existing maps."));
+                                        "data will be interpreted by projection software. "
+                                        "GRASS will not automatically re-project or even "
+                                        "change the headers for existing maps."));
                             if (!G_yes(_("Would you still like to change the UTM zone?"),
                                  0)) {
@@ -455 +455 @@
                 /* don't ask, use the default */
 
-                if (G_strcasecmp(desc->type, "float") == 0) {
+                if (G_strcasecmp(desc->type, "float") == 0 ||
+                    G_strcasecmp(desc->type, "lat") == 0 ||
+                    G_strcasecmp(desc->type, "lon") == 0) {
                     sprintf(tmp_buff, "%.10f", parm->deflt);
                     G_set_key_value(desc->key, tmp_buff, out_proj_keys);
@@ -471 +473 @@
     G_write_key_value_file(path, out_proj_keys, &out_stat);
     if (out_stat != 0) {
-        sprintf(buffb, "Error writing PROJ_INFO file: %s\n", path);
-        G_fatal_error(buffb);
+        G_fatal_error(_("Error writing PROJ_INFO file <%s>"), path);
     }
 
@@ -609 +610 @@
         G_write_key_value_file(path, in_unit_keys, &out_stat);
         if (out_stat != 0)
-            G_fatal_error(_("Error writing into UNITS output file: %s"), path);
+            G_fatal_error(_("Error writing into UNITS output file <%s>"), path);
 
         G_free_key_value(in_unit_keys);
@@ -615 +616 @@
 
     if (G__put_window(&cellhd, "", "DEFAULT_WIND") < 0)
-        G_fatal_error(_("Could not write to DEFAULT_WIND region file"));
+        G_fatal_error(_("Unable to write to DEFAULT_WIND region file"));
     fprintf(stderr,
             _("\nProjection information has been recorded for this location\n\n"));
     if ((old_zone != zone) | (old_proj != cellhd.proj)) {
-        G_message(_("The geographic region information in WIND is now obsolete."));
-        G_message(_("Run g.region -d to update it."));
+        G_message(_("The geographic region information in WIND is now obsolete"));
+        G_message(_("Run g.region -d to update it"));
     }
     leave(0);

grass/trunk/general/g.setproj/proj.c

@@ -4 +4 @@
 
 #include <grass/gis.h>
+#include <grass/glocale.h>
 
 #include "local_proto.h"
@@ -173 +174 @@
                 {
                         parm->ask = 1;
-                        G_warning("Unrecognized 'ask' value in proj-parms.table: %s", ask);
+                        G_warning(_("Unrecognized 'ask' value in proj-parms.table: %s"), ask);
                 }
 
@@ -183 +184 @@
                 {
                         parm->def_exists = 0;
-                        G_warning("Unrecognized default value in proj-parms.table: %s", dfl);
+                        G_warning(_("Unrecognized default value in proj-parms.table: %s"), dfl);
                 }
         }