Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

r.in.gdal: rename option location to project #3575

Merged
merged 3 commits into from
Apr 9, 2024

Conversation

petrasovaa
Copy link
Contributor

Includes changes in user visible strings in r.in.gdal and r.import.

@petrasovaa petrasovaa added this to the 8.4.0 milestone Apr 9, 2024
@petrasovaa petrasovaa self-assigned this Apr 9, 2024
@github-actions github-actions bot added raster Related to raster data processing Python Related code is in Python C Related code is in C HTML Related code is in HTML libraries module docs labels Apr 9, 2024
@petrasovaa petrasovaa mentioned this pull request Apr 9, 2024
6 tasks
nilason
nilason previously approved these changes Apr 9, 2024
@petrasovaa petrasovaa enabled auto-merge (squash) April 9, 2024 21:18
@petrasovaa petrasovaa merged commit 9744210 into OSGeo:main Apr 9, 2024
26 checks passed
Copy link
Contributor

@veroandreo veroandreo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was merged while I was reviewing... I have the same comment than in #3576, the use of projection and project in the same sentence sounds odd, CRS is more general than projection for that matter

parm.target->label = _("Name of GCPs target location");
parm.target->description = _("Name of location to create or to read "
parm.target->label = _("Name of GCPs target project (location)");
parm.target->description = _("Name of project to create or to read "
"projection from for GCPs transformation");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"projection from for GCPs transformation");
"CRS from for GCPs transformation");

Comment on lines +217 to +219
_("Override projection check (use current project's projection)");
flag_o->description =
_("Assume that the dataset has same projection as the current project");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
_("Override projection check (use current project's projection)");
flag_o->description =
_("Assume that the dataset has same projection as the current project");
_("Override projection check (use current project's CRS)");
flag_o->description =
_("Assume that the dataset has same CRS as the current project");

@@ -979,7 +979,7 @@ int main(int argc, char *argv[])
&proj_units, hSRS, 0) == 1) {
G_warning(
_("Unable to convert input map projection to GRASS "
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
_("Unable to convert input map projection to GRASS "
_("Unable to convert input map CRS to GRASS "

@@ -1133,21 +1133,20 @@ static void SetupReprojector(const char *pszSrcWKT, const char *pszDstLoc,

/* Get projection info from target location */
if ((out_proj_info = G_get_projinfo()) == NULL)
G_fatal_error(
_("Unable to get projection info of target location"));
G_fatal_error(_("Unable to get projection info of target project"));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
G_fatal_error(_("Unable to get projection info of target project"));
G_fatal_error(_("Unable to get CRS info of target project"));

if ((out_unit_info = G_get_projunits()) == NULL)
G_fatal_error(
_("Unable to get projection units of target location"));
_("Unable to get projection units of target project"));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
_("Unable to get projection units of target project"));
_("Unable to get CRS units of target project"));

@@ -197,13 +197,13 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
int i_value;

strcpy(error_msg, _("Projection of dataset does not"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
strcpy(error_msg, _("Projection of dataset does not"
strcpy(error_msg, _("Dataset CRS does not"

@@ -322,10 +322,10 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
strcat(error_msg, _("\nIn case of no significant differences "
"in the projection definitions,"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"in the projection definitions,"
"in the CRS definitions,"

@@ -322,10 +322,10 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
strcat(error_msg, _("\nIn case of no significant differences "
"in the projection definitions,"
" use the -o flag to ignore them and use"
" current location definition.\n"));
" current project definition.\n"));
strcat(error_msg, _("Consider generating a new location from "
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
strcat(error_msg, _("Consider generating a new location from "
strcat(error_msg, _("Consider generating a new project from "

@@ -343,7 +343,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
msg_fn = G_message;
else
msg_fn = G_verbose_message;
msg_fn(_("Projection of input dataset and current location "
msg_fn(_("Projection of input dataset and current project "
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
msg_fn(_("Projection of input dataset and current project "
msg_fn(_("CRS of input dataset and current project "

Comment on lines +109 to +110
# % label: Override projection check (use current project's projection)
# % description: Assume that the dataset has the same projection as the current project
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# % label: Override projection check (use current project's projection)
# % description: Assume that the dataset has the same projection as the current project
# % label: Override projection check (use current project's CRS)
# % description: Assume that the dataset has the same coordinate reference system (CRS) as the current project

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C Related code is in C docs HTML Related code is in HTML libraries module Python Related code is in Python raster Related to raster data processing
Development

Successfully merging this pull request may close these issues.

3 participants