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

[Localization] Corvus #711

Merged
merged 7 commits into from
Oct 6, 2022
Merged

[Localization] Corvus #711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ea1608a
Localized messages in xmlserializer.cpp
JavierMatosD Sep 22, 2022
644338a
Localizes messages in unicode.cpp
JavierMatosD Sep 22, 2022
3b0c7f2
Localized and sorted messages for strings.cpp
JavierMatosD Sep 26, 2022
d0cedc8
Fix conversion
JavierMatosD Sep 26, 2022
92cf5b6
Merge remote-tracking branch 'origin/main' into Localization_Corvus
BillyONeal Oct 5, 2022
c19881e
Remove extra newline.
BillyONeal Oct 5, 2022
5d88787
Response to feedback
JavierMatosD Oct 5, 2022
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
25 changes: 25 additions & 0 deletions include/vcpkg/base/messages.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,6 +722,10 @@ namespace vcpkg
"command:\n"
"{command_line}\n"
"failed with the following results:");
DECLARE_MESSAGE(ComparingUtf8Decoders,
(),
"",
"Comparing Utf8Decoders with different provenance; this is always an error");
DECLARE_MESSAGE(CompressFolderFailed, (msg::path), "", "Failed to compress folder \"{path}\":");
DECLARE_MESSAGE(ComputingInstallPlan, (), "", "Computing installation plan...");
DECLARE_MESSAGE(ConflictingFiles,
Expand All @@ -730,6 +734,7 @@ namespace vcpkg
"The following files are already installed in {path} and are in conflict with {spec}");
DECLARE_MESSAGE(ConflictingValuesForOption, (msg::option), "", "conflicting values specified for '--{option}'.");
DECLARE_MESSAGE(ConstraintViolation, (), "", "Found a constraint violation:");
DECLARE_MESSAGE(ContinueCodeUnitInStart, (), "", "found continue code unit in start position");
DECLARE_MESSAGE(ControlAndManifestFilesPresent,
(msg::path),
"",
Expand Down Expand Up @@ -792,6 +797,7 @@ namespace vcpkg
DECLARE_MESSAGE(EmailVcpkgTeam, (msg::url), "", "Send an email to {url} with any feedback.");
DECLARE_MESSAGE(EmptyArg, (msg::option), "", "The option --{option} must be passed a non-empty argument.");
DECLARE_MESSAGE(EmptyLicenseExpression, (), "", "SPDX license expression was empty.");
DECLARE_MESSAGE(EndOfStringInCodeUnit, (), "", "found end of string in middle of code point");
DECLARE_MESSAGE(EnvStrFailedToExtract, (), "", "could not expand the environment string:");
DECLARE_MESSAGE(ErrorDetectingCompilerInfo,
(msg::path),
Expand Down Expand Up @@ -862,6 +868,10 @@ namespace vcpkg
DECLARE_MESSAGE(ExceededRecursionDepth, (), "", "Recursion depth exceeded.");
DECLARE_MESSAGE(ExcludedPackage, (msg::spec), "", "Excluded {spec}");
DECLARE_MESSAGE(ExcludedPackages, (), "", "The following packages are excluded:");
DECLARE_MESSAGE(ExpectedAtMostOneSetOfTags,
(msg::count, msg::old_value, msg::new_value, msg::value),
"{old_value} is a left tag and {new_value} is the right tag. {value} is the input.",
"Found {count} sets of {old_value}.*{new_value} but expected at most 1, in block:\n{value}");
DECLARE_MESSAGE(
ExpectedCascadeFailure,
(msg::expected, msg::actual),
Expand All @@ -873,6 +883,10 @@ namespace vcpkg
"{expected} is a locale-invariant delimiter; for example, the ':' or '=' in 'zlib:x64-windows=skip'",
"expected '{expected}' here");
DECLARE_MESSAGE(ExpectedFailOrSkip, (), "", "expected 'fail', 'skip', or 'pass' here");
DECLARE_MESSAGE(ExpectedOneSetOfTags,
(msg::count, msg::old_value, msg::new_value, msg::value),
"{old_value} is a left tag and {new_value} is the right tag. {value} is the input.",
"Found {count} sets of {old_value}.*{new_value} but expected exactly 1, in block:\n{value}");
DECLARE_MESSAGE(ExpectedPortName, (), "", "expected a port name here");
DECLARE_MESSAGE(ExpectedStatusField, (), "", "Expected 'status' field in status paragraph");
DECLARE_MESSAGE(ExpectedTripletName, (), "", "expected a triplet name here");
Expand Down Expand Up @@ -1024,6 +1038,7 @@ namespace vcpkg
(msg::command_name, msg::expected, msg::actual),
"'{expected}' is the required number of arguments. '{actual}' is the number of arguments provided.",
"'{command_name}' requires '{expected}' arguments, but '{actual}' were provided.");
DECLARE_MESSAGE(IncrementedUtf8Decoder, (), "", "Incremented Utf8Decoder at the end of the string");
DECLARE_MESSAGE(InfoSetEnvVar,
(msg::env_var),
"In this context 'editor' means IDE",
Expand Down Expand Up @@ -1123,6 +1138,8 @@ namespace vcpkg
"invalid argument: binary config '{binary_source}' requires a SAS token without a "
"preceeding '?' as the second argument");
DECLARE_MESSAGE(InvalidBuildInfo, (msg::error_msg), "", "Invalid BUILD_INFO file for package: {error_msg}");
DECLARE_MESSAGE(InvalidCodePoint, (), "", "Invalid code point passed to utf8_encoded_code_point_count");
DECLARE_MESSAGE(InvalidCodeUnit, (), "", "invalid code unit");
DECLARE_MESSAGE(InvalidCommandArgSort,
(),
"",
Expand Down Expand Up @@ -1311,6 +1328,7 @@ namespace vcpkg
DECLARE_MESSAGE(NewVersionCannotBeEmpty, (), "", "--version cannot be empty.");
DECLARE_MESSAGE(NoArgumentsForOption, (msg::option), "", "The option --{option} does not accept an argument.");
DECLARE_MESSAGE(NoCachedPackages, (), "", "No packages are cached.");
DECLARE_MESSAGE(NoError, (), "", "no error");
DECLARE_MESSAGE(NoInstalledPackages,
(),
"The name 'search' is the name of a command that is not localized.",
Expand Down Expand Up @@ -1351,6 +1369,10 @@ namespace vcpkg
(msg::vendor),
"",
"Packing {vendor} failed. Use --debug for more information.");
DECLARE_MESSAGE(PairedSurrogatesAreInvalid,
(),
"",
"trailing surrogate following leading surrogate (paired surrogates are invalid)");
DECLARE_MESSAGE(ParseControlErrorInfoInvalidFields, (), "", "The following fields were not expected:");
DECLARE_MESSAGE(ParseControlErrorInfoMissingFields, (), "", "The following fields were missing:");
DECLARE_MESSAGE(ParseControlErrorInfoTypesEntry,
Expand Down Expand Up @@ -1471,6 +1493,7 @@ namespace vcpkg
(msg::env_var),
"",
"Specify the target architecture triplet. See 'vcpkg help triplet'.\n(default: '{env_var}')");
DECLARE_MESSAGE(StartCodeUnitInContinue, (), "", "found start code unit in continue position");
DECLARE_MESSAGE(StoredBinaryCache, (msg::path), "", "Stored binary cache: \"{path}\"");
DECLARE_MESSAGE(StoreOptionMissingSha, (), "", "--store option is invalid without a sha512");
DECLARE_MESSAGE(SuggestGitPull, (), "", "The result may be outdated. Run `git pull` to get the latest results.");
Expand Down Expand Up @@ -1569,6 +1592,7 @@ namespace vcpkg
(msg::value),
"'{value}' is the short option given",
"short options are not supported: '{value}'");
DECLARE_MESSAGE(UnsupportedSyntaxInCDATA, (), "", "]]> is not supported in CDATA block");
DECLARE_MESSAGE(UnsupportedSystemName,
(msg::system_name),
"",
Expand Down Expand Up @@ -1642,6 +1666,7 @@ namespace vcpkg
"'--' at the beginning must be preserved",
"-- Using community triplet {triplet}. This triplet configuration is not guaranteed to succeed.");
DECLARE_MESSAGE(UsingManifestAt, (msg::path), "", "Using manifest file at {path}.");
DECLARE_MESSAGE(Utf8ConversionFailed, (), "", "Failed to convert to UTF-8");
DECLARE_MESSAGE(VcpkgCeIsExperimental,
(),
"",
Expand Down
13 changes: 13 additions & 0 deletions locales/messages.en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,13 @@
"ClearingContents": "Clearing contents of {path}",
"CmakeTargetsExcluded": "note: {count} additional targets are not displayed.",
"CommandFailed": "command:\n{command_line}\nfailed with the following results:",
"ComparingUtf8Decoders": "Comparing Utf8Decoders with different provenance; this is always an error",
"CompressFolderFailed": "Failed to compress folder \"{path}\":",
"ComputingInstallPlan": "Computing installation plan...",
"ConflictingFiles": "The following files are already installed in {path} and are in conflict with {spec}",
"ConflictingValuesForOption": "conflicting values specified for '--{option}'.",
"ConstraintViolation": "Found a constraint violation:",
"ContinueCodeUnitInStart": "found continue code unit in start position",
"ControlAndManifestFilesPresent": "Both a manifest file and a CONTROL file exist in port directory: {path}",
"CopyrightIsDir": "`{path}` being a directory is deprecated.",
"CorruptedDatabase": "Database corrupted.",
Expand Down Expand Up @@ -118,6 +120,7 @@
"EmailVcpkgTeam": "Send an email to {url} with any feedback.",
"EmptyArg": "The option --{option} must be passed a non-empty argument.",
"EmptyLicenseExpression": "SPDX license expression was empty.",
"EndOfStringInCodeUnit": "found end of string in middle of code point",
"EnvStrFailedToExtract": "could not expand the environment string:",
"ErrorDetectingCompilerInfo": "while detecting compiler information:\nThe log file content at \"{path}\" is:",
"ErrorIndividualPackagesUnsupported": "In manifest mode, `vcpkg install` does not support individual package arguments.\nTo install additional packages, edit vcpkg.json and then run `vcpkg install` without any package arguments.",
Expand All @@ -143,9 +146,11 @@
"ExceededRecursionDepth": "Recursion depth exceeded.",
"ExcludedPackage": "Excluded {spec}",
"ExcludedPackages": "The following packages are excluded:",
"ExpectedAtMostOneSetOfTags": "Found {count} sets of {old_value}.*{new_value} but expected at most 1, in block:\n{value}",
"ExpectedCascadeFailure": "Expected {expected} cascade failure, but there were {actual} cascade failures.",
"ExpectedCharacterHere": "expected '{expected}' here",
"ExpectedFailOrSkip": "expected 'fail', 'skip', or 'pass' here",
"ExpectedOneSetOfTags": "Found {count} sets of {old_value}.*{new_value} but expected exactly 1, in block:\n{value}",
"ExpectedPortName": "expected a port name here",
"ExpectedStatusField": "Expected 'status' field in status paragraph",
"ExpectedTripletName": "expected a triplet name here",
Expand Down Expand Up @@ -225,6 +230,7 @@
"IllegalPlatformSpec": "Platform qualifier is not allowed in this context",
"ImproperShaLength": "SHA512's must be 128 hex characters: {value}",
"IncorrectNumberOfArgs": "'{command_name}' requires '{expected}' arguments, but '{actual}' were provided.",
"IncrementedUtf8Decoder": "Incremented Utf8Decoder at the end of the string",
"InfoSetEnvVar": "You can also set the environment variable '{env_var}' to your editor of choice.",
"InitRegistryFailedNoRepo": "Could not create a registry at {path} because this is not a git repository root.\nUse `git init {command_line}` to create a git repository in this folder.",
"InstallFailed": "failed: {path}: {error_msg}",
Expand Down Expand Up @@ -258,6 +264,8 @@
"InvalidArgumentRequiresTwoOrThreeArguments": "invalid argument: binary config '{binary_source}' requires 2 or 3 arguments",
"InvalidArgumentRequiresValidToken": "invalid argument: binary config '{binary_source}' requires a SAS token without a preceeding '?' as the second argument",
"InvalidBuildInfo": "Invalid BUILD_INFO file for package: {error_msg}",
"InvalidCodePoint": "Invalid code point passed to utf8_encoded_code_point_count",
"InvalidCodeUnit": "invalid code unit",
"InvalidCommandArgSort": "Value of --sort must be one of 'lexicographical', 'topological', 'reverse'.",
"InvalidCommitId": "Invalid commit id {value}",
"InvalidFileType": "failed: {path} cannot handle file type",
Expand Down Expand Up @@ -317,6 +325,7 @@
"NewVersionCannotBeEmpty": "--version cannot be empty.",
"NoArgumentsForOption": "The option --{option} does not accept an argument.",
"NoCachedPackages": "No packages are cached.",
"NoError": "no error",
"NoInstalledPackages": "No packages are installed. Did you mean `search`?",
"NoLocalizationForMessages": "No localized messages for the following: ",
"NoOutdatedPackages": "There are no outdated packages.",
Expand All @@ -339,6 +348,7 @@
"PackagesToRebuildSuggestRecurse": "If you are sure you want to rebuild the above packages, run the command with the --recurse option.",
"PackagesToRemove": "The following packages will be removed:",
"PackingVendorFailed": "Packing {vendor} failed. Use --debug for more information.",
"PairedSurrogatesAreInvalid": "trailing surrogate following leading surrogate (paired surrogates are invalid)",
"ParseControlErrorInfoInvalidFields": "The following fields were not expected:",
"ParseControlErrorInfoMissingFields": "The following fields were missing:",
"ParseControlErrorInfoTypesEntry": "{value} was expected to be {expected}",
Expand Down Expand Up @@ -378,6 +388,7 @@
"SpecifyDirectoriesWhenSearching": "Specify directories to be used when searching for ports.\n(also: '{env_var}')",
"SpecifyHostArch": "Specify the host architecture triplet. See 'vcpkg help triplet'.\n(default: '{env_var}')",
"SpecifyTargetArch": "Specify the target architecture triplet. See 'vcpkg help triplet'.\n(default: '{env_var}')",
"StartCodeUnitInContinue": "found start code unit in continue position",
"StoreOptionMissingSha": "--store option is invalid without a sha512",
"StoredBinaryCache": "Stored binary cache: \"{path}\"",
"SuggestGitPull": "The result may be outdated. Run `git pull` to get the latest results.",
Expand Down Expand Up @@ -410,6 +421,7 @@
"UnsupportedPortDependency": "- dependency {value} is not supported.",
"UnsupportedPortFeature": "{spec} is only supported on '{supports_expression}'",
"UnsupportedShortOptions": "short options are not supported: '{value}'",
"UnsupportedSyntaxInCDATA": "]]> is not supported in CDATA block",
"UnsupportedSystemName": "Could not map VCPKG_CMAKE_SYSTEM_NAME '{system_name}' to a vcvarsall platform. Supported system names are '', 'Windows' and 'WindowsStore'.",
"UnsupportedToolchain": "in triplet {triplet}: Unable to find a valid toolchain for requested target architecture {arch}.\nThe selected Visual Studio instance is at: {path}\nThe available toolchain combinations are: {list}",
"UpdateBaselineAddBaselineNoManifest": "the --{option} switch was passed, but there is no manifest file to add a `builtin-baseline` field to.",
Expand All @@ -430,6 +442,7 @@
"UserWideIntegrationRemoved": "User-wide integration was removed.",
"UsingCommunityTriplet": "-- Using community triplet {triplet}. This triplet configuration is not guaranteed to succeed.",
"UsingManifestAt": "Using manifest file at {path}.",
"Utf8ConversionFailed": "Failed to convert to UTF-8",
"VSExaminedInstances": "The following Visual Studio instances were considered:",
"VSExaminedPaths": "The following paths were examined for Visual Studio instances:",
"VSNoInstances": "Could not locate a complete Visual Studio instance",
Expand Down
Loading