From f5a519822db2201b98f822ad4f8659bad2ce9bcd Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Wed, 11 Jul 2007 19:35:09 +0000
Subject: inflector helper changes to account for words ending in "s"

---
 system/helpers/inflector_helper.php | 78 ++++++++++++++++++++++---------------
 1 file changed, 46 insertions(+), 32 deletions(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index fbe851f3b..28ecf5201 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -39,26 +39,31 @@
  */		
 function singular($str)
 {
-	$str = strtolower(trim($str));
-	$end = substr($str, -3);
-	
-	if ($end == 'ies')
-	{
-		$str = substr($str, 0, strlen($str)-3).'y';
-	}
-	else
-	{
-		$end = substr($str, -1);
-		
-		if ($end == 's')
-		{
-			$str = substr($str, 0, strlen($str)-1);
-		}
-	}
-	
-	return $str;
+    $str = strtolower(trim($str));
+    $end = substr($str, -3);
+    
+    if ($end == 'ies')
+    {
+        $str = substr($str, 0, strlen($str)-3).'y';
+    }
+    elseif ($end == 'ses')
+    {
+        $str = substr($str, 0, strlen($str)-2);
+    }
+    else
+    {
+        $end = substr($str, -1);
+        
+        if ($end == 's')
+        {
+            $str = substr($str, 0, strlen($str)-1);
+        }
+    }
+    
+    return $str;
 }
 
+
 // --------------------------------------------------------------------
 
 /**
@@ -68,25 +73,34 @@ function singular($str)
  *
  * @access	public
  * @param	string
+ * @param	bool
  * @return	str
  */		
-function plural($str)
+function plural($str, $force = FALSE)
 {
-	$str = strtolower(trim($str));
-	$end = substr($str, -1);
-
-	if ($end == 'y')
-	{
-		$str = substr($str, 0, strlen($str)-1).'ies';
-	}
-	elseif ($end != 's')
-	{
-		$str .= 's';
-	}
-
-	return $str;	
+    $str = strtolower(trim($str));
+    $end = substr($str, -1);
+
+    if ($end == 'y')
+    {
+        $str = substr($str, 0, strlen($str)-1).'ies';
+    }
+    elseif ($end == 's')
+    {
+        if ($force == TRUE)
+        {
+            $str .= 'es';
+        }
+    }
+    else
+    {
+        $str .= 's';
+    }
+
+    return $str;
 }
 
+
 // --------------------------------------------------------------------
 
 /**
-- 
cgit v1.2.3-24-g4f1b