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

Jump to bottom

[Localization] Ursa Minor 🐻 #646

Merged
merged 23 commits into from
Aug 18, 2022
Merged

[Localization] Ursa Minor 🐻 #646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
8cee7f2
Finished export.choclatey.cpp
JavierMatosD Jul 20, 2022
f140ecf
FailedToFindPortFeature
JavierMatosD Jul 20, 2022
d2dc79f
ConstraintViolation
JavierMatosD Jul 20, 2022
b342233
More messages
JavierMatosD Jul 20, 2022
177038a
More messages
JavierMatosD Jul 20, 2022
f8a6773
more messages
JavierMatosD Jul 20, 2022
d72b3c0
InvalidPackageFeature
JavierMatosD Jul 21, 2022
f09fbde
PortTypeConflict
JavierMatosD Jul 21, 2022
0791fad
FailedToLocateSpec
JavierMatosD Jul 21, 2022
74204a1
UnsupportedPortFeature
JavierMatosD Jul 21, 2022
cbe3058
Update to PortSupportsField to use new expression
JavierMatosD Jul 21, 2022
a9b5d49
CorruptedDatabase
JavierMatosD Jul 21, 2022
ae13484
UnrecognizedConfigField
JavierMatosD Jul 21, 2022
0e564cd
Sorted Messages
JavierMatosD Jul 21, 2022
0aee4a8
feedback
JavierMatosD Jul 21, 2022
30ca93f
Merge branch 'main' into _Localization]_Ursa_Minor
JavierMatosD Jul 26, 2022
e73c0a8
- Typo
JavierMatosD Jul 26, 2022
a88decd
Fix reference to nullptr
JavierMatosD Jul 26, 2022
e4bf9b5
Merge branch 'main' into _Localization_Ursa_Minor
JavierMatosD Aug 8, 2022
baa54be
Merge remote-tracking branch 'origin/main' into _Localization_Ursa_Minor
BillyONeal Aug 18, 2022
d7a1349
Rename "ErrorWhileSearching" and remove the info: part.
BillyONeal Aug 18, 2022
b280215
Clarify FailedToLoadControl
BillyONeal Aug 18, 2022
3160983
Other minor nitpicks. Includes fixes for @vicroms ' suggestions.
BillyONeal Aug 18, 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
61 changes: 52 additions & 9 deletions include/vcpkg/base/messages.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,8 @@ namespace vcpkg::msg
DECLARE_MSG_ARG(action_index, "340");
DECLARE_MSG_ARG(env_var, "VCPKG_DEFAULT_TRIPLET");
DECLARE_MSG_ARG(extension, ".exe");
DECLARE_MSG_ARG(supports_expression, "windows & !static");
DECLARE_MSG_ARG(feature, "avisynthplus");

#undef DECLARE_MSG_ARG

