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.

Sign up for GitHub

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

Fix unescaped curly braces in localized string #850

Merged
merged 2 commits into from
Jan 10, 2023
Merged

Fix unescaped curly braces in localized string #850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
581b29e
Fix unescaped curly braces in localized string
vicroms Jan 10, 2023
78dc320
generate-messages-map
BillyONeal Jan 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/vcpkg/base/messages.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2127,8 +2127,8 @@ namespace vcpkg
"installed.");
DECLARE_MESSAGE(PortBugMissingLicense,
(msg::spec),
"'{CURRENT_PACKAGES_DIR}' should not be translated.",
"The software license must be available at ${CURRENT_PACKAGES_DIR}/share/{spec}/copyright");
"",
"The software license must be available at ${{CURRENT_PACKAGES_DIR}}/share/{spec}/copyright");
DECLARE_MESSAGE(PortBugMissingReleaseBinaries, (), "", "Release binaries were not found.");
DECLARE_MESSAGE(PortBugMovePkgConfigFiles, (), "", "You can move the pkgconfig files with commands similar to:");
DECLARE_MESSAGE(PortBugOutdatedCRT, (), "", "Detected outdated dynamic CRT in the following files:");
Expand Down
4 changes: 2 additions & 2 deletions locales/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -946,8 +946,8 @@
"PortBugMissingImportedLibs": "Import libraries were not present in {path}.\nIf this is intended, add the following line in the portfile:\nset(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)",
"_PortBugMissingImportedLibs.comment": "An example of {path} is /foo/bar.",
"PortBugMissingIncludeDir": "The folder /include is empty or not present. This indicates the library was not correctly installed.",
"PortBugMissingLicense": "The software license must be available at ${CURRENT_PACKAGES_DIR}/share/{spec}/copyright",
"_PortBugMissingLicense.comment": "'{CURRENT_PACKAGES_DIR}' should not be translated. An example of {spec} is zlib:x64-windows.",
"PortBugMissingLicense": "The software license must be available at ${{CURRENT_PACKAGES_DIR}}/share/{spec}/copyright",
"_PortBugMissingLicense.comment": "An example of {spec} is zlib:x64-windows.",
Copy link
Contributor

Choose a reason for hiding this comment

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

This comment indicates that msg::spec isn't the best argument placeholder to use -- we probably should use msg::package_name instead.

Copy link
Member Author

Choose a reason for hiding this comment

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

Noted, will add it as a drive-by fix in my export-port PR.

Copy link
Contributor

Choose a reason for hiding this comment

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

${{PORT}} instead of spec?

"PortBugMissingReleaseBinaries": "Release binaries were not found.",
"PortBugMovePkgConfigFiles": "You can move the pkgconfig files with commands similar to:",
"PortBugOutdatedCRT": "Detected outdated dynamic CRT in the following files:",
Expand Down