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

Localize binaryparagraph.cpp and sourceparagraph.cpp #631

Conversation

JavierMatosD
Copy link
Contributor

Localizing:

  • binaryparagraph.cpp
  • sourceparagraph.cpp

include/vcpkg/base/messages.h Outdated Show resolved Hide resolved
src/vcpkg/sourceparagraph.cpp Outdated Show resolved Hide resolved
src/vcpkg/sourceparagraph.cpp Outdated Show resolved Hide resolved
src/vcpkg/sourceparagraph.cpp Outdated Show resolved Hide resolved
JavierMatosD and others added 12 commits July 19, 2022 12:40
Co-authored-by: Billy O'Neal <bion@microsoft.com>
Co-authored-by: Billy O'Neal <bion@microsoft.com>
Co-authored-by: Billy O'Neal <bion@microsoft.com>
Co-authored-by: Billy O'Neal <bion@microsoft.com>
# Conflicts:
#	include/vcpkg/base/messages.h
#	locales/messages.en.json
#	locales/messages.json
#	src/vcpkg/base/messages.cpp
# Conflicts:
#	include/vcpkg/base/messages.h
#	locales/messages.en.json
#	locales/messages.json
#	src/vcpkg/base/messages.cpp
…pp_and_sourceparagraph.cpp

# Conflicts:
#	include/vcpkg/base/messages.h
#	locales/messages.en.json
#	locales/messages.json
#	src/vcpkg/base/messages.cpp
…aragraph.cpp

# Conflicts:
#	include/vcpkg/base/messages.h
#	locales/messages.en.json
#	locales/messages.json
#	src/vcpkg/base/messages.cpp
@@ -1616,11 +1613,12 @@ namespace vcpkg
auto maybe_configuration = reader.visit(*configuration, get_configuration_deserializer());
if (!reader.errors().empty())
{
print2(Color::error, "Errors occurred while parsing ", ManifestDeserializer::VCPKG_CONFIGURATION, "\n");
msg::println_error(msgErrorWhileParsing, msg::path = ManifestDeserializer::VCPKG_CONFIGURATION);
Copy link
Member

@BillyONeal BillyONeal Jul 21, 2022

Choose a reason for hiding this comment

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

This is wrong, it should be listing the actual file on each line with an error, but it faithfully preserves the previous behavior. It does add "error: " in front of everything but I think that's OK. (Here's the old behavior:)

Copy link
Member

Choose a reason for hiding this comment

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

image

)",
parsed_paragraph.error(),
my_paragraph);
Checks::msg_exit_maybe_upgrade(
Copy link
Member

Choose a reason for hiding this comment

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

[sanity check] makes it sound like a debugging message, but it clearly has user instructions, so it makes sense.

That said, it seems like line 293 should get the same treatment?

…aragraph.cpp

# Conflicts:
#	include/vcpkg/base/messages.h
#	locales/messages.en.json
#	locales/messages.json
#	src/vcpkg/base/messages.cpp
src/vcpkg/binaryparagraph.cpp Outdated Show resolved Hide resolved
JavierMatosD and others added 2 commits July 21, 2022 16:43
Co-authored-by: Billy O'Neal <bion@microsoft.com>
Co-authored-by: Billy O'Neal <bion@microsoft.com>
@JavierMatosD JavierMatosD merged commit 033cdc0 into microsoft:main Jul 25, 2022
@JavierMatosD JavierMatosD deleted the localization_binaryparagraph.cpp_and_sourceparagraph.cpp branch August 5, 2022 23:02
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