mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-13 05:57:00 -04:00
add plains as exception to english_singular and english_plural
This commit is contained in:
+18
-18
@@ -1,5 +1,23 @@
|
|||||||
{
|
{
|
||||||
"configurations": [
|
"configurations": [
|
||||||
|
{
|
||||||
|
"name": "x64-Release-static",
|
||||||
|
"generator": "Ninja",
|
||||||
|
"configurationType": "Release",
|
||||||
|
"buildRoot": "${projectDir}\\out\\build\\${name}",
|
||||||
|
"installRoot": "${projectDir}\\out\\install\\${name}",
|
||||||
|
"cmakeCommandArgs": "-DVCPKG_TARGET_TRIPLET=x64-windows-static",
|
||||||
|
"buildCommandArgs": "-v",
|
||||||
|
"ctestCommandArgs": "",
|
||||||
|
"inheritEnvironments": [ "msvc_x64_x64" ],
|
||||||
|
"variables": [
|
||||||
|
{
|
||||||
|
"name": "VCPKG_MANIFEST_FEATURES",
|
||||||
|
"value": "fonts",
|
||||||
|
"type": "STRING"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "x86-Debug",
|
"name": "x86-Debug",
|
||||||
"generator": "Ninja",
|
"generator": "Ninja",
|
||||||
@@ -54,24 +72,6 @@
|
|||||||
"buildCommandArgs": "-v",
|
"buildCommandArgs": "-v",
|
||||||
"ctestCommandArgs": "",
|
"ctestCommandArgs": "",
|
||||||
"inheritEnvironments": [ "msvc_x86" ]
|
"inheritEnvironments": [ "msvc_x86" ]
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "x64-Release-static",
|
|
||||||
"generator": "Ninja",
|
|
||||||
"configurationType": "Release",
|
|
||||||
"buildRoot": "${projectDir}\\out\\build\\${name}",
|
|
||||||
"installRoot": "${projectDir}\\out\\install\\${name}",
|
|
||||||
"cmakeCommandArgs": "-DVCPKG_TARGET_TRIPLET=x64-windows-static",
|
|
||||||
"buildCommandArgs": "-v",
|
|
||||||
"ctestCommandArgs": "",
|
|
||||||
"inheritEnvironments": [ "msvc_x64_x64" ],
|
|
||||||
"variables": [
|
|
||||||
{
|
|
||||||
"name": "VCPKG_MANIFEST_FEATURES",
|
|
||||||
"value": "fonts",
|
|
||||||
"type": "STRING"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -153,6 +153,7 @@ SCRIPT_FUNCTION(english_number_ordinal) {
|
|||||||
// ----------------------------------------------------------------------------- : Singular/plural
|
// ----------------------------------------------------------------------------- : Singular/plural
|
||||||
|
|
||||||
String english_singular(const String& str) {
|
String english_singular(const String& str) {
|
||||||
|
if (str.Lower() == _("plains")) return str;
|
||||||
if (str.size() > 3 && is_substr(str, str.size()-3, _("ies"))) {
|
if (str.size() > 3 && is_substr(str, str.size()-3, _("ies"))) {
|
||||||
return str.substr(0, str.size() - 3) + _("y");
|
return str.substr(0, str.size() - 3) + _("y");
|
||||||
} else if (str.size() > 3 && is_substr(str, str.size()-3, _("oes"))) {
|
} else if (str.size() > 3 && is_substr(str, str.size()-3, _("oes"))) {
|
||||||
@@ -174,6 +175,7 @@ String english_singular(const String& str) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
String english_plural(const String& str) {
|
String english_plural(const String& str) {
|
||||||
|
if (str.Lower() == _("plains")) return str;
|
||||||
if (str.size() > 2) {
|
if (str.size() > 2) {
|
||||||
Char a = str.GetChar(str.size() - 2);
|
Char a = str.GetChar(str.size() - 2);
|
||||||
Char b = str.GetChar(str.size() - 1);
|
Char b = str.GetChar(str.size() - 1);
|
||||||
|
|||||||
Reference in New Issue
Block a user