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

GUACAMOLE-781: Add Czech translation #397

Merged
merged 2 commits into from
Apr 25, 2019
Merged

GUACAMOLE-781: Add Czech translation #397

merged 2 commits into from
Apr 25, 2019

Conversation

Vict0rC
Copy link
Contributor

@Vict0rC Vict0rC commented Apr 24, 2019

Hello,
I've just translated the guacamole interface into Czech. If anyone is interested...
https://github.com/Vict0rC/guacamole-client-cz
VictorC

@Vict0rC
Copy link
Contributor Author

Vict0rC commented Apr 24, 2019

Copy link
Contributor

@necouchman necouchman left a comment

Choose a reason for hiding this comment

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

Looks like a pretty complete translation - thank you, again! I do have a couple of requests for changes, here, before this can be merged:

  • The biggest issue is the style - this needs to be consistent with the style of other code in Guacamole. There are two issues I see - first, indentations of lines should be four spaces (it looks like you did two). Second, the indentation of the second part of the translation (the actual translation) should be lined up and reasonably grouped together. For example:
    "NAME"    : "Name translation string"
    "VERSION" : "Version translation string"

You can see full style guidlines, here: http://guacamole.apache.org/guac-style/

  • I see a few instances where strings appear not to be translated. This may be because the translation is identical, in which case it should be kept, or because there is no translation, in which case it should be removed from this file.

@Vict0rC
Copy link
Contributor Author

Vict0rC commented Apr 24, 2019

I fixed idents and spaces, it should be ok now.

@necouchman
Copy link
Contributor

Great, looks much better, thank you. A couple of other minor issues:

  • Commits need to be tagged with JIRA issue (GUACAMOLE-781:)
  • You have three commits with the message "Update cz.json" - either these can be combined, or the messages should be a little more meaningful and unique.

@Vict0rC
Copy link
Contributor Author

Vict0rC commented Apr 24, 2019

Sorry for that, my mistake again, well I cannot delete previous commits or edit it, so I just added last one named "Finall fix for cz.json GUACAMOLE-781" is that ok?

@necouchman
Copy link
Contributor

Two things:

  • The commit message should be in the same format as the pull request - e.g. GUACAMOLE-781: Update cz.json file.
  • In order to squash the commits together you need to rebase your commits - so, on the git command line, do "git log" and look for the commit before your first one, and copy the commit id. Then take that commit id and do "git rebase -i " which will give you the option to edit the commits. You'll want to edit the message on one of them (amend), and then merge the remaining ones into that one (use the "fixup" option), then you can do a force push (git push -f) to push those changes back to the github repo.

Czech translation of Guacamole client
@Vict0rC
Copy link
Contributor Author

Vict0rC commented Apr 24, 2019

Is this ok?

Copy link
Contributor

@necouchman necouchman left a comment

Choose a reason for hiding this comment

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

Sorry @Vict0rC - One more thing that I didn't catch that needs to be tweaked, but looking very good!

@necouchman
Copy link
Contributor

Looks good to me, and @mike-jumper's utility agrees :-):

[guac@guacdev1 guacamole-client]$ python guacamole/util/check-translation.py guacamole/src/main/webapp/translations/cz.json
Original language: en (English)
Translation language: cz (Čeština)

Check completed successfully. No errors.

@necouchman necouchman merged commit 3c9f880 into apache:master Apr 25, 2019
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.

2 participants