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

Consolidate resource cleanup #5749

Merged
merged 87 commits into from
May 15, 2021

Conversation

IvenBach
Copy link
Member

@IvenBach IvenBach commented Apr 26, 2021

All separate branches were merged into this one.

Issue Close #4541
Individual PR: Close #5622, Close #5621, Close #5620, Close #5619, Close #5618.

IvenBach added 30 commits March 2, 2020 23:34
Separate keys were added for those that were using the `caption` version
because the _ (underscore) access key indicator was showing.
Included previously missed RubberduckUI->RefactoringsUI updates.
A suffix was added to differentiate values from those found within the
InspectionUI.resx file. Those values are used in the following files:
	InspectionBase.cs
	CodeInspectionSettings.cs
	InspectionTypeConverter.cs

Used as `InspectionsUI.ResourceManager.GetString($"CodeInspectionSettings_`.
IvenBach added 14 commits April 24, 2021 21:21
Expression body member
Autoproperty
Remove redundant default initialization
Remove unnecessary using directive
Use expression body
Remove unused local variable
Use null propagation
Remove redundant explicit array creation in argument
Remove unused using directive
Convert variables to constants
Use auto-property
Remove unused resource
@IvenBach
Copy link
Member Author

Close #5408 since it's related.

Copy link
Member

@retailcoder retailcoder left a comment

Choose a reason for hiding this comment

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

I hope this doesn't throw a major wrench into this PR because I'd really like this to be merged as early as possible in 2.5.2.x, but the new .it.resx Italian resources should be in this diff, no?

@retailcoder retailcoder added the PR-Status: Conflicting PR can't be merged as it stands, conflicts must be resolved by the author. label May 10, 2021
IvenBach added 6 commits May 12, 2021 00:05
Values in a format Foo_Bar were migrated to another resource file.
Reasonably confident the strings weren't used or naming was
incorrect. Also restored string to permit a valid build.
Some resources that likely aren't used and can be removed were restored in
favor of eliminating those that *are* needed.
@IvenBach
Copy link
Member Author

Known conflicts have been resolved. Once this is merged it will permit me to move onto the next domino/PR #5731 and resolve it.

@retailcoder retailcoder removed the PR-Status: Conflicting PR can't be merged as it stands, conflicts must be resolved by the author. label May 15, 2021
@retailcoder retailcoder merged commit 0ded13f into rubberduck-vba:next May 15, 2021
@Vogel612
Copy link
Member

CC @retailcoder this MR caused #5857 due to an / some incorrect merging in Rubberduck.Core.csproj

@IvenBach IvenBach deleted the ConsolidateResourceCleanup branch October 15, 2021 17:23
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.

.resx needs a clean-up
3 participants