Rename translation strings to avoid conflict #8958
Merged
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
|
Is this change modifying translations? |
RussKie
added
the
📭 needs: author feedback
Not intentionally. I'll take a look. |
ghost
removed
the
📭 needs: author feedback
So long as we target .NET Framework, we do not have annotated versions of string.IsNullOrEmpty and friends. We've worked around this by introducing a `Strings` class that has annotated versions of these, but that class had a naming conflict with existing translation string resources. This commit renames the translation strings to avoid the conflict, which simplifies several usages of the `Strings` type.
drewnoakes
force-pushed
the
strings-naming-conflict
branch
from
a922d00
to
92a7fcf
Compare
|
@RussKie I just had to run a command to regenerate some files. Rebased to fix merge conflict. There was no actual conflict when rebasing, so the diff is identical, just a different base now. |
RussKie
approved these changes
Mar 12, 2021
|
@RussKie did you squash merge this? The commit description was lost. |
|
Not sure... maybe...
|
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.
Proposed changes
Rename translation strings to avoid conflict.
So long as we target .NET Framework, we do not have annotated versions of
string.IsNullOrEmptyand friends. We've worked around this by introducing aStringsclass that has annotated versions of these, but that class had a naming conflict with existing translation string resources.Test methodology
✒️ I contribute this code under The Developer Certificate of Origin.