You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@guacamole.apache.org by GitBox <gi...@apache.org> on 2020/06/19 07:04:08 UTC
[GitHub] [guacamole-client] XYUU opened a new pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
XYUU opened a new pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527
https://github.com/apache/guacamole-client/pull/518
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] mike-jumper commented on pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
Posted by GitBox <gi...@apache.org>.
mike-jumper commented on pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527#issuecomment-740205009
By the way:
* @XYUU, thanks for your patience as we work with you to mold things to match established style.
* @necouchman, I think we should probably look toward some automated means of re-indenting, sorting, grouping, etc. the translation JSON to reduce the back-and-forth required for contributed translations. That, or perhaps leverage some external service for contributing translations which does not require technical expertise and experience with git. Lowering the barrier for contributing translations would no doubt lead to more supported languages and more consistently up-to-date text.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] XYUU commented on pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
Posted by GitBox <gi...@apache.org>.
XYUU commented on pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527#issuecomment-650690519
> The `guac-manifest.json` files of the CAS, Duo, LDAP, OpenID, Quick Connect, RADIUS, and TOTP extensions have been updated to point to `zh.json` files which do not exist.
>
> Were these files intended to be committed with these changes?
I have committed
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] necouchman commented on a change in pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
Posted by GitBox <gi...@apache.org>.
necouchman commented on a change in pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527#discussion_r516048440
##########
File path: extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
##########
@@ -1,6 +1,6 @@
{
- "guacamoleVersion" : "1.2.0",
+ "guacamoleVersion" : "1.3.0",
Review comment:
I'm not sure this should be done as part of this change. It definitely needs to be done for the overall 1.3.0 release, but it seems out-of-scope, here.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] necouchman commented on pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
Posted by GitBox <gi...@apache.org>.
necouchman commented on pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527#issuecomment-651105512
@XYUU: Unfortunately this is still not quite right. You still have 4 different commits, three of which have the exact same commit message ("Improved Chinese Internationalization Support") and one of which is a merge of the master back into your branch. So, you still need to do the following:
- Rebase all of your changes on top of the `master` branch from the Apache repo, such that the only commits in the pull request are your changes.
- Either collapse all of your commits into a single commit, or update the commit messages such that they describe the actual changes being made in each of the commits instead of a generic message in all three of them.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] necouchman commented on pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
Posted by GitBox <gi...@apache.org>.
necouchman commented on pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527#issuecomment-740206027
@XYUU I echo @mike-jumper's comments, thank you for working with us through this.
@mike-jumper Agreed, this shouldn't need to be a manual process.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] XYUU commented on pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
Posted by GitBox <gi...@apache.org>.
XYUU commented on pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527#issuecomment-719445637
> You can definitely combine them. The easiest way in my opinion is to use git's interactive rebase feature and use the "fixup" operation to meld one commit into another.
>
> You could also simply do a `git reset --soft HEAD~1` to effectively roll things back to just before the latest commit (`HEAD` is the latest commit and `HEAD~1` is that commit's parent) and then `git commit --amend` to add those changes to the most recent commit.
>
> If you're worried about accidentally wiping out your changes:
>
> * You can always make a backup branch to ensure you can go back to where you were.
> * You can always reset things to the state of the pull request (the state of `master` in your fork)
> * You can verify that things match before doing a force push by doing a `git diff` against the remote. The changes should be identical, even though there is one commit instead of two.
Do you think this is appropriate?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] necouchman commented on a change in pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
Posted by GitBox <gi...@apache.org>.
necouchman commented on a change in pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527#discussion_r517999645
##########
File path: guacamole/src/main/webapp/translations/zh.json
##########
@@ -3,7 +3,6 @@
"NAME" : "简体中文",
"APP" : {
-
Review comment:
I think this blank line should remain there and not be removed - the rest of the sections (below) and other translations have these blank lines for readability.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] mike-jumper commented on pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
Posted by GitBox <gi...@apache.org>.
mike-jumper commented on pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527#issuecomment-648735111
We've bumped GUACAMOLE-903 from 1.2.0 so that the release can move forward with a first RC, so rebasing, etc. is no longer an issue and I have changed the merge base back to `master`.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] XYUU edited a comment on pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
Posted by GitBox <gi...@apache.org>.
XYUU edited a comment on pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527#issuecomment-719445637
> You can definitely combine them. The easiest way in my opinion is to use git's interactive rebase feature and use the "fixup" operation to meld one commit into another.
>
> You could also simply do a `git reset --soft HEAD~1` to effectively roll things back to just before the latest commit (`HEAD` is the latest commit and `HEAD~1` is that commit's parent) and then `git commit --amend` to add those changes to the most recent commit.
>
> If you're worried about accidentally wiping out your changes:
>
> * You can always make a backup branch to ensure you can go back to where you were.
> * You can always reset things to the state of the pull request (the state of `master` in your fork)
> * You can verify that things match before doing a force push by doing a `git diff` against the remote. The changes should be identical, even though there is one commit instead of two.
Do you think this is appropriate?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] XYUU commented on a change in pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
Posted by GitBox <gi...@apache.org>.
XYUU commented on a change in pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527#discussion_r537246421
##########
File path: guacamole/src/main/webapp/translations/zh.json
##########
@@ -3,7 +3,6 @@
"NAME" : "简体中文",
"APP" : {
-
Review comment:
Okay, I'll take the time to add these spaces.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] XYUU commented on pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
Posted by GitBox <gi...@apache.org>.
XYUU commented on pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527#issuecomment-719448629
Thanks, you are great, I learned new knowledge!
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] mike-jumper commented on pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
Posted by GitBox <gi...@apache.org>.
mike-jumper commented on pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527#issuecomment-719428761
You can definitely combine them. The easiest way in my opinion is to use git's interactive rebase feature and use the "fixup" operation to meld one commit into another.
You could also simply do a `git reset --soft HEAD~1` to effectively roll things back to just before the latest commit (`HEAD` is the latest commit and `HEAD~1` is that commit's parent) and then `git commit --amend` to add those changes to the most recent commit.
If you're worried about accidentally wiping out your changes:
* You can always make a backup branch to ensure you can go back to where you were.
* You can always reset things to the state of the pull request (the state of `master` in your fork)
* You can verify that things match before doing a force push by doing a `git diff` against the remote. The changes should be identical, even though there is one commit instead of two.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] mike-jumper commented on pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
Posted by GitBox <gi...@apache.org>.
mike-jumper commented on pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527#issuecomment-719114597
Hi @XYUU, the commits for this PR still show two duplicate messages:
As @necouchman mentioned, can you please:
> Either collapse all of your commits into a single commit, or update the commit messages such that they describe the actual changes being made in each of the commits instead of a generic message ...
Thanks!
Reviewing the translation changes themselves, things look fine to me. The only issue I see is with the existence of those two duplicate commits.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] XYUU edited a comment on pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
Posted by GitBox <gi...@apache.org>.
XYUU edited a comment on pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527#issuecomment-651469108
Well, I did it according to the requirements. Before that, I didn’t have the habit of force push. This is the first time I used force push.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] necouchman commented on a change in pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
Posted by GitBox <gi...@apache.org>.
necouchman commented on a change in pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527#discussion_r536498315
##########
File path: guacamole/src/main/webapp/translations/zh.json
##########
@@ -3,7 +3,6 @@
"NAME" : "简体中文",
"APP" : {
-
Review comment:
@XYUU - If you can add back this poor space, I think we can move forward with the merge.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] XYUU commented on pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
Posted by GitBox <gi...@apache.org>.
XYUU commented on pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527#issuecomment-746086191
> @XYUU Any chance you can finish up these minor changes so we can get this merged?
Okay！
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] necouchman merged pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
Posted by GitBox <gi...@apache.org>.
necouchman merged pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] necouchman commented on pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
Posted by GitBox <gi...@apache.org>.
necouchman commented on pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527#issuecomment-646573916
@XYUU : You do not need to close and open new pull requests after each change that you make. Simply pushing commits - either rebase and force-push or push new commits - will update the pull request automatically. When you close existing requests and open new ones we lose the ability to quickly refer to previous conversations and requested changes, so, overall it is preferable to keep a single Pull Request open while we work through the issues toward merging it.
Thank you, again, for the contributions!
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] XYUU edited a comment on pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
Posted by GitBox <gi...@apache.org>.
XYUU edited a comment on pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527#issuecomment-651469108
Well, I did it according to the requirements. Before that, I didn’t have the habit of force push. This is the first time I used force push.
This PR is fixed https://github.com/apache/guacamole-client/pull/474
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] mike-jumper commented on pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
Posted by GitBox <gi...@apache.org>.
mike-jumper commented on pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527#issuecomment-646823363
Glad to see one commit this time around, but the merge base has changed back to `master`. We can change this to `staging/1.2.0` on our end, but once that's done things will likely need to be rebased due to commits from `master` appearing.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] necouchman commented on a change in pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
Posted by GitBox <gi...@apache.org>.
necouchman commented on a change in pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527#discussion_r537514615
##########
File path: guacamole/src/main/webapp/translations/zh.json
##########
@@ -490,31 +649,40 @@
},
+
+
Review comment:
I don't think we need the extra spaces, here - the original one was fine :-).
##########
File path: guacamole/src/main/webapp/translations/zh.json
##########
@@ -300,14 +319,129 @@
"FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER",
+ "HELP_NO_USER_GROUPS" : "该用户当前不属于任何组。 展开此部分以添加组。",
+
"INFO_READ_ONLY" : "对不起，不能编辑此用户的账户。",
+ "INFO_NO_USER_GROUPS_AVAILABLE" : "没用可用的用户组.",
+ "SECTION_HEADER_ALL_CONNECTIONS" : "全部连接",
"SECTION_HEADER_CONNECTIONS" : "连接",
+ "SECTION_HEADER_CURRENT_CONNECTIONS" : "当前连接",
"SECTION_HEADER_EDIT_USER" : "编辑用户",
"SECTION_HEADER_PERMISSIONS" : "使用权限",
-
+ "SECTION_HEADER_USER_GROUPS" : "用户组",
+
"TEXT_CONFIRM_DELETE" : "将不能恢复已被删除的用户。确定要删除这个用户吗？"
+ },
+
+ "MANAGE_USER_GROUP" : {
Review comment:
This has been indented one level too much...
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] XYUU commented on pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
Posted by GitBox <gi...@apache.org>.
XYUU commented on pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527#issuecomment-719405196
> Hi @XYUU, the commits for this PR still show two duplicate messages:
>
> 
>
> As @necouchman mentioned, can you please:
>
> > Either collapse all of your commits into a single commit, or update the commit messages such that they describe the actual changes being made in each of the commits instead of a generic message ...
>
> Thanks!
>
> Reviewing the translation changes themselves, things look fine to me. The only issue I see is with the existence of those two duplicate commits.
I also don't want to have two identical submissions. This is because after 4 months, when I checked whether the request was merged, I found a code conflict, and then I resolved the conflict. Since these two submissions are not adjacent, I cannot merge them into one submission.
Is there a better way? I want to hear your suggestions.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] XYUU commented on pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
Posted by GitBox <gi...@apache.org>.
XYUU commented on pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527#issuecomment-651469108
Well, I did it according to the requirements. Before that, I didn’t have the habit of force pressing. This is the first time I used force pushing.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] mike-jumper commented on pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
Posted by GitBox <gi...@apache.org>.
mike-jumper commented on pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527#issuecomment-727792795
> I have one minor nitpick, but looks pretty good to me.
>
> @mike-jumper any other concerns?
Nope - looks good to me. Once you're happy with your most recent feedback, I think we're good to go here.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] necouchman commented on pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
Posted by GitBox <gi...@apache.org>.
necouchman commented on pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527#issuecomment-744655560
@XYUU Any chance you can finish up these minor changes so we can get this merged?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] XYUU edited a comment on pull request #527: GUACAMOLE-903: Improved Chinese internationalization support
Posted by GitBox <gi...@apache.org>.
XYUU edited a comment on pull request #527:
URL: https://github.com/apache/guacamole-client/pull/527#issuecomment-719405196
> Hi @XYUU, the commits for this PR still show two duplicate messages:
>
> 
>
> As @necouchman mentioned, can you please:
>
> > Either collapse all of your commits into a single commit, or update the commit messages such that they describe the actual changes being made in each of the commits instead of a generic message ...
>
> Thanks!
>
> Reviewing the translation changes themselves, things look fine to me. The only issue I see is with the existence of those two duplicate commits.
I also don't want to have two identical submissions. This is because after 4 months, when I checked whether the request was merged, I found a code conflict, and then I resolved the conflict. Since these two commit are not adjacent, I cannot merge them into a single commit.
Is there a better way? I want to hear your suggestions.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org