s/e-mail/email/ (the way of the future man)

[wfpl.git] / format.php

diff --git a/format.php b/format.php
index a6b0582..e34f4b3 100644 (file)
--- a/format.php
+++ b/format.php
@@ -21,7 +21,7 @@
 function format_caption($str) {
        $str = str_replace('_', ' ', $str);
        $str = ucwords($str);
-       return str_replace('Email', 'E-mail', $str);
+       return $str;
 }
 
 # This function makes sure that $str is in the list of options, and returns "" otherwise
@@ -72,8 +72,8 @@ function _format_positive_decimal($str) {
 
 function format_positive_decimal($str) {
        $str = _format_positive_decimal($str);
-       if($str === '0.0') {
-               $str = '0';
+       if(substr($str, -2) === '.0') {
+               $str = substr($str, 0, -2);
        }
        return $str;
 }
@@ -178,7 +178,7 @@ function format_unix($str) {
 }
 
 function format_bool($str) {
-       if($str && $str !== 'No' && $str !== 'False' && $str !== 'false') {
+       if($str && $str !== 'No' && $str !== 'False' && $str !== 'false' && $str !== 'no' && $str !== 'N' &&  $str !== 'n') {
                return 1;
        } else {
                return 0;
@@ -186,7 +186,7 @@ function format_bool($str) {
 }
 
 function format_yesno($str) {
-       if($str && $str !== 'No' && $str !== 'False' && $str !== 'false') {
+       if($str && $str !== 'No' && $str !== 'False' && $str !== 'false' && $str !== 'no' && $str !== 'N' &&  $str !== 'n') {
                return 'Yes';
        } else {
                return 'No';