Quellcode durchsuchen

Adjust singular() method in database class to support 'addresses'.

Nate vor 6 Jahren
Ursprung
Commit
d62c795f4c
1 geänderte Dateien mit 8 neuen und 5 gelöschten Zeilen
  1. 8 5
      resources/classes/database.php

+ 8 - 5
resources/classes/database.php

@@ -1813,16 +1813,19 @@ include "root.php";
 			private function singular($word) {
 				//"-es" is used for words that end in "-x", "-s", "-z", "-sh", "-ch" in which case you add
 				if (substr($word, -2) == "es") {
-					if (substr($word, -3) == "ses") {
-						return rtrim($word, "s");
+					if (substr($word, -4) == "sses") { // eg. 'addresses' to 'address'
+						return substr($word,0,-2);
+					}
+					elseif (substr($word, -3) == "ses") { // eg. 'databases' to 'database' (necessary!)
+						return substr($word,0,-1);
 					}
-					if (substr($word, -3) == "ies") {
+					elseif (substr($word, -3) == "ies") { // eg. 'countries' to 'country'
 						return substr($word,0,-3)."y";
 					}
-					if (substr($word, -3, 1) == "x") {
+					elseif (substr($word, -3, 1) == "x") {
 						return substr($word,0,-2);
 					}
-					if (substr($word, -3, 1) == "s") {
+					elseif (substr($word, -3, 1) == "s") {
 						return substr($word,0,-2);
 					}
 					elseif (substr($word, -3, 1) == "z") {