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

Fixed UI capitalization and style errors. #16918

Closed
wants to merge 0 commits into from

Conversation

Ismith507
Copy link

@Ismith507 Ismith507 commented Mar 21, 2024

Summary of the Pull Request

This pull request addresses the issue opened by @PhMajerus concerning the UI and style errors in Windows Terminal

Detailed Description of the Pull Request / Additional comments

PR is pretty straightforward. Just edited src/cascadia/TerminalApp/Resources/en-US/Resources.resw to reflect the changes desired in the issue.

This is my first contribute to a repository that is not my own. So, if I am missing any requirements in my PR or if anything needs to be changed, please let me know!

Closes #16846

@Ismith507
Copy link
Author

@microsoft-github-policy-service agree

Copy link

@check-spelling-bot Report

🔴 Please review

See the 📂 files view, the 📜action log, or 📝 job summary for details.

Unrecognized words (2)

ian
intelli

Previously acknowledged words that are now absent AAAa 🫥
To accept these unrecognized words as correct and remove the previously acknowledged and now absent words, you could run the following commands

... in a clone of the git@github.com:Ismith507/windows_terminal.git repository
on the main branch (ℹ️ how do I use this?):

curl -s -S -L 'https://raw.githubusercontent.com/check-spelling/check-spelling/v0.0.22/apply.pl' |
perl - 'https://github.com/microsoft/terminal/actions/runs/8381881287/attempts/1'
Available 📚 dictionaries could cover words (expected and unrecognized) not in the 📘 dictionary

This includes both expected items (2222) from .github/actions/spelling/expect/04cdb9b77d6827c0202f51acd4205b017015bfff.txt
.github/actions/spelling/expect/alphabet.txt
.github/actions/spelling/expect/expect.txt
.github/actions/spelling/expect/web.txt and unrecognized words (2)

Dictionary Entries Covers Uniquely
cspell:swift/src/swift.txt 53 1 1
cspell:gaming-terms/dict/gaming-terms.txt 59 1 1
cspell:monkeyc/src/monkeyc_keywords.txt 123 1 1
cspell:cryptocurrencies/cryptocurrencies.txt 125 1 1
cspell:scala/dict/scala.txt 153 1 1

Consider adding them (in .github/workflows/spelling2.yml) for uses: check-spelling/check-spelling@v0.0.22 in its with:

      with:
        extra_dictionaries:
          cspell:swift/src/swift.txt
          cspell:gaming-terms/dict/gaming-terms.txt
          cspell:monkeyc/src/monkeyc_keywords.txt
          cspell:cryptocurrencies/cryptocurrencies.txt
          cspell:scala/dict/scala.txt

To stop checking additional dictionaries, add (in .github/workflows/spelling2.yml) for uses: check-spelling/check-spelling@v0.0.22 in its with:

check_extra_dictionaries: ''
Errors (1)

See the 📂 files view, the 📜action log, or 📝 job summary for details.

❌ Errors Count
❌ ignored-expect-variant 3

See ❌ Event descriptions for more information.

✏️ Contributor please read this

By default the command suggestion will generate a file named based on your commit. That's generally ok as long as you add the file to your commit. Someone can reorganize it later.

If the listed items are:

  • ... misspelled, then please correct them instead of using the command.
  • ... names, please add them to .github/actions/spelling/allow/names.txt.
  • ... APIs, you can add them to a file in .github/actions/spelling/allow/.
  • ... just things you're using, please add them to an appropriate file in .github/actions/spelling/expect/.
  • ... tokens you only need in one place and shouldn't generally be used, you can add an item in an appropriate file in .github/actions/spelling/patterns/.

See the README.md in each directory for more information.

🔬 You can test your commits without appending to a PR by creating a new branch with that extra change and pushing it to your fork. The check-spelling action will run in response to your push -- it doesn't require an open pull request. By using such a branch, you can limit the number of typos your peers see you make. 😉

If the flagged items are 🤯 false positives

If items relate to a ...

  • binary file (or some other file you wouldn't want to check at all).

    Please add a file path to the excludes.txt file matching the containing file.

    File paths are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your files.

    ^ refers to the file's path from the root of the repository, so ^README\.md$ would exclude README.md (on whichever branch you're using).

  • well-formed pattern.

    If you can write a pattern that would match it,
    try adding it to the patterns.txt file.

    Patterns are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your lines.

    Note that patterns can't match multiline strings.

Copy link
Member

