amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

add exceptions to english_plural and english_singular

Browse Source
This commit is contained in:
GenevensiS
2026-04-19 16:04:20 +02:00
parent 968ad5f196
commit 17dd3cf407
2 changed files with 820 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/script/functions/english.cpp
+33 -4
View File
@@ -7,6 +7,7 @@
// ----------------------------------------------------------------------------- : Includes
#include <util/prec.hpp>
#include <script/functions/english_exceptions.cpp>
#include <script/functions/functions.hpp>
#include <script/functions/util.hpp>
#include <util/tagged_string.hpp>
@@ -152,8 +153,22 @@ SCRIPT_FUNCTION(english_number_ordinal) {
// ----------------------------------------------------------------------------- : Singular/plural
String english_singular(const String& str) {
if (str.Lower() == _("plains")) return str;
String english_singular(const String& str) {
if (str.empty()) return String();
String lower = str.Lower();
if (english_singular_exceptions.find(lower) != english_singular_exceptions.end()) {
if (isupper(str[0])) {
if (isupper(str[str.size()-1])) {
return english_singular_exceptions[lower].Upper();
} else {
return capitalize(english_singular_exceptions[lower]);
}
} else {
return english_singular_exceptions[lower];
}
}
if (str.size() > 3 && is_substr(str, str.size()-3, _("ies"))) {
return str.substr(0, str.size() - 3) + _("y");
} else if (str.size() > 3 && is_substr(str, str.size()-3, _("oes"))) {
@@ -174,8 +189,22 @@ String english_singular(const String& str) {
return str;
}
}
String english_plural(const String& str) {
if (str.Lower() == _("plains")) return str;
String english_plural(const String& str) {
if (str.empty()) return String();
String lower = str.Lower();
if (english_plural_exceptions.find(lower) != english_plural_exceptions.end()) {
if (isupper(str[0])) {
if (isupper(str[str.size()-1])) {
return english_plural_exceptions[lower].Upper();
} else {
return capitalize(english_plural_exceptions[lower]);
}
} else {
return english_plural_exceptions[lower];
}
}
if (str.size() > 2) {
Char a = str.GetChar(str.size() - 2);
Char b = str.GetChar(str.size() - 1);