ENH: refs #0278. Removing gratuitous abuse of iso-8859-1 in files.

Author: cpatrick

core/controllers/ItemController.php

@@ -370,6 +370,3 @@ function mergeAction()
     }//end delete
 
   }//end class
-
-  /*    pour la récupérer
-     */

core/controllers/components/DateComponent.php

@@ -47,7 +47,7 @@ static public function ago($timestamp, $only_time = false)
       }
     $difference = time() - $timestamp;
     $periods = array("second", "minute", "hour", "day", "week", "month", "years", "decade");
-    $periodsFr = array("seconde", "minute", "heure", "jour", "semaine", "mois", "année", "décades");
+    $periodsFr = array("seconde", "minute", "heure", "jour", "semaine", "mois", "annee", "decades");
     $lengths = array("60", "60", "24", "7", "4.35", "12", "10");
     for($j = 0; $difference >= $lengths[$j]; $j++)
       {
@@ -84,4 +84,4 @@ static public function ago($timestamp, $only_time = false)
       }
     return $text;
     }
-  } // end class
+  } // end class

core/layouts/layout.phtml

@@ -154,11 +154,11 @@ echo $this->doctype()
                   <?php 
                   if($this->lang=='fr')
                     {
-                    echo '<a href="#"><b>Français</b></a>';
+                    echo '<a href="#"><b>Francais</b></a>';
                     }
                   else
                     {
-                    echo '<a href="'.$this->webroot.'?lang=fr">Français</a>';
+                    echo '<a href="'.$this->webroot.'?lang=fr">Francais</a>';
                     }
                     ?>
                   </li>