From 11954d2521475f6964bfa9c65dcd2f3e53a65af5 Mon Sep 17 00:00:00 2001
From: George Petculescu <gxgpet@gmail.com>
Date: Thu, 20 Oct 2016 20:53:11 +0300
Subject: moved ordinal_format() helper function from Number helper to
 Inflector helper

---
 system/helpers/inflector_helper.php | 40 +++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

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

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index 6dc3b5030..c71516564 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -273,3 +273,43 @@ if ( ! function_exists('is_countable'))
 		);
 	}
 }
+
+// ------------------------------------------------------------------------
+
+if ( ! function_exists('ordinal_format'))
+{
+	/**
+	 * Returns the English ordinal numeral for a given number
+	 *
+	 * @param  int    $number
+	 * @return string
+	 */
+	function ordinal_format($number)
+	{
+		if ( ! ctype_digit((string) $number) OR $number < 0)
+		{
+			return FALSE;
+		}
+
+		$last_digit = array(
+			0 => 'th',
+			1 => 'st',
+			2 => 'nd',
+			3 => 'rd',
+			4 => 'th',
+			5 => 'th',
+			6 => 'th',
+			7 => 'th',
+			8 => 'th',
+			9 => 'th'
+		);
+		if (($number % 100) >= 11 && ($number % 100) <= 13)
+		{
+			return $number.'th';
+		}
+		else
+		{
+			return $number.$last_digit[$number % 10];
+		}
+	}
+}
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 03a1eac3b7bed8ed6df59109364a3eebe3f1cceb Mon Sep 17 00:00:00 2001
From: George Petculescu <gxgpet@gmail.com>
Date: Thu, 20 Oct 2016 21:03:38 +0300
Subject: ordinal_format will accept only non-negative natural numbers and
 return original value on failure + docs update regarding this.

---
 system/helpers/inflector_helper.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index c71516564..04e178aec 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -286,9 +286,9 @@ if ( ! function_exists('ordinal_format'))
 	 */
 	function ordinal_format($number)
 	{
-		if ( ! ctype_digit((string) $number) OR $number < 0)
+		if ( ! ctype_digit((string) $number) OR $number < 1)
 		{
-			return FALSE;
+			return $number;
 		}
 
 		$last_digit = array(
-- 
cgit v1.2.3-24-g4f1b


From 25dc0937dd27c6d3c9f4d4483a857c218d6a9dad Mon Sep 17 00:00:00 2001
From: gxgpet <gxgpet@users.noreply.github.com>
Date: Fri, 21 Oct 2016 17:44:03 +0300
Subject: fixed small coding style issues

---
 system/helpers/inflector_helper.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index 04e178aec..83bf28098 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -303,13 +303,12 @@ if ( ! function_exists('ordinal_format'))
 			8 => 'th',
 			9 => 'th'
 		);
+		
 		if (($number % 100) >= 11 && ($number % 100) <= 13)
 		{
 			return $number.'th';
 		}
-		else
-		{
-			return $number.$last_digit[$number % 10];
-		}
+		
+		return $number.$last_digit[$number % 10];
 	}
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-24-g4f1b