Expand Down Expand Up @@ -727,11 +729,13 @@ namespace vcpkg
(msg::value),
"'{value}' is a command option.",
"conflicting values specified for '--{value}'.");
DECLARE_MESSAGE(ConstraintViolation, (), "", "Found a constraint violation:");
DECLARE_MESSAGE(ControlAndManifestFilesPresent,
(msg::path),
"",
"Both a manifest file and a CONTROL file exist in port directory: {path}");
DECLARE_MESSAGE(CopyrightIsDir, (msg::path), "", "`{path}` being a directory is deprecated.");
DECLARE_MESSAGE(CorruptedDatabase, (), "", "Database corrupted.");
DECLARE_MESSAGE(CouldNotDeduceNugetIdAndVersion,
(msg::path),
"",
Expand All @@ -756,11 +760,14 @@ namespace vcpkg
"Based on your system settings, the default path to store binaries is \"{path}\". This consults "
"%LOCALAPPDATA%/%APPDATA% on Windows and $XDG_CACHE_HOME or $HOME on other platforms.");
DECLARE_MESSAGE(DetectCompilerHash, (msg::triplet), "", "Detecting compiler hash for triplet {triplet}...");
DECLARE_MESSAGE(
DownloadAvailable,
(msg::env_var),
"",
"A downloadable copy of this tool is available and can be used by unsetting {env_var} environment variable.");
DECLARE_MESSAGE(DocumentedFieldsSuggestUpdate,
(),
"",
"If these are documented fields that should be recognized try updating the vcpkg tool.");
DECLARE_MESSAGE(DownloadAvailable,
(msg::env_var),
"",
"A downloadable copy of this tool is available and can be used by unsetting {env_var}.");
DECLARE_MESSAGE(DownloadedSources, (msg::spec), "", "Downloaded sources for {spec}");
DECLARE_MESSAGE(DownloadingVcpkgCeBundle, (msg::version), "", "Downloading vcpkg-ce bundle {version}...");
DECLARE_MESSAGE(DownloadingVcpkgCeBundleLatest,
Expand Down Expand Up @@ -848,6 +855,7 @@ namespace vcpkg
DECLARE_MESSAGE(ErrorWhileWriting, (msg::path), "", "Error occured while writing {path}");
DECLARE_MESSAGE(ExceededRecursionDepth, (), "", "Recursion depth exceeded.");
DECLARE_MESSAGE(ExcludedPackage, (msg::spec), "", "Excluded {spec}");
DECLARE_MESSAGE(ExcludedPackages, (), "", "The following packages are excluded:");
DECLARE_MESSAGE(
ExpectedCharacterHere,
(msg::expected),
Expand All @@ -860,6 +868,7 @@ namespace vcpkg
(msg::value),
"'{value}' is a command option.",
"expected value after '{value}'.");
DECLARE_MESSAGE(ExportingPackage, (msg::package_name), "", "Exporting {package_name}...");
DECLARE_MESSAGE(ExtendedDocumentationAtUrl, (msg::url), "", "Extended documentation available at '{url}'.");
DECLARE_MESSAGE(FailedToExtract, (msg::path), "", "Failed to extract \"{path}\":");
DECLARE_MESSAGE(FailedToFormatMissingFile,
Expand All @@ -873,6 +882,15 @@ namespace vcpkg
"[sanity check] Failed to parse a serialized binary paragraph.\nPlease open an issue at "
"https://github.com/microsoft/vcpkg, "
"with the following output:\n{error_msg}\nSerialized Binary Paragraph:");
DECLARE_MESSAGE(FailedToFindPortFeature, (msg::feature, msg::spec), "", "Could not find {feature} in {spec}.");
DECLARE_MESSAGE(FailedToLocateSpec, (msg::spec), "", "Failed to locate spec in graph: {spec}");
DECLARE_MESSAGE(FailedToLoadInstalledManifest,
(msg::spec),
"",
"The control or mnaifest file for {spec} could not be loaded due to the following error. Please "
"remove {spec} and re-attempt.");
DECLARE_MESSAGE(FailedToObtainDependencyVersion, (), "", "Cannot find desired dependency version.");
DECLARE_MESSAGE(FailedToObtainPackageVersion, (), "", "Cannot find desired package version.");
DECLARE_MESSAGE(FailedToParseCMakeConsoleOut,
(),
"",
Expand Down Expand Up @@ -985,6 +1003,8 @@ namespace vcpkg
(msg::env_var),
"In this context 'editor' means IDE",
"You can also set the environment variable '{env_var}' to your editor of choice.");
DECLARE_MESSAGE(InstalledPackages, (), "", "The following packages are already installed:");
DECLARE_MESSAGE(InstalledRequestedPackages, (), "", "All requested packages are currently installed.");
DECLARE_MESSAGE(InstallingFromLocation,
(msg::path),
"'--' at the beginning must be preserved",
Expand Down Expand Up @@ -1196,6 +1216,10 @@ namespace vcpkg
"",
"format-manifest was passed --convert-control without '--all'.\nThis doesn't do anything: control "
"files passed explicitly are converted automatically.");
DECLARE_MESSAGE(MissingDependency,
(msg::spec, msg::package_name),
"",
"Package {spec} is installed, but dependency {package_name} is not.");
DECLARE_MESSAGE(MissingExtension, (msg::extension), "", "Missing '{extension}' extension.");
DECLARE_MESSAGE(MissingPortSuggestPullRequest,
(),
Expand Down Expand Up @@ -1243,12 +1267,23 @@ namespace vcpkg
"",
"NuGet package creation succeeded, but no .nupkg was produced. Expected: \"{path}\"");
DECLARE_MESSAGE(OptionMustBeInteger, (msg::option), "", "Value of --{option} must be an integer.");
DECLARE_MESSAGE(OptionRequired, (msg::option), "", "--{option} option is required.");
DECLARE_MESSAGE(OriginalBinParagraphHeader, (), "", "\nOriginal Binary Paragraph");
DECLARE_MESSAGE(PackageFailedtWhileExtracting,
(msg::value, msg::path),
"'{value}' is either a tool name or a package name.",
"'{value}' failed while extracting {path}.");
DECLARE_MESSAGE(PackageRootDir, (), "", "(Experimental) Specify the packages root directory.");
DECLARE_MESSAGE(PackagesToInstall, (), "", "The following packages will be built and installed:");
DECLARE_MESSAGE(PackagesToInstallDirectly, (), "", "The following packages will be directly installed:");
DECLARE_MESSAGE(PackagesToModify, (), "", "Additional packages (*) will be modified to complete this operation.");
DECLARE_MESSAGE(PackagesToRebuild, (), "", "The following packages will be rebuilt:");
DECLARE_MESSAGE(
PackagesToRebuildSuggestRecurse,
(),
"",
"If you are sure you want to rebuild the above packages, run the command with the --recurse option.");
DECLARE_MESSAGE(PackagesToRemove, (), "", "The following packages will be removed:");
DECLARE_MESSAGE(PackingVendorFailed,
(msg::vendor),
"",
Expand All @@ -1273,10 +1308,12 @@ namespace vcpkg
(msg::package_name),
"",
"the baseline does not contain an entry for port {package_name}");
DECLARE_MESSAGE(PortSupportsField,
(msg::value),
"'{value}' is the value of the 'supports' field in the port's vcpkg.json.",
"(supports: \"{value}\")");
DECLARE_MESSAGE(PortSupportsField, (msg::supports_expression), "", "(supports: \"{supports_expression}\")");
DECLARE_MESSAGE(PortTypeConflict,
(msg::spec),
"",
"The port type of {spec} differs between the installed and available portfile.\nPlease manually "
"remove {spec} and re-run this command.");
DECLARE_MESSAGE(PreviousIntegrationFileRemains, (), "", "Previous integration file was not removed.");
DECLARE_MESSAGE(ProcessorArchitectureMalformed,
(msg::arch),
Expand Down Expand Up @@ -1415,11 +1452,16 @@ namespace vcpkg
(msg::value, msg::list),
"{value} is the value provided by the user and {list} a list of unknown variables seperated by comma",
"invalid argument: url template '{value}' contains unknown variables: {list}");
DECLARE_MESSAGE(UnrecognizedConfigField, (), "", "configuration contains the following unrecognized fields:");
DECLARE_MESSAGE(UnsupportedPort, (msg::package_name), "", "Port {package_name} is not supported.");
DECLARE_MESSAGE(UnsupportedPortDependency,
(msg::value),
"'{value}' is the name of a port dependency.",
"- dependency {value} is not supported.");
DECLARE_MESSAGE(UnsupportedPortFeature,
(msg::spec, msg::supports_expression),
"",
"{spec} is only supported on '{supports_expression}'");
DECLARE_MESSAGE(UnsupportedShortOptions,
(msg::value),
"'{value}' is the short option given",
Expand Down Expand Up @@ -1549,4 +1591,5 @@ namespace vcpkg
"The message named {value} starts with warning:, it must be changed to prepend "
"WarningMessage in code instead.");
DECLARE_MESSAGE(WarningsTreatedAsErrors, (), "", "previous warnings being interpreted as errors");
DECLARE_MESSAGE(WhileLookingForSpec, (msg::spec), "", "while looking for {spec}:");
}
30 changes: 27 additions & 3 deletions locales/messages.en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,19 @@
"CommandFailed": "command:\n{command_line}\nfailed with the following results:",
"CompressFolderFailed": "Failed to compress folder \"{path}\":",
"ConflictingValuesForOption": "conflicting values specified for '--{value}'.",
"ConstraintViolation": "Found a constraint violation:",
"ControlAndManifestFilesPresent": "Both a manifest file and a CONTROL file exist in port directory: {path}",
"CopyrightIsDir": "`{path}` being a directory is deprecated.",
"CorruptedDatabase": "Database corrupted.",
"CouldNotDeduceNugetIdAndVersion": "Could not deduce nuget id and version from filename: {path}",
"CreatedNuGetPackage": "Created nupkg: \"{path}\"",
"CurlReportedUnexpectedResults": "curl has reported unexpected results to vcpkg and vcpkg cannot continue.\nPlease review the following text for sensitive information and open an issue on the Microsoft/vcpkg GitHub to help fix this problem!\ncmd: {command_line}\n=== curl output ===\n{actual}\n=== end curl output ===",
"DefaultBrowserLaunched": "Default browser launched to {url}.",
"DefaultFlag": "Defaulting to --{option} being on.",
"DefaultPathToBinaries": "Based on your system settings, the default path to store binaries is \"{path}\". This consults %LOCALAPPDATA%/%APPDATA% on Windows and $XDG_CACHE_HOME or $HOME on other platforms.",
"DetectCompilerHash": "Detecting compiler hash for triplet {triplet}...",
"DownloadAvailable": "A downloadable copy of this tool is available and can be used by unsetting {env_var} environment variable.",
"DocumentedFieldsSuggestUpdate": "If these are documented fields that should be recognized try updating the vcpkg tool.",
"DownloadAvailable": "A downloadable copy of this tool is available and can be used by unsetting {env_var}.",
"DownloadRootsDir": "Specify the downloads root directory.\n(default: {env_var})",
"DownloadedSources": "Downloaded sources for {spec}",
"DownloadingVcpkgCeBundle": "Downloading vcpkg-ce bundle {version}...",
Expand Down Expand Up @@ -127,15 +130,22 @@
"ErrorsFound": "Found the following errors:",
"ExceededRecursionDepth": "Recursion depth exceeded.",
"ExcludedPackage": "Excluded {spec}",
"ExcludedPackages": "The following packages are excluded:",
"ExpectedCharacterHere": "expected '{expected}' here",
"ExpectedFailOrSkip": "expected 'fail', 'skip', or 'pass' here",
"ExpectedPortName": "expected a port name here",
"ExpectedTripletName": "expected a triplet name here",
"ExpectedValueForOption": "expected value after '{value}'.",
"ExportingPackage": "Exporting {package_name}...",
"ExtendedDocumentationAtUrl": "Extended documentation available at '{url}'.",
"FailedToExtract": "Failed to extract \"{path}\":",
"FailedToFindPortFeature": "Could not find {feature} in {spec}.",
"FailedToFormatMissingFile": "No files to format.\nPlease pass either --all, or the explicit files to format or convert.",
"FailedToLoadInstalledManifest": "The control or mnaifest file for {spec} could not be loaded due to the following error. Please remove {spec} and re-attempt.",
"FailedToLocateSpec": "Failed to locate spec in graph: {spec}",
"FailedToObtainDependencyVersion": "Cannot find desired dependency version.",
"FailedToObtainLocalPortGitSha": "Failed to obtain git SHAs for local ports.",
"FailedToObtainPackageVersion": "Cannot find desired package version.",
"FailedToParseBinParagraph": "[sanity check] Failed to parse a serialized binary paragraph.\nPlease open an issue at https://github.com/microsoft/vcpkg, with the following output:\n{error_msg}\nSerialized Binary Paragraph:",
"FailedToParseCMakeConsoleOut": "Failed to parse CMake console output to locate block start/end markers.",
"FailedToParseControl": "Failed to parse control file: {path}",
Expand Down Expand Up @@ -199,6 +209,8 @@
"InstallWithSystemManager": "You may be able to install this tool via your system package manager.",
"InstallWithSystemManagerMono": "Ubuntu 18.04 users may need a newer version of mono, available at {url}.",
"InstallWithSystemManagerPkg": "You may be able to install this tool via your system package manager ({command_line}).",
"InstalledPackages": "The following packages are already installed:",
"InstalledRequestedPackages": "All requested packages are currently installed.",
"InstallingFromLocation": "-- Installing port from location: {path}",
"InstallingPackage": "Installing {action_index}/{count} {spec}...",
"IntegrationFailed": "Integration was not applied.",
Expand Down Expand Up @@ -252,6 +264,7 @@
"MismatchedBinaryParagraphs": "[sanity check] The serialized binary paragraph was different from the original binary paragraph.\nPlease open an issue at {url}, with the following output:",
"Missing7zHeader": "Unable to find 7z header.",
"MissingArgFormatManifest": "format-manifest was passed --convert-control without '--all'.\nThis doesn't do anything: control files passed explicitly are converted automatically.",
"MissingDependency": "Package {spec} is installed, but dependency {package_name} is not.",
"MissingExtension": "Missing '{extension}' extension.",
"MissingPortSuggestPullRequest": "If your port is not listed, please open an issue at and/or consider making a pull request.",
"MissmatchedBinParagraphs": "The serialized binary paragraph was different from the original binary paragraph. Please open an issue at https://github.com/microsoft/vcpkg with the following output:",
Expand All @@ -272,9 +285,16 @@
"NoteMessage": "note: ",
"NugetPackageFileSucceededButCreationFailed": "NuGet package creation succeeded, but no .nupkg was produced. Expected: \"{path}\"",
"OptionMustBeInteger": "Value of --{option} must be an integer.",
"OptionRequired": "--{option} option is required.",
"OriginalBinParagraphHeader": "\nOriginal Binary Paragraph",
"PackageFailedtWhileExtracting": "'{value}' failed while extracting {path}.",
"PackageRootDir": "(Experimental) Specify the packages root directory.",
"PackagesToInstall": "The following packages will be built and installed:",
"PackagesToInstallDirectly": "The following packages will be directly installed:",
"PackagesToModify": "Additional packages (*) will be modified to complete this operation.",
"PackagesToRebuild": "The following packages will be rebuilt:",
"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.",
"ParseControlErrorInfoInvalidFields": "The following fields were not expected:",
"ParseControlErrorInfoMissingFields": "The following fields were missing:",
Expand All @@ -283,7 +303,8 @@
"ParseControlErrorInfoWrongTypeFields": "The following fields had the wrong types:",
"PortDependencyConflict": "Port {package_name} has the following unsupported dependencies:",
"PortNotInBaseline": "the baseline does not contain an entry for port {package_name}",
"PortSupportsField": "(supports: \"{value}\")",
"PortSupportsField": "(supports: \"{supports_expression}\")",
"PortTypeConflict": "The port type of {spec} differs between the installed and available portfile.\nPlease manually remove {spec} and re-run this command.",
"PreviousIntegrationFileRemains": "Previous integration file was not removed.",
"ProcessorArchitectureMalformed": "Failed to parse %PROCESSOR_ARCHITECTURE% ({arch}) as a valid CPU architecture.",
"ProcessorArchitectureMissing": "The required environment variable %PROCESSOR_ARCHITECTURE% is missing.",
Expand Down Expand Up @@ -327,8 +348,10 @@
"UnknownSettingForBuildType": "Unknown setting for VCPKG_BUILD_TYPE {option}. Valid settings are '', 'debug', and 'release'.",
"UnknownTool": "vcpkg does not have a definition of this tool for this platform.",
"UnknownVariablesInTemplate": "invalid argument: url template '{value}' contains unknown variables: {list}",
"UnrecognizedConfigField": "configuration contains the following unrecognized fields:",
"UnsupportedPort": "Port {package_name} is not supported.",
"UnsupportedPortDependency": "- dependency {value} is not supported.",
"UnsupportedPortFeature": "{spec} is only supported on '{supports_expression}'",
"UnsupportedShortOptions": "short options are not supported: '{value}'",
"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}",
Expand Down Expand Up @@ -369,5 +392,6 @@
"WaitingToTakeFilesystemLock": "waiting to take filesystem lock on {path}...",
"WarningMessage": "warning: ",
"WarningMessageMustUsePrintWarning": "The message named {value} starts with warning:, it must be changed to prepend WarningMessage in code instead.",
"WarningsTreatedAsErrors": "previous warnings being interpreted as errors"
"WarningsTreatedAsErrors": "previous warnings being interpreted as errors",
"WhileLookingForSpec": "while looking for {spec}:"
}
Loading