@carlos-zamora carlos-zamora left a comment

Choose a reason for hiding this comment

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

Thanks for contributing! Sorry it's taken a while for us to review this.

You're talking about #16846, right? I went ahead and edited your PR description, but normally, update the "Closes #xxx" text in the template to be "Closes #16846". If you want to be extra nice, remove all the extra stuff in the PR description too, but not strictly necessary. We just like linking up the relevant issues so we know what the PR is trying to address 😊.

Looking through this PR, I think updating the project files is out of scope for what you're trying to do. Please undo changes to the following files (all of them except the resw file):

  • OpenConsole.sln
  • src/cascadia/WindowsTerminal_UIATests/WindowsTerminal.UIA.Tests.csproj
  • src/cascadia/WindowsTerminal_UIATests/app.config
  • src/cascadia/WpfTerminalControl/WpfTerminalControl.csproj
  • src/cascadia/WpfTerminalTestNetCore/WpfTerminalTestNetCore.csproj
  • src/host/ft_uia/Host.Tests.UIA.csproj
  • src/host/ft_uia/app.config
  • src/tools/TerminalStress/TerminalStress.csproj
  • src/tools/vtapp/App.config
  • src/tools/vtapp/VTApp.csproj

Other than that, I think we're good! I'll go ahead and approve once the changes go in. Thanks!

CppProperties.json Outdated Show resolved Hide resolved
</data>
<data name="TabCloseOther" xml:space="preserve">
<value>Close Other Tabs</value>
<value>Close other Tabs</value>
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
<value>Close other Tabs</value>
<value>Close other tabs</value>

Shouldn't "Tabs" be changed to "tabs" too? The open issue said that we should use "Sentence-style capitalization".

<comment>A hyperlink name for the Terminal's privacy policy</comment>
</data>
<data name="AboutDialog_ThirdPartyNoticesLink.Content" xml:space="preserve">
<value>Third-Party Notices</value>
<value>Third-Party notices</value>
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
<value>Third-Party notices</value>
<value>Third-party notices</value>

Sentence style capitalization means the "p" should be lowercase

Comment on lines 621 to 636
<value>Steel Blue</value>
<value>Steel blue</value>
</data>
<data name="MediumSeaGreenColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Medium Sea Green</value>
<value>Medium sea green</value>
</data>
<data name="DarkOrangeColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Dark Orange</value>
<value>Dark orange</value>
</data>
<data name="MediumVioletRedColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Medium Violet Red</value>
<value>Medium violet red</value>
</data>
<data name="DodgerBlueColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Dodger Blue</value>
<value>Dodger blue</value>
</data>
<data name="LimeGreenColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Lime Green</value>
<value>Lime green</value>
Copy link
Member

Choose a reason for hiding this comment

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

I think all of these should stay as-is, actually. They're proper nouns of the color, so guidelines state we should capitalize all of it.

Comment on lines 642 to 645
<value>Blue Violet</value>
<value>Blue violet</value>
</data>
<data name="SlateBlueColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Slate Blue</value>
<value>Slate blue</value>
Copy link
Member

Choose a reason for hiding this comment

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

Same goes for these, should probably stay capitalized since they're proper nouns for colors.

Comment on lines 660 to 663
<value>Sky Blue</value>
<value>Sky blue</value>
</data>
<data name="DarkGrayColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Dark Gray</value>
<value>Dark gray</value>
Copy link
Member

Choose a reason for hiding this comment

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

Same goes for these, should probably stay capitalized since they're proper nouns for colors.

@microsoft-github-policy-service microsoft-github-policy-service bot added the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Apr 9, 2024
@carlos-zamora
Copy link
Member

Oh! And normally you'd have to worry about the spell-checker. But I think that it's just flagging stuff in the project files that need to be untracked, so you shouldn't have to worry about it.

@microsoft-github-policy-service microsoft-github-policy-service bot removed the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Apr 10, 2024
@Ismith507 Ismith507 closed this Apr 10, 2024
@Ismith507
Copy link
Author

Hello!

I created a new PR (#17037) that is ready for your review. I have corrected the mistakes in this PR and implemented some of the changes you suggested. I'm not sure how so many files got changed when I was working on my edits, it must have been when I was trying to build and run the project on my computer. Anyway, this new PR should limit its changes to the Resources.resw file.

Thank you for your input!

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.

UI style errors: Menu items capitalization and … (ellipses) mark misuse
2 participants