Add rebase.autosquash setting in Git Advanced settings panel
#10123
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gerhardol
approved these changes
Aug 2, 2022
GitUI/CommandsDialogs/SettingsDialog/Pages/GitConfigAdvancedSettingsPage.Designer.cs
Outdated
Show resolved
Hide resolved
GitUI/CommandsDialogs/SettingsDialog/Pages/GitConfigAdvancedSettingsPage.Designer.cs
Outdated
Show resolved
Hide resolved
|
Translations must be updated... |
pmiossec
force-pushed
the
git_autosquash_setting
branch
from
281e7c2
to
4f359c4
Compare
gerhardol
approved these changes
Aug 3, 2022
pmiossec
force-pushed
the
git_autosquash_setting
branch
2 times, most recently
from
370a82a
to
65bb14a
Compare
|
Squashed + made a little more clearer using a |
pmiossec
force-pushed
the
git_autosquash_setting
branch
from
65bb14a
to
6548a87
Compare
gerhardol
approved these changes
Aug 3, 2022
GitUI/CommandsDialogs/SettingsDialog/Pages/GitConfigAdvancedSettingsPage.Designer.cs
Outdated
Show resolved
Hide resolved
GitUI/CommandsDialogs/SettingsDialog/Pages/GitConfigAdvancedSettingsPage.cs
Outdated
Show resolved
Hide resolved
pmiossec
force-pushed
the
git_autosquash_setting
branch
from
6548a87
to
de508ee
Compare
+ add the git setting key in the checkbox label (so that user could search in online documentation or recognize more easily the setting)
pmiossec
force-pushed
the
git_autosquash_setting
branch
from
de508ee
to
88d1584
Compare
RussKie
reviewed
Aug 4, 2022
| foreach (GitSettingUiMapping gitSetting in _gitSettings) | ||
| { | ||
| gitSetting.MappedCheckbox.Text += $" [{gitSetting.GitSettingKey}]"; | ||
| } |
There was a problem hiding this comment.
Feels like we're inventing yet another way to bind settings. Have you looked at SettingsPageBase.AddSettingBinding(...)?
There was a problem hiding this comment.
This is Git config so different from GE settings.
There was a problem hiding this comment.
This piece of code is not to bind settings, it's just to update the checkbox label by passing the translation because to add some text (the git setting key) that should not be translated.
So it seems better for me for 2 reasons:
- we don't change the strings already translated (so no strings to translate again)
- string are easier to translate because the part that should not be translated is not in the string provided for translation.
And what @gerhardol say seems right also.
RussKie
added
the
📭 needs: author feedback
ghost
removed
the
📭 needs: author feedback
RussKie
approved these changes
Aug 6, 2022
gerhardol
pushed a commit
that referenced
this pull request
Aug 8, 2022
+ add the git setting key in the checkbox label (so that user could search in online documentation or recognize more easily the setting) (cherry picked from commit 4de5443)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
(so that user could search about documentation)
Fixes #9263 (comment)
Screenshots
Before
After
Test methodology
Test environment(s)
Merge strategy
I agree that the maintainer squash merge this PR (if the commit message is clear).
✒️ I contribute this code under The Developer Certificate of Origin.