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

Make a few strings translatable by not changing them before translation. #6556

Closed
wants to merge 4 commits into from
Closed

Conversation

ajolma
Copy link
Contributor

@ajolma ajolma commented Mar 7, 2018

Description

This is a very small fix to make a few strings translatable by not changing them before translation.

@ajolma
Copy link
Contributor Author

ajolma commented Mar 8, 2018

Hmm. It seems that another change was added to this (probably should not create PRs from master). The other change fixes a missing default color mode in gdaldem color-relief.

@@ -221,7 +221,7 @@ def accept(self):
self.cancelButton().setEnabled(self.algorithm().flags() & QgsProcessingAlgorithm.FlagCanCancel)
if executeIterating(self.algorithm(), parameters, self.iterateParam, context, feedback):
feedback.pushInfo(
self.tr('Execution completed in {0:0.2f} seconds'.format(time.time() - start_time)))
self.tr('Execution completed in {0:0.2f} seconds').format(time.time() - start_time))
Copy link
Contributor

Choose a reason for hiding this comment

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

Syntax error: extra closing bracket

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, one added one removed.

feedback.pushInfo(self.tr('Results:'))
feedback.pushCommandInfo(pformat(results))
else:
feedback.reportError(
self.tr('Execution failed after {0:0.2f} seconds'.format(time.time() - start_time)))
self.tr('Execution failed after {0:0.2f} seconds').format(time.time() - start_time)))
Copy link
Contributor

Choose a reason for hiding this comment

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

same

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, forgot to remove from the end.

@elpaso
Copy link
Contributor

elpaso commented Mar 8, 2018

Please have a look to the test results, click on 'Details' after "The Travis CI build failed" and examine the logs.

@Gustry
Copy link
Contributor

Gustry commented Mar 8, 2018

@ajolma Thanks for your contribution. It's often better to create a new branch, and then make a PR based on that branch. One branch per patch/feature.

@ajolma
Copy link
Contributor Author

ajolma commented Mar 8, 2018

@alexbruy: would you mind approving the change in the ColorRelief.py? The processor is missing the option to leave out both --exact_color_entry and -nearest_color_entry, i.e., have the default mode "the colors between the given elevation values are blended smoothly".

As for the translations I think the fixes are more self-evident.

@rduivenvoorde
Copy link
Contributor

Hi Ari, thanks for this fixes.

If I were you I would pull back this PR, and create a branch for your translations fix, and another one for the color relief thingie. Then both are tested on Travis separately and can be reviewed separately.
I know it looks like a hassle, but as this is your first PR I think it is helpful to do this right. AND you will have 2 contributions ;-)

Are you editing on Github? Or building/testing/branching on your own machine?
If you need help doing this branching stuff, just ask.

@ajolma ajolma closed this Mar 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants