Skip to content

Conversation

wl2776
Copy link
Contributor

@wl2776 wl2776 commented Dec 12, 2024

Word "to Here" do not seem grammatically correct to me.

Therefore I've decided to make this menu better.
I have also reworded a couple of other messages in Russian locale.

I am not sure about correctness of messages in other languages, besides English and Russian. Please, revise and fix them.

@wl2776 wl2776 force-pushed the feature/sha-instead-tohere branch from 513ed66 to 66d413a Compare December 12, 2024 18:21
@love-linger
Copy link
Collaborator

In my opinion, switching to SHA is more difficult for users to understand.

I've checked that how SourceTree, Fork and Gitkraken implement this. None of them using SHA in the context of selected commit.

  • SourceTree
    image
    image

  • Fork
    image
    image

  • Gitkraken
    image
    image

@wl2776
Copy link
Contributor Author

wl2776 commented Dec 13, 2024

In my opinion, switching to SHA is more difficult for users to understand.

It is not switching to SHA. IMO, my PR adds one more detail that makes things easier to understand.

I've checked that how SourceTree, Fork and Gitkraken implement this. None of them using SHA in the context of selected commit.

Please, take a closer look at SourceTree screenshots that you've posted. Context menus show exactly this. They say "Rebase children of 44a784a interactively..." and "Rebase children of 81a0e2a59 interactively..."

image

SmartGit's menus simply say "Rebase..." and "Rebase interactive from..."

Anyway, I don't think that the sentence "Rebase xxxx to Here" is grammatically correct. It should be "Rebase xxxx here" or "Rebase xxxx to selected commit".

@love-linger
Copy link
Collaborator

I've checked that how SourceTree, Fork and Gitkraken implement this. None of them using SHA in the context of selected commit.

Please, take a closer look at SourceTree screenshots. Its context menus say "Rebase children of 44a784a interactively..." and "Rebase children of 81a0e2a59 interactively..."

image

You just pointed out the part which I did not like. When users selected a commit and open context menu of it, why not using a friendly name such as This Commit or Here to reference the one they just selected? If we shows an SHA, do we want them to check what this SHA reference to?

SmartGit's menus simply say "Rebase..."

Anyway, I don't think that the sentence "Rebase xxxx to Here" is grammatically correct. It should be "Rebase xxxx here" or "Rebase xxxx to selected commit".

I will change the Rebase xxxx to Here to Rebase xxxx on Here

image

@wl2776
Copy link
Contributor Author

wl2776 commented Dec 13, 2024

I will change the Rebase xxxx to Here to Rebase xxxx on Here

Please, change the message to "Rebase xxxx on this commit".

"Here" is not a proper noun, therefore should not start from the capital "H".
And "Rebase to here" seems to me grammatically incorrect construction. High-quality English texts that I've seen, use "to here" in other contexts and constructions. Unfortunately, I'm not an expert in English grammar, therefore cannot name specific rules that govern this.

@wl2776
Copy link
Contributor Author

wl2776 commented Dec 13, 2024

And regarding another commit in this PR, 66d413a

It seems to me that Russian messages is a low-quality result of automatic translation (Russian is my native language :) ). I'd like to keep fixes that I've made in 66d413a.

@love-linger
Copy link
Collaborator

I will change the Rebase xxxx to Here to Rebase xxxx on Here

Please, change the message to "Rebase xxxx on this commit".

"Here" is not a proper noun, therefore should not start from the capital "H". And "Rebase to here" seems to me grammatically incorrect construction. High-quality English texts that I've seen, use "to here" in other contexts and constructions. Unfortunately, I'm not an expert in English grammar, therefore cannot name specific rules that govern this.

I do NOT think so. Here is a screenshot from JetBrains Rider
image

@wl2776
Copy link
Contributor Author

wl2776 commented Dec 13, 2024

I do NOT think so. Here is a screenshot from JetBrains Rider

Hmm. This seems reasonable. Although JetBrains developers have Russian roots, I don't think that their knowledge of English is poor.

@wl2776 wl2776 closed this Dec 13, 2024
@wl2776
Copy link
Contributor Author

wl2776 commented Dec 13, 2024

I'd like to keep fixes that I've made in 66d413a.

I'll do it in another PR. I need to consult with existing translation of the ProGit book.

@wl2776 wl2776 deleted the feature/sha-instead-tohere branch December 13, 2024 08:35
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