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

[Localization] Cepheus #710

Merged
merged 10 commits into from
Oct 20, 2022
Merged

Conversation

JavierMatosD
Copy link
Contributor

This PR localizes messages in the following files:

  • registries.cpp
  • coffilereader.cpp
  • downloads.cpp
  • json.cpp

@JavierMatosD JavierMatosD marked this pull request as ready for review September 22, 2022 17:56
# 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
#	src/vcpkg/portfileprovider.cpp
* CouldNotFindLinkerMember
* CouldNotFindSecondLinkerMember
* SecongLinkerMemberTooSmallArchiveMem
* CouldNotFindLinkerMember
Copy link
Member

@BillyONeal BillyONeal left a comment

Choose a reason for hiding this comment

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

Approve-with-nitpicks :)

Comment on lines 783 to 794
DECLARE_MESSAGE(FailedToFetchError,
(msg::error_msg, msg::package_name, msg::error),
"{error} is the error code",
"{error_msg}\nFailed to fetch {package_name}:\n{error}");
DECLARE_MESSAGE(CouldNotFindBaselineInCommit,
(msg::value, msg::package_name, msg::error_msg),
"{value} is a commit sha.",
"Couldn't find baseline in commit `\"{value}\"` from repo {package_name}:\n{error_msg}");
DECLARE_MESSAGE(CouldNotFindGitTreeAtCommit,
(msg::package_name, msg::value, msg::error_msg),
"{value} is a commit sha",
"could not find the git tree for `versions` in repo {package_name} at commit {value}: {error_msg}");
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 these error_msgs should probably be printed on their own rather than being included in the localized part.

Comment on lines 1047 to 1051
"Fetching baseline information from {package_name}...");
DECLARE_MESSAGE(FetchingRegistryInfo,
(msg::package_name, msg::value),
"{value} is a reference",
"Fetching registry information from {package_name} ({value})...");
Copy link
Member

Choose a reason for hiding this comment

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

Ditto I think package_name is actually a URI?

Also, what is "a reference"?

added 'commit_sha" as a new argument
removed a leading white space
etc
@JavierMatosD JavierMatosD merged commit ce080e4 into microsoft:main Oct 20, 2022
Comment on lines +127 to +132
if (memcmp(first_linker_member_header.name, "/ ", 2) != 0)
{
Debug::println("Could not find proper first linker member");
Checks::exit_fail(VCPKG_LINE_INFO);
}

Copy link
Contributor

@autoantwort autoantwort Dec 18, 2022

Choose a reason for hiding this comment

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

Why? Now vcpkg simply exists without any error message. For example:

...
-- Installing x64-mingw-static-rel
-- Fixing pkgconfig file: G:/vcpkg4/packages/jemalloc_x64-mingw-static/lib/pkgconfig/jemalloc.pc
-- Fixing pkgconfig file: G:/vcpkg4/packages/jemalloc_x64-mingw-static/debug/lib/pkgconfig/jemalloc.pc
-- Installing: G:/vcpkg4/packages/jemalloc_x64-mingw-static/share/jemalloc/copyright
-- Performing post-build validation
admin@DESKTOP-NDEQJD0 MSYS /g/vcpkg4 (master)
$

Instead of showing an error message like before

@JavierMatosD JavierMatosD deleted the Localization_Cepheus branch April 20, 2023 19:38
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.

5 participants