Browse Source

Changement de la classe I18n en fonction afin d'ecourter les appels statiques

Idleman 7 years ago
parent
commit
42d7622e0b

+ 2 - 2
common.php

@@ -11,7 +11,7 @@ mb_internal_encoding('UTF-8'); // UTF8 pour fonctions mb_*
 $start=microtime(true);
 require_once('constant.php');
 require_once('RainTPL.php');
-class_exists('I18n') or require_once('I18n.class.php');
+require_once('i18n.php');
 class_exists('Plugin') or require_once('Plugin.class.php');
 class_exists('MysqlEntity') or require_once('MysqlEntity.class.php');
 class_exists('Feed') or require_once('Feed.class.php');
@@ -43,7 +43,7 @@ raintpl::configure("base_url", null );
 raintpl::configure("tpl_dir", './templates/'.DEFAULT_THEME.'/' );
 raintpl::configure("cache_dir", "./cache/tmp/" );
 
-I18n::init();
+i18n_init();
 
 
 $view = '';

+ 4 - 7
I18n.class.php → i18n.php

@@ -3,14 +3,11 @@
 /*
  @nom: i18n
  @auteur: Idleman (idleman@idleman.fr)
- @description:  Classe de gestion de la traduction
+ @description:  Fonctions de gestion de la traduction
  */
 
-class I18n
-{
 
-
-	public static function init(){
+	function i18n_init(){
 		global $i18n,$i18n_js;
 		if(!isset($i18n)){
 			$i18n_js =  file_get_contents('locale/'.LANGAGE.'.json');
@@ -18,7 +15,7 @@ class I18n
 		}
 	}	
 
-	public static function t($key,$args=array(),$debug=false){
+	function _t($key,$args=array(),$debug=false){
 		global $i18n;
 
 		$value = (isset($i18n[$key])?$i18n[$key]:'');
@@ -29,5 +26,5 @@ class I18n
 		return $value;
 	}
 
-}
+
 ?>

+ 21 - 21
templates/marigolds/about.html

@@ -4,45 +4,45 @@
 
 			<div id="menuBar">
 				<aside>
-					<h3>{function="I18n::t('AUTHOR')"}</h3>
+					<h3>{function="_t('AUTHOR')"}</h3>
 					<ul>
-							<li>{function="I18n::t('NAME')"} : Valentin CARRUESCO aka Idleman</li>
-							<li>{function="I18n::t('MAIL')"} : <a href="mailto: idleman@idleman.fr">idleman@idleman.fr</a></li>
-							<li>{function="I18n::t('BLOG')"} : <a href="http://blog.idleman.fr">blog.idleman.fr</a></li>
-							<li>{function="I18n::t('CONTRIBUTORS')"} : <a href="mailto:cobalt74@gmail.com">Maël ILLOUZ aka Cobalt64</a>, <a href="mailto:christophe.henry@sbgodin.fr">Christophe HENRY aka Sbgodin</a>, <a href="mailto:contact@simounet.net">Simon ALBERNY aka Simounet</a></li>
+							<li>{function="_t('NAME')"} : Valentin CARRUESCO aka Idleman</li>
+							<li>{function="_t('MAIL')"} : <a href="mailto: idleman@idleman.fr">idleman@idleman.fr</a></li>
+							<li>{function="_t('BLOG')"} : <a href="http://blog.idleman.fr">blog.idleman.fr</a></li>
+							<li>{function="_t('CONTRIBUTORS')"} : <a href="mailto:cobalt74@gmail.com">Maël ILLOUZ aka Cobalt64</a>, <a href="mailto:christophe.henry@sbgodin.fr">Christophe HENRY aka Sbgodin</a>, <a href="mailto:contact@simounet.net">Simon ALBERNY aka Simounet</a></li>
 					</ul>
 				</aside>
 			</div>
 			
 			<article>
 				<header>
-					<h1>{function="I18n::t('ABOUT')"}</h1>
-					<p>{function="I18n::t('ABOUT_LEED')"}</p>
+					<h1>{function="_t('ABOUT')"}</h1>
+					<p>{function="_t('ABOUT_LEED')"}</p>
 				</header>
 				
 
 				<section>
-					<h2>{function="I18n::t('GENERALITY')"} :</h2>
+					<h2>{function="_t('GENERALITY')"} :</h2>
 					<ul>
-						<li><b>{function="I18n::t('APPLICATION')"} :</b> Leed (Light Feed)</li>
-						<li><b>{function="I18n::t('VERSION')"} :</b> {$VERSION_NUMBER} {$VERSION_NAME}</li>
-						<li><b>{function="I18n::t('AUTHOR')"} :</b> Valentin CARRUESCO aka <a href="mailto:idleman@idleman.fr">Idleman</a></li>
-						<li><b>{function="I18n::t('PROJECT_PAGE')"}:</b> <a href="http://projet.idleman.fr/leed">http://projet.idleman.fr/leed</a></li>
-						<li><b>{function="I18n::t('GIT_REPOSITORY')"} :</b> <a href="https://github.com/ldleman/Leed.git">https://github.com/ldleman/Leed.git</a></li>
+						<li><b>{function="_t('APPLICATION')"} :</b> Leed (Light Feed)</li>
+						<li><b>{function="_t('VERSION')"} :</b> {$VERSION_NUMBER} {$VERSION_NAME}</li>
+						<li><b>{function="_t('AUTHOR')"} :</b> Valentin CARRUESCO aka <a href="mailto:idleman@idleman.fr">Idleman</a></li>
+						<li><b>{function="_t('PROJECT_PAGE')"}:</b> <a href="http://projet.idleman.fr/leed">http://projet.idleman.fr/leed</a></li>
+						<li><b>{function="_t('GIT_REPOSITORY')"} :</b> <a href="https://github.com/ldleman/Leed.git">https://github.com/ldleman/Leed.git</a></li>
 						<li><b>Licence :</b> <a href="http://creativecommons.org/licenses/by-nc-sa/2.0/fr/">CC by-nc-sa</a></li>
 					</ul>
 
-					<h2>{function="I18n::t('PRESENTATION')"}</h2>
-					<p>{function="I18n::t('PRESENTATION_PARAGRAPH')"}</p>
+					<h2>{function="_t('PRESENTATION')"}</h2>
+					<p>{function="_t('PRESENTATION_PARAGRAPH')"}</p>
 
-					<h2>{function="I18n::t('INSTALLATION')"}</h2>
-					{function="I18n::t('INSTALLATION_PARAGRAPH')"}
+					<h2>{function="_t('INSTALLATION')"}</h2>
+					{function="_t('INSTALLATION_PARAGRAPH')"}
 					
-					<h2>{function="I18n::t('QUESTIONS_SUGGESTIONS')"}</h2>
-					{function="I18n::t('QUESTIONS_SUGGESTIONS_PARAGRAPH')"}
+					<h2>{function="_t('QUESTIONS_SUGGESTIONS')"}</h2>
+					{function="_t('QUESTIONS_SUGGESTIONS_PARAGRAPH')"}
 					
-					<h2>{function="I18n::t('LIBRARIES')"}</h2>
-					{function="I18n::t('LIBRARIES_PARAGRAPHE')"}
+					<h2>{function="_t('LIBRARIES')"}</h2>
+					{function="_t('LIBRARIES_PARAGRAPHE')"}
 					
 				</section>
 				

+ 6 - 6
templates/marigolds/article.html

@@ -5,7 +5,7 @@
 	 
 	
 	<section id="{$value->getId()}" class="{if="!$value->getUnread()"}eventRead{/if} {$hightlighted%2==0?'eventHightLighted':''}{$scroll?' scroll':''}" {$scroll?'style="display: none;"':''}>
-		<a title="{function="I18n::t('RETURN_TO_TOP')"}" class="goTopButton" href="#pageTopAnvil">ˆ</a>
+		<a title="{function="_t('RETURN_TO_TOP')"}" class="goTopButton" href="#pageTopAnvil">ˆ</a>
 		<!-- TITRE -->
 		<h2 class="articleTitle">
 			{function="Plugin::callHook("event_pre_title", array(&$value))"}
@@ -25,12 +25,12 @@
 			{if="$articleDisplayDate"} 
 				{$value->getPubdateWithInstant($time)} 
 			{/if}
-			{if="$value->getFavorite()!=1"} -  <a class="pointer favorite" onclick="addFavorite(this,{$value->getId()});" >{function="I18n::t('FAVORIZE')"}</a> 
+			{if="$value->getFavorite()!=1"} -  <a class="pointer favorite" onclick="addFavorite(this,{$value->getId()});" >{function="_t('FAVORIZE')"}</a> 
 			{else}
-			 <a class="pointer favorite" onclick="removeFavorite(this,{$value->getId()});" >{function="I18n::t('UNFAVORIZE')"}</a> 
+			 <a class="pointer favorite" onclick="removeFavorite(this,{$value->getId()});" >{function="_t('UNFAVORIZE')"}</a> 
 			 {/if}
 			
-			 <a class="pointer right readUnreadButton">({function="I18n::t('READ')"}/{function="I18n::t('UNREAD')"})</a>
+			 <a class="pointer right readUnreadButton">({function="_t('READ')"}/{function="_t('UNREAD')"})</a>
 			 {function="Plugin::callHook("event_post_top_options", array(&$value))"}
 		</h3>
 
@@ -54,9 +54,9 @@
 				{function="Plugin::callHook("event_pre_bottom_options", array(&$value))"}
 			
 				<a class="pointer right readUnreadButton">(lu/non lu)</a>
-				{if="$value->getFavorite()!=1"}<a class="right pointer favorite"  onclick="addFavorite(this,{$value->getId()});" >{function="I18n::t('FAVORIZE')"}</a> 
+				{if="$value->getFavorite()!=1"}<a class="right pointer favorite"  onclick="addFavorite(this,{$value->getId()});" >{function="_t('FAVORIZE')"}</a> 
 				{else}
-				<a class="right pointer favorite" onclick="removeFavorite(this,{$value->getId()});" >{function="I18n::t('UNFAVORIZE')"}</a>  
+				<a class="right pointer favorite" onclick="removeFavorite(this,{$value->getId()});" >{function="_t('UNFAVORIZE')"}</a>  
 				{/if}
 				<div class="clear"></div>
 				{function="Plugin::callHook("event_post_bottom_options", array(&$value))"}

+ 1 - 1
templates/marigolds/footer.html

@@ -8,7 +8,7 @@
 
 	<div id="footer-container">
 		<footer class="wrapper">
-			<p>Leed "Light Feed" {function="I18n::t('FABULOUS AGREGATOR LAUNCHED IN',array($executionTime,'<a target="_blank" href="http://blog.idleman.fr">Idleman</a>'))"} | <a href="about.php">{function="I18n::t('ABOUT',array())"}</a></p>
+			<p>Leed "Light Feed" {function="_t('FABULOUS AGREGATOR LAUNCHED IN',array($executionTime,'<a target="_blank" href="http://blog.idleman.fr">Idleman</a>'))"} | <a href="about.php">{function="_t('ABOUT',array())"}</a></p>
 			{function="Plugin::callHook("footer_post_copyright", array(&$myUser))"}
 		</footer>
 	</div>

+ 6 - 6
templates/marigolds/header.html

@@ -26,20 +26,20 @@
 				<div class="loginBloc">
 				{if="!$myUser"}
 				<form action="action.php?action=login" method="POST">
-						<input type="text" class="miniInput left" name="login" placeholder="{function="I18n::t('LOGIN')"}"/> <input type="password" class="miniInput left" name="password" placeholder="{function="I18n::t('PASSWORD')"}"/> <button class="left">GO!!</button>
+						<input type="text" class="miniInput left" name="login" placeholder="{function="_t('LOGIN')"}"/> <input type="password" class="miniInput left" name="password" placeholder="{function="_t('PASSWORD')"}"/> <button class="left">GO!!</button>
 				</form>
 				{else}
-					<span>{function="I18n::t('IDENTIFIED_WITH',array('<span>'.$myUser->getLogin().'</span>'))"} </span><button onclick="window.location='action.php?action=logout'">{function="I18n::t('DISCONNECT')"}</button>
+					<span>{function="_t('IDENTIFIED_WITH',array('<span>'.$myUser->getLogin().'</span>'))"} </span><button onclick="window.location='action.php?action=logout'">{function="_t('DISCONNECT')"}</button>
 				{/if}
 				<div class="clear"></div>
 				</div>
 			
 			<nav>
 				<ul>
-					<li><a href="index.php">{function="I18n::t('HOME')"}</a></li>
-					<li><a href="index.php?action=favorites">{function="I18n::t('FAVORITES')"}</a></li>
-					<li><a href="settings.php">{function="I18n::t('MANAGE')"}</a></li>
-					<li><a class="synchronyzeButton" title="{function="I18n::t('LAUNCH_SYNCHRONISATION')"}" onclick="synchronize('{if="$myUser"}{$synchronisationCode}{/if}');">↺</a></li>
+					<li><a href="index.php">{function="_t('HOME')"}</a></li>
+					<li><a href="index.php?action=favorites">{function="_t('FAVORITES')"}</a></li>
+					<li><a href="settings.php">{function="_t('MANAGE')"}</a></li>
+					<li><a class="synchronyzeButton" title="{function="_t('LAUNCH_SYNCHRONISATION')"}" onclick="synchronize('{if="$myUser"}{$synchronisationCode}{/if}');">↺</a></li>
 					{function="Plugin::callHook("navigate_post_link", array(&$myUser))"}
 				</ul>
 			</nav>

+ 13 - 13
templates/marigolds/index.html

@@ -21,7 +21,7 @@
 				{function="Plugin::callHook("menu_pre_folder_menu", array(&$myUser))"}
 			<aside>
 				<!-- TITRE MENU + OPTION TOUT MARQUER COMME LU -->
-				<h3 class="left">{function="I18n::t('FEED')"}</h3> <button style="margin: 20px 10px;" onclick="if(confirm('{function="I18n::t('CONFIRM_MARK_ALL_AS_READ')"}'))window.location='action.php?action=readAll'">{function="I18n::t('MARK_ALL_AS_READ')"}</button>
+				<h3 class="left">{function="_t('FEED')"}</h3> <button style="margin: 20px 10px;" onclick="if(confirm('{function="_t('CONFIRM_MARK_ALL_AS_READ')"}'))window.location='action.php?action=readAll'">{function="_t('MARK_ALL_AS_READ')"}</button>
 				{function="Plugin::callHook("menu_post_header_options", array(&$myUser))"}
 				<ul class="clear">
 					
@@ -43,7 +43,7 @@
 
 						<h1 class="folder">
 							{function="Plugin::callHook("menu_pre_folder_link", array(&$value))"}
-							<a  title="{function="I18n::t('READ_FOLDER_ITEMS')"}" href="index.php?action=selectedFolder&amp;folder={$value->getId()}">{$value->getName()}</a> <a class="readFolder" title="{function="I18n::t('FOLD_UNFOLD_FOLDER')"}" onclick="toggleFolder(this,{$value->getId()});" >{if="!$value->getIsopen()"}{function="I18n::t('UNFOLD')"}{else}{function="I18n::t('FOLD')"}{/if}</a> {if="$unreadEventsForFolder!=0"}<a class="unreadForFolder"  title="{function="I18n::t('MARK_AS_READ_FOLDER_ITEMS',array($unreadEventsForFolder))"}" onclick="if(confirm('{function="I18n::t('CONFIRM_MARK_AS_READ_FOLDER_ITEMS')"}'))window.location='action.php?action=readFolder&amp;folder={$value->getId()}';">{$unreadEventsForFolder} {function="I18n::t('UNREAD')"}</a>{/if}
+							<a  title="{function="_t('READ_FOLDER_ITEMS')"}" href="index.php?action=selectedFolder&amp;folder={$value->getId()}">{$value->getName()}</a> <a class="readFolder" title="{function="_t('FOLD_UNFOLD_FOLDER')"}" onclick="toggleFolder(this,{$value->getId()});" >{if="!$value->getIsopen()"}{function="_t('UNFOLD')"}{else}{function="_t('FOLD')"}{/if}</a> {if="$unreadEventsForFolder!=0"}<a class="unreadForFolder"  title="{function="_t('MARK_AS_READ_FOLDER_ITEMS',array($unreadEventsForFolder))"}" onclick="if(confirm('{function="_t('CONFIRM_MARK_AS_READ_FOLDER_ITEMS')"}'))window.location='action.php?action=readFolder&amp;folder={$value->getId()}';">{$unreadEventsForFolder} {function="_t('UNREAD')"}</a>{/if}
 							{function="Plugin::callHook("menu_post_folder_link", array(&$value))"}
 						</h1>
 						<!-- FLUX DU DOSSIER -->
@@ -54,8 +54,8 @@
 										<li> 
 											{function="Plugin::callHook("menu_pre_feed_link", array(&$value))"}											 <a href="index.php?action=selectedFeed&amp;feed={$value2['id']}" title="{$value2['url']}">{function="Functions::truncate($value2['name'],37)"} </a>
 											{if="isset($unread[$value2['id']])"}  
-											<button class="right" style="margin:5px 0 0 10px;" onclick="if(confirm('{function="I18n::t('CONFIRM_MARK_FEED_AS_READ')"}'))window.location='action.php?action=readAll&amp;feed={$value2['id']}';">
-												<span alt="{function="I18n::t('MARK_AS_READ')"}" title="{function="I18n::t('MARK_AS_READ')"}">{$unread[$value2['id']]}</span>
+											<button class="right" style="margin:5px 0 0 10px;" onclick="if(confirm('{function="_t('CONFIRM_MARK_FEED_AS_READ')"}'))window.location='action.php?action=readAll&amp;feed={$value2['id']}';">
+												<span alt="{function="_t('MARK_AS_READ')"}" title="{function="_t('MARK_AS_READ')"}">{$unread[$value2['id']]}</span>
 											</button>
 											{/if}
 											{function="Plugin::callHook("menu_post_feed_link", array(&$value))"}
@@ -91,26 +91,26 @@
 					<h1 class="articleSection"><a target="_blank" href="{$currentFeed->getWebSite()}">{$currentFeed->getName()}</a></h1>
 					<div class="clear"></div>
 						{$currentFeed->getDescription()}  
-							{function="I18n::t('SEE_THE')"} 
-					<a href="index.php?action=selectedFeed&amp;feed={$_['feed']}&amp;page={$page}&amp;order=unread">{function="ucfirst(I18n::t('UNREAD'))"}</a> | 
-					<a href="index.php?action=selectedFeed&amp;feed={$_['feed']}&amp;page={$page}&amp;order=older">{function="I18n::t('OLDER')"}</a> {function="I18n::t('IN_FIRST')"}
+							{function="_t('SEE_THE')"} 
+					<a href="index.php?action=selectedFeed&amp;feed={$_['feed']}&amp;page={$page}&amp;order=unread">{function="ucfirst(_t('UNREAD'))"}</a> | 
+					<a href="index.php?action=selectedFeed&amp;feed={$_['feed']}&amp;page={$page}&amp;order=older">{function="_t('OLDER')"}</a> {function="_t('IN_FIRST')"}
 				{/if}
 				
 				{if="$action=='selectedFolder'"}
 				<!-- AFFICHAGE DES EVENEMENTS D'UN DOSSIER EN PARTICULIER -->		
-					<h1 class="articleSection">{function="I18n::t('FOLDER')"} : {$currentFolder->getName()}</h1>
-					<p>{function="I18n::t('SEE_EVENTS_FOR_FOLDER',array($currentFolder->getName()))"}</p>
+					<h1 class="articleSection">{function="_t('FOLDER')"} : {$currentFolder->getName()}</h1>
+					<p>{function="_t('SEE_EVENTS_FOR_FOLDER',array($currentFolder->getName()))"}</p>
 				{/if}
 				
 				{if="$action=='favorites'"}
 				<!-- AFFICHAGE DES EVENEMENTS FAVORIS -->		
-					<h1 class="articleSection">{function="I18n::t('FAVORITES_EVENTS',array('<span id="nbarticle">'.$numberOfItem.'</span>'))"}</h1>
+					<h1 class="articleSection">{function="_t('FAVORITES_EVENTS',array('<span id="nbarticle">'.$numberOfItem.'</span>'))"}</h1>
 				{/if}
 
 				
 				{if="($action=='unreadEvents') || ($action=='')"}
 				<!-- AFFICHAGE DES EVENEMENTS NON LU (COMPORTEMENT PAR DEFAUT) -->		
-					<h1 class="articleSection">{function="I18n::t('UNREAD')"} (<span id="nbarticle">{$numberOfItem}</span>)</h1>
+					<h1 class="articleSection">{function="_t('UNREAD')"} (<span id="nbarticle">{$numberOfItem}</span>)</h1>
 				{/if}
 			
 			 	<div class="clear"></div>
@@ -124,8 +124,8 @@
 {else}
 	<div id="main" class="wrapper clearfix">
 		<article>
-				<h3>{function="I18n::t('YOU_MUST_BE_LOGGED')"}</h3>
-				<p>{function="I18n::t('IF_ADMIN_THEN_CONFIG')"}</p>
+				<h3>{function="_t('YOU_MUST_BE_LOGGED')"}</h3>
+				<p>{function="_t('IF_ADMIN_THEN_CONFIG')"}</p>
 		</article>
 	</div>
 {/if}

+ 2 - 2
templates/marigolds/js/script.js

@@ -53,10 +53,10 @@ $(document).ready(function(){
 		
 		if ($(window).scrollTop()==0) scrollInfini();
 	}
-	//alert(t('IDENTIFIED_WITH',['idleman']));
+	//alert(_t('IDENTIFIED_WITH',['idleman']));
 });
 
-function t(key,args){
+function _t(key,args){
 	value = i18n[key];
 	for(i=0;i<args.length;i++){
 		value = value.replace('$'+(i+1),args[i]);

+ 93 - 93
templates/marigolds/settings.html

@@ -12,18 +12,18 @@
 		<div id="main" class="wrapper clearfix settings">
 			<div id="menuBar">
 				<aside>
-					<h3>{function="I18n::t('FEED_OPTION')"}</h3>
+					<h3>{function="_t('FEED_OPTION')"}</h3>
 					<ul>
 							
 							
-							<li><a class="toggle" href="#manageBloc">{function="I18n::t('FEED_MANAGING')"}</a></li>
-							<li><a class="toggle" href="#synchronizeBloc">{function="I18n::t('MANUAL_FEED_UPDATE')"}</a></li>
-							<li><a class="toggle" href="#preferenceBloc">{function="I18n::t('PREFERENCES')"}</a></li>
-							<li><a class="toggle" href="#importBloc">{function="I18n::t('IMPORT')"}</a></li>
-							<li><a class="toggle" href="#exportBloc">{function="I18n::t('EXPORT')"}</a></li>
-							<li><a class="toggle" href="#bookBloc">{function="I18n::t('BOOKMARKLET')"}</a></li>
-							<li><a class="toggle" href="#pluginBloc">{function="I18n::t('AVAILABLES_PLUGINS')"}</a></li>
-							<li class="pointer" onclick="if(confirm('{function="I18n::t('CONFIRM_TRASH_EVENTS')"}')){window.location='action.php?action=purge';}">{function="I18n::t('TRASH_EVENTS')"}</a></li>
+							<li><a class="toggle" href="#manageBloc">{function="_t('FEED_MANAGING')"}</a></li>
+							<li><a class="toggle" href="#synchronizeBloc">{function="_t('MANUAL_FEED_UPDATE')"}</a></li>
+							<li><a class="toggle" href="#preferenceBloc">{function="_t('PREFERENCES')"}</a></li>
+							<li><a class="toggle" href="#importBloc">{function="_t('IMPORT')"}</a></li>
+							<li><a class="toggle" href="#exportBloc">{function="_t('EXPORT')"}</a></li>
+							<li><a class="toggle" href="#bookBloc">{function="_t('BOOKMARKLET')"}</a></li>
+							<li><a class="toggle" href="#pluginBloc">{function="_t('AVAILABLES_PLUGINS')"}</a></li>
+							<li class="pointer" onclick="if(confirm('{function="_t('CONFIRM_TRASH_EVENTS')"}')){window.location='action.php?action=purge';}">{function="_t('TRASH_EVENTS')"}</a></li>
 							{function="Plugin::callHook("setting_post_link", array(&$myUser))"}
 					</ul>
 				</aside>
@@ -33,27 +33,27 @@
 
 			<section class="manageBloc">
 
-					<h2>{function="I18n::t('FEED_MANAGING')"} :</h2>
+					<h2>{function="_t('FEED_MANAGING')"} :</h2>
 
 					<form action="action.php?action=addFeed" method="POST">
 				<section class="addBloc">
-					<h3>{function="I18n::t('ADD_FEED')"}</h3>
-					<p>{function="I18n::t('FEED_RSS_LINK')"} : <input type="text" name="newUrl" placeholder="http://monflux.com/rss"/>&nbsp;
+					<h3>{function="_t('ADD_FEED')"}</h3>
+					<p>{function="_t('FEED_RSS_LINK')"} : <input type="text" name="newUrl" placeholder="http://monflux.com/rss"/>&nbsp;
 					 <select name="newUrlCategory">
 						{loop="$folders"}
 							<option {if="$value->getId()==1"}selected="selected"{/if} value="{$value->getId()}">{$value->getName()}</option>
 						{/loop}
 					</select>
-					 <button>{function="I18n::t('ADD')"}</button></p>
+					 <button>{function="_t('ADD')"}</button></p>
 				
 				</section>
 				</form>
 
 				<section class="addBloc">
-				<h3>{function="I18n::t('ADD_FOLDER')"}</h3>
+				<h3>{function="_t('ADD_FOLDER')"}</h3>
 			
 					<form method="POST" action="action.php?action=addFolder">
-						{function="I18n::t('NEW_FOLDER')"} <input type="text" name="newFolder"> <button>{function="I18n::t('ADD')"}</button>
+						{function="_t('NEW_FOLDER')"} <input type="text" name="newFolder"> <button>{function="_t('ADD')"}</button>
 					</form>
 					
 				</section>
@@ -67,9 +67,9 @@
 					<li>{if="$value->getId()==1"}<a name="defaultFolder"></a>{/if}
 						<h1 class="folder left" ><span>{$value->getName()}</span> ({function="count($feedsForFolder)"})
 
-						<button  onclick="renameFolder(this,{$value->getId()})">{function="I18n::t('RENAME')"}</button>
+						<button  onclick="renameFolder(this,{$value->getId()})">{function="_t('RENAME')"}</button>
 						{if="$value->getId()!='1'"}
-						<button  onclick="if(confirm('{function="I18n::t('CONFIRM_DELETE_FOLDER')"}'))window.location='action.php?action=removeFolder&amp;id={$value->getId()}'">{function="I18n::t('DELETE')"}</button>
+						<button  onclick="if(confirm('{function="_t('CONFIRM_DELETE_FOLDER')"}'))window.location='action.php?action=removeFolder&amp;id={$value->getId()}'">{function="_t('DELETE')"}</button>
 						{/if}
 						
 <div class="clear"></div>
@@ -87,8 +87,8 @@
 											{/loop}
 										</select>
 									</td>
-									<td><button onclick="renameFeed(this,{$value2->getId()})">{function="I18n::t('RENAME')"}</button></td>
-									<td><button onclick="if(confirm('{function="I18n::t('CONFIRM_DELETE_FEED')"}')){window.location='action.php?action=removeFeed&id={$value2->getId()}';}">{function="I18n::t('DELETE')"}</button></td></tr>
+									<td><button onclick="renameFeed(this,{$value2->getId()})">{function="_t('RENAME')"}</button></td>
+									<td><button onclick="if(confirm('{function="_t('CONFIRM_DELETE_FEED')"}')){window.location='action.php?action=removeFeed&id={$value2->getId()}';}">{function="_t('DELETE')"}</button></td></tr>
 							{/loop}
 							{/if}
 						</table>
@@ -98,105 +98,105 @@
 				</section>
 
 				<section class="synchronizeBloc">
-					 <h2>{function="I18n::t('FEED_SYNCHRONISATION')"} :</h2>
+					 <h2>{function="_t('FEED_SYNCHRONISATION')"} :</h2>
 					 <iframe class="importFrame" src="action.php?action=synchronizeForm" name="idFrameSynchro" id="idFrameSynchro" width="100%" height="300" ></iframe>
 				</section>
 
 				{if="(isset($myUser)) && ($myUser!=false)"}
 				<section class="preferenceBloc">
-					<h2>{function="I18n::t('PREFERENCES')"} :</h2>
+					<h2>{function="_t('PREFERENCES')"} :</h2>
 					<form method="POST" action="action.php?action=updateConfiguration">
 					<section>
-						<h3>{function="I18n::t('GENERALITY')"}</h3>
-						<p><label for="root">{function="I18n::t('PROJECT_ROOT')"} :</label> <input type="text" id="root" name="root" value="{$configurationManager->get('root')}"></p>
-						<h4>{function="I18n::t('LET_SLASH_AT_END')"}</h4>
+						<h3>{function="_t('GENERALITY')"}</h3>
+						<p><label for="root">{function="_t('PROJECT_ROOT')"} :</label> <input type="text" id="root" name="root" value="{$configurationManager->get('root')}"></p>
+						<h4>{function="_t('LET_SLASH_AT_END')"}</h4>
 					</section>
 
 					<section>
-						<h3>{function="I18n::t('USER')"}</h3>
-						<p><label for="login">{function="I18n::t('LOGIN')"} :</label> <input type="text" id="login" name="login" value="{$myUser->getLogin()}"></p>
-						<p><label for="password">{function="I18n::t('PASSWORD')"} :</label> <input type="password" id="password" name="password" autocomplete="off" value=""></p>
-						<h4>{function="I18n::t('LET_EMPTY_IF_NO_PASS_CHANGE')"}</h4>
+						<h3>{function="_t('USER')"}</h3>
+						<p><label for="login">{function="_t('LOGIN')"} :</label> <input type="text" id="login" name="login" value="{$myUser->getLogin()}"></p>
+						<p><label for="password">{function="_t('PASSWORD')"} :</label> <input type="password" id="password" name="password" autocomplete="off" value=""></p>
+						<h4>{function="_t('LET_EMPTY_IF_NO_PASS_CHANGE')"}</h4>
 					
 					</section>
 
 					<section>
-						<h3>{function="I18n::t('SYNCHRONISATION')"}</h3>
+						<h3>{function="_t('SYNCHRONISATION')"}</h3>
 						<p><input type="radio"  {if="$synchronisationType=='auto'"} checked="checked" {/if} value="auto" id="synchronisationTypeComplete" name="synchronisationType"> <label for="synchronisationTypeComplete"><strong>
-							{function="I18n::t('AUTOMATIC_FULL')"} :</strong></label> {function="I18n::t('AUTOMATIC_FULL_DESC')"}</p>
-						<p><input type="radio" {if=" $synchronisationType=='graduate'"} checked="checked" {/if}  value="graduate" id="synchronisationTypeGraduated" name="synchronisationType"> <label for="synchronisationTypeGraduated"><strong>{function="I18n::t('AUTOMATIC_GRADUATE')"} :</strong></label> {function="I18n::t('AUTOMATIC_GRADUATE_DESC')"}</p>
-						<p><input type="radio" {if="$synchronisationType=='manual'"} checked="checked" {/if}  value="manual" id="synchronisationTypeManual" name="synchronisationType"> <label for="synchronisationTypeManual"><strong>{function="I18n::t('MANUAL_FULL')"} :</strong></label> {function="I18n::t('MANUAL_FULL_DESC')"}</p>
+							{function="_t('AUTOMATIC_FULL')"} :</strong></label> {function="_t('AUTOMATIC_FULL_DESC')"}</p>
+						<p><input type="radio" {if=" $synchronisationType=='graduate'"} checked="checked" {/if}  value="graduate" id="synchronisationTypeGraduated" name="synchronisationType"> <label for="synchronisationTypeGraduated"><strong>{function="_t('AUTOMATIC_GRADUATE')"} :</strong></label> {function="_t('AUTOMATIC_GRADUATE_DESC')"}</p>
+						<p><input type="radio" {if="$synchronisationType=='manual'"} checked="checked" {/if}  value="manual" id="synchronisationTypeManual" name="synchronisationType"> <label for="synchronisationTypeManual"><strong>{function="_t('MANUAL_FULL')"} :</strong></label> {function="_t('MANUAL_FULL_DESC')"}</p>
 					
-						<p><strong>{function="I18n::t('SYNCHRONISATION_CODE')"} :</strong>
+						<p><strong>{function="_t('SYNCHRONISATION_CODE')"} :</strong>
 						{$synchronisationCode}
 						</p>
-						<p><strong>{function="I18n::t('SYNCHRONISATION_OPTION')"}</strong>
+						<p><strong>{function="_t('SYNCHRONISATION_OPTION')"}</strong>
 						<fieldset>
-							<legend>{function="I18n::t('ENABLE_CACHE')"}</legend>
-							<input type="radio" {if="$synchronisationEnableCache"} checked="checked" {/if} value="1" id="synchronisationEnableCacheYes" name="synchronisationEnableCache" /><label for="synchronisationEnableCacheYes">{function="I18n::t('YES')"}</label>
-							<input type="radio" {if="!$synchronisationEnableCache"} checked="checked" {/if} value="0" id="synchronisationEnableCacheNo" name="synchronisationEnableCache" /><label for="synchronisationEnableCacheNo">{function="I18n::t('NO')"}</label>
-							<p>{function="I18n::t('ENABLE_CACHE_DESC')"}</p>
+							<legend>{function="_t('ENABLE_CACHE')"}</legend>
+							<input type="radio" {if="$synchronisationEnableCache"} checked="checked" {/if} value="1" id="synchronisationEnableCacheYes" name="synchronisationEnableCache" /><label for="synchronisationEnableCacheYes">{function="_t('YES')"}</label>
+							<input type="radio" {if="!$synchronisationEnableCache"} checked="checked" {/if} value="0" id="synchronisationEnableCacheNo" name="synchronisationEnableCache" /><label for="synchronisationEnableCacheNo">{function="_t('NO')"}</label>
+							<p>{function="_t('ENABLE_CACHE_DESC')"}</p>
 						</fieldset>
 						<fieldset>
-							<legend>{function="I18n::t('FORCE_INTEGRATION')"}</legend>
-							<input type="radio" {if="$synchronisationForceFeed"} checked="checked" {/if} value="1" id="synchronisationForceFeedYes" name="synchronisationForceFeed" /><label for="synchronisationForceFeedYes">{function="I18n::t('YES')"}</label>
-							<input type="radio" {if="!$synchronisationForceFeed"} checked="checked" {/if} value="0" id="synchronisationForceFeedNo" name="synchronisationForceFeed" /><label for="synchronisationForceFeedNo">{function="I18n::t('NO')"}</label>
-							<p>{function="I18n::t('FORCE_INTEGRATION_DESC')"}</p>
+							<legend>{function="_t('FORCE_INTEGRATION')"}</legend>
+							<input type="radio" {if="$synchronisationForceFeed"} checked="checked" {/if} value="1" id="synchronisationForceFeedYes" name="synchronisationForceFeed" /><label for="synchronisationForceFeedYes">{function="_t('YES')"}</label>
+							<input type="radio" {if="!$synchronisationForceFeed"} checked="checked" {/if} value="0" id="synchronisationForceFeedNo" name="synchronisationForceFeed" /><label for="synchronisationForceFeedNo">{function="_t('NO')"}</label>
+							<p>{function="_t('FORCE_INTEGRATION_DESC')"}</p>
 						</fieldset>
 						</p>
 					</section>
 
 					<section>
 						{if="$myUser!=false"}
-						<h3>{function="I18n::t('PREFERENCES')"}</h3>
+						<h3>{function="_t('PREFERENCES')"}</h3>
 						<fieldset>
-							<legend>{function="I18n::t('ALLOW_ANONYOUS_READ')"}</legend>
-							<input type="radio" {if="$articleDisplayAnonymous=='1'"} checked="checked" {/if} value="1" id="articleDisplayAnonymousYes" name="articleDisplayAnonymous" /><label for="articleDisplayAnonymousYes">{function="I18n::t('YES')"}</label>
-							<input type="radio" {if="$articleDisplayAnonymous=='0'"} checked="checked" {/if} value="0" id="articleDisplayAnonymousNo" name="articleDisplayAnonymous" /><label for="articleDisplayAnonymousNo">{function="I18n::t('NO')"}</label>
-							<h4>{function="I18n::t('ALLOW_ANONYOUS_READ_DESC')"}</h4>
+							<legend>{function="_t('ALLOW_ANONYOUS_READ')"}</legend>
+							<input type="radio" {if="$articleDisplayAnonymous=='1'"} checked="checked" {/if} value="1" id="articleDisplayAnonymousYes" name="articleDisplayAnonymous" /><label for="articleDisplayAnonymousYes">{function="_t('YES')"}</label>
+							<input type="radio" {if="$articleDisplayAnonymous=='0'"} checked="checked" {/if} value="0" id="articleDisplayAnonymousNo" name="articleDisplayAnonymous" /><label for="articleDisplayAnonymousNo">{function="_t('NO')"}</label>
+							<h4>{function="_t('ALLOW_ANONYOUS_READ_DESC')"}</h4>
 						</fieldset>
 						<fieldset>
-							<legend><label for="articlePerPages">{function="I18n::t('EVENT_NUMBER_PER_PAGES')"}</label></legend>
+							<legend><label for="articlePerPages">{function="_t('EVENT_NUMBER_PER_PAGES')"}</label></legend>
 							<input type="text" value="{$configurationManager->get('articlePerPages')}" id="articlePerPages" name="articlePerPages" size="4" />
 						</fieldset>
 						<fieldset>
-							<legend>{function="I18n::t('SORT_BY_RECENT_EVENT_HOME')"}</legend>
-							<input type="radio" {if="$articleDisplayHomeSort"} checked="checked" {/if} value="1" id="articleDisplayHomeSortYes" name="articleDisplayHomeSort" /><label for="articleDisplayHomeSortYes">{function="I18n::t('YES')"}</label>
-							<input type="radio" {if="!$articleDisplayHomeSort"} checked="checked" {/if} value="0" id="articleDisplayHomeSortNo" name="articleDisplayHomeSort" /><label for="articleDisplayHomeSortNo">{function="I18n::t('NO')"}</label>
+							<legend>{function="_t('SORT_BY_RECENT_EVENT_HOME')"}</legend>
+							<input type="radio" {if="$articleDisplayHomeSort"} checked="checked" {/if} value="1" id="articleDisplayHomeSortYes" name="articleDisplayHomeSort" /><label for="articleDisplayHomeSortYes">{function="_t('YES')"}</label>
+							<input type="radio" {if="!$articleDisplayHomeSort"} checked="checked" {/if} value="0" id="articleDisplayHomeSortNo" name="articleDisplayHomeSort" /><label for="articleDisplayHomeSortNo">{function="_t('NO')"}</label>
 						</fieldset>
 						<fieldset>
-							<legend>{function="I18n::t('SORT_BY_RECENT_EVENT_FOLDER')"}</legend>
-							<input type="radio" {if="$articleDisplayFolderSort"} checked="checked" {/if} value="1" id="articleDisplayFolderSortYes" name="articleDisplayFolderSort" /><label for="articleDisplayFolderSortYes">{function="I18n::t('YES')"}</label>
-							<input type="radio" {if="!$articleDisplayFolderSort"} checked="checked" {/if} value="0" id="articleDisplayFolderSorttNo" name="articleDisplayFolderSort" /><label for="articleDisplayFolderSortNo">{function="I18n::t('NO')"}</label>
+							<legend>{function="_t('SORT_BY_RECENT_EVENT_FOLDER')"}</legend>
+							<input type="radio" {if="$articleDisplayFolderSort"} checked="checked" {/if} value="1" id="articleDisplayFolderSortYes" name="articleDisplayFolderSort" /><label for="articleDisplayFolderSortYes">{function="_t('YES')"}</label>
+							<input type="radio" {if="!$articleDisplayFolderSort"} checked="checked" {/if} value="0" id="articleDisplayFolderSorttNo" name="articleDisplayFolderSort" /><label for="articleDisplayFolderSortNo">{function="_t('NO')"}</label>
 						</fieldset>
 						<fieldset>
-							<legend>{function="I18n::t('SHOW_EVENT_LINK')"}</legend>
-							<input type="radio"  {if="$articleDisplayLink=='1'"} checked="checked" {/if}value="1" id="articleDisplayLinkYes" name="articleDisplayLink" /><label for="articleDisplayLinkYes">{function="I18n::t('YES')"}</label>
-							<input type="radio" {if="$articleDisplayLink=='0'"} checked="checked" {/if} value="0" id="articleDisplayLinkNo" name="articleDisplayLink" /><label for="articleDisplayLinkNo">{function="I18n::t('NO')"}</label>
+							<legend>{function="_t('SHOW_EVENT_LINK')"}</legend>
+							<input type="radio"  {if="$articleDisplayLink=='1'"} checked="checked" {/if}value="1" id="articleDisplayLinkYes" name="articleDisplayLink" /><label for="articleDisplayLinkYes">{function="_t('YES')"}</label>
+							<input type="radio" {if="$articleDisplayLink=='0'"} checked="checked" {/if} value="0" id="articleDisplayLinkNo" name="articleDisplayLink" /><label for="articleDisplayLinkNo">{function="_t('NO')"}</label>
 						</fieldset>
 						<fieldset>
-							<legend>{function="I18n::t('SHOW_EVENT_DATE')"}</legend>
-							<input type="radio" {if="$articleDisplayDate=='1'"} checked="checked" {/if} value="1" id="articleDisplayDateYes" name="articleDisplayDate" /><label for="articleDisplayDateYes">{function="I18n::t('YES')"}</label>
-							<input type="radio" {if="$articleDisplayDate=='0'"} checked="checked" {/if} value="0" id="articleDisplayDateNo" name="articleDisplayDate" /><label for="articleDisplayDateNo">{function="I18n::t('NO')"}</label>
+							<legend>{function="_t('SHOW_EVENT_DATE')"}</legend>
+							<input type="radio" {if="$articleDisplayDate=='1'"} checked="checked" {/if} value="1" id="articleDisplayDateYes" name="articleDisplayDate" /><label for="articleDisplayDateYes">{function="_t('YES')"}</label>
+							<input type="radio" {if="$articleDisplayDate=='0'"} checked="checked" {/if} value="0" id="articleDisplayDateNo" name="articleDisplayDate" /><label for="articleDisplayDateNo">{function="_t('NO')"}</label>
 						</fieldset>
 						<fieldset>
-							<legend>{function="I18n::t('SHOW_EVENT_AUTHOR')"}</legend>
-							<input type="radio" {if="$articleDisplayAuthor=='1'"} checked="checked" {/if} value="1" id="articleDisplayAuthorYes" name="articleDisplayAuthor" /><label for="articleDisplayAuthorYes">{function="I18n::t('YES')"}</label>
-							<input type="radio" {if="$articleDisplayAuthor=='0'"} checked="checked" {/if} value="0" id="articleDisplayAuthorNo" name="articleDisplayAuthor" /><label for="articleDisplayAuthorNo">{function="I18n::t('NO')"}</label>
+							<legend>{function="_t('SHOW_EVENT_AUTHOR')"}</legend>
+							<input type="radio" {if="$articleDisplayAuthor=='1'"} checked="checked" {/if} value="1" id="articleDisplayAuthorYes" name="articleDisplayAuthor" /><label for="articleDisplayAuthorYes">{function="_t('YES')"}</label>
+							<input type="radio" {if="$articleDisplayAuthor=='0'"} checked="checked" {/if} value="0" id="articleDisplayAuthorNo" name="articleDisplayAuthor" /><label for="articleDisplayAuthorNo">{function="_t('NO')"}</label>
 						</fieldset>
 						<fieldset>
-							<legend>{function="I18n::t('SHOW_EVENT_CONTENT')"}</legend>
-							<input type="radio" onchange="$('.articleView').slideToggle(200);" {if="$articleDisplayContent=='1'"} checked="checked" {/if} value="1" id="articleDisplayContentYes" name="articleDisplayContent" /><label for="articleDisplayContentYes">{function="I18n::t('YES')"}</label>
-							<input type="radio" onchange="$('.articleView').slideToggle(200);" {if="$articleDisplayContent=='0'"} checked="checked" {/if} value="0" id="articleDisplayContentNo" name="articleDisplayContent" /><label for="articleDisplayContentNo">{function="I18n::t('NO')"}</label>
+							<legend>{function="_t('SHOW_EVENT_CONTENT')"}</legend>
+							<input type="radio" onchange="$('.articleView').slideToggle(200);" {if="$articleDisplayContent=='1'"} checked="checked" {/if} value="1" id="articleDisplayContentYes" name="articleDisplayContent" /><label for="articleDisplayContentYes">{function="_t('YES')"}</label>
+							<input type="radio" onchange="$('.articleView').slideToggle(200);" {if="$articleDisplayContent=='0'"} checked="checked" {/if} value="0" id="articleDisplayContentNo" name="articleDisplayContent" /><label for="articleDisplayContentNo">{function="_t('NO')"}</label>
 							<div class="articleView"{$articleDisplayContent==0 ? 'style="display: none;"':''}>
-								<input type="radio" {if="$articleView=='partial'"} checked="checked" {/if} value="partial" id="articleViewPartial" name="articleView"{if="$articleDisplayContent=='0'"} disabled="disabled"{/if} /><label for="articleViewPartial">{function="I18n::t('PARTIAL')"}</label>
-								<input type="radio" {if="$articleView=='complete'"} checked="checked" {/if} value="complete" id="articleViewComplete" name="articleView"{if="$articleDisplayContent=='0'"} disabled="disabled"{/if} /><label for="articleViewComplete">{function="I18n::t('FULL')"}</label>
+								<input type="radio" {if="$articleView=='partial'"} checked="checked" {/if} value="partial" id="articleViewPartial" name="articleView"{if="$articleDisplayContent=='0'"} disabled="disabled"{/if} /><label for="articleViewPartial">{function="_t('PARTIAL')"}</label>
+								<input type="radio" {if="$articleView=='complete'"} checked="checked" {/if} value="complete" id="articleViewComplete" name="articleView"{if="$articleDisplayContent=='0'"} disabled="disabled"{/if} /><label for="articleViewComplete">{function="_t('FULL')"}</label>
 							</div>
-							<h4>{function="I18n::t('SHOW_PARTIAL_CONTENT_DESC')"}</h4>
+							<h4>{function="_t('SHOW_PARTIAL_CONTENT_DESC')"}</h4>
 						</fieldset>
 						<fieldset>
-							<legend>{function="I18n::t('KEEP_LAST_X_EVENTS_FEED',array('<input type="text" value="'.$configurationManager->get('feedMaxEvents').'" name="feedMaxEvents" size="4" />'))"}</legend>
-							<h4>{function="I18n::t('KEEP_LAST_X_EVENTS_FEED_DESC')"}</h4>
+							<legend>{function="_t('KEEP_LAST_X_EVENTS_FEED',array('<input type="text" value="'.$configurationManager->get('feedMaxEvents').'" name="feedMaxEvents" size="4" />'))"}</legend>
+							<h4>{function="_t('KEEP_LAST_X_EVENTS_FEED_DESC')"}</h4>
 						</fieldset>
 					
 					</section>
@@ -204,61 +204,61 @@
 			
 
 
-					<button name="installButton">{function="I18n::t('SAVE')"}</button>
+					<button name="installButton">{function="_t('SAVE')"}</button>
 					</form>
 					{else}
-					<p>{function="I18n::t('YOU_MUST_BE_CONNECTED_BOOKMARK')"}</p>
+					<p>{function="_t('YOU_MUST_BE_CONNECTED_BOOKMARK')"}</p>
 					{/if}
 				</section>
 			{/if}
 
 
 				<section class="importBloc">
-					<h2>{function="I18n::t('IMPORT_FEED_OPML_FORMAT')"}</h2>
+					<h2>{function="_t('IMPORT_FEED_OPML_FORMAT')"}</h2>
 					<iframe class="importFrame" src="action.php?action=importForm" name="idFrame" id="idFrame" width="100%" height="300" ></iframe>
 				</section>
 
 				
 				<section class="exportBloc">
 					<form action="action.php?action=exportFeed" method="POST">
-						<h2>{function="I18n::t('EXPORT_FEED_OPML_FORMAT')"}</h2>
-						<p>{function="I18n::t('OPML_FILE')"} : <button name="exportButton">{function="I18n::t('EXPORT')"}</button></p>
+						<h2>{function="_t('EXPORT_FEED_OPML_FORMAT')"}</h2>
+						<p>{function="_t('OPML_FILE')"} : <button name="exportButton">{function="_t('EXPORT')"}</button></p>
 					</form>
 				</section>
 				
 				<section class="bookBloc">
-					<h2>{function="I18n::t('USE_BOOKMARK')"} :</h2>
-					<p>{function="I18n::t('USE_BOOKMARK_DESC')"} :</p>
+					<h2>{function="_t('USE_BOOKMARK')"} :</h2>
+					<p>{function="_t('USE_BOOKMARK_DESC')"} :</p>
 					{if="$myUser!=false"}
 					
-					<a class="button" href="javascript:document.location='{$configurationManager->get('root')}action.php?action=login&newUrl='+escape(document.location)+'&usr={function="sha1($myUser->getPassword().$myUser->getLogin())"}'">+ {function="I18n::t('ADD_TO_LEED')"}</a>
+					<a class="button" href="javascript:document.location='{$configurationManager->get('root')}action.php?action=login&newUrl='+escape(document.location)+'&usr={function="sha1($myUser->getPassword().$myUser->getLogin())"}'">+ {function="_t('ADD_TO_LEED')"}</a>
 					{else}
-					<p>{function="I18n::t('YOU_MUST_BE_CONNECTED_BOOKMARK')"}</p>
+					<p>{function="_t('YOU_MUST_BE_CONNECTED_BOOKMARK')"}</p>
 					{/if}
 				</section>
 				
 
 				
 				<section class="pluginBloc">
-					<h2>{function="I18n::t('PLUGINS')"} :</h2>
-					<p>{function="I18n::t('CAN_DOWNLOAD_PLUGINS')"} : <a href="https://github.com/ldleman/Leed-market/"> Leed Market</a>.</p>
-					<p>{function="I18n::t('AVAILABLE_PLUGIN_LIST')"} :</p>
+					<h2>{function="_t('PLUGINS')"} :</h2>
+					<p>{function="_t('CAN_DOWNLOAD_PLUGINS')"} : <a href="https://github.com/ldleman/Leed-market/"> Leed Market</a>.</p>
+					<p>{function="_t('AVAILABLE_PLUGIN_LIST')"} :</p>
 					{if="$myUser!=false"}
 					<ul class="pluginList">
 					{if="count($plugins)==0"}
-					{function="I18n::t('NO_INSTALLED_PLUGINS')"}
+					{function="_t('NO_INSTALLED_PLUGINS')"}
 					
 					{else}
 					{loop="$plugins"}
 					<li>
 						<ul>
-							<li><h4>{function="I18n::t('NAME')"}: </h4>{$value->getName()}</li>
-							<li><h4>{function="I18n::t('AUTHOR')"}: </h4><a href="mailto:{$value->getMail()}">{$value->getAuthor()}</a></li>
-							<li><h4>{function="I18n::t('LICENCE')"}: </h4>{$value->getLicence()}</li>
-							<li><h4>{function="I18n::t('VERSION')"}: </h4><code>{$value->getVersion()}</code></li>
-							<li><h4>{function="I18n::t('SITE')"}: </h4><a href="{$value->getLink()}">{$value->getLink()}</a></li>
+							<li><h4>{function="_t('NAME')"}: </h4>{$value->getName()}</li>
+							<li><h4>{function="_t('AUTHOR')"}: </h4><a href="mailto:{$value->getMail()}">{$value->getAuthor()}</a></li>
+							<li><h4>{function="_t('LICENCE')"}: </h4>{$value->getLicence()}</li>
+							<li><h4>{function="_t('VERSION')"}: </h4><code>{$value->getVersion()}</code></li>
+							<li><h4>{function="_t('SITE')"}: </h4><a href="{$value->getLink()}">{$value->getLink()}</a></li>
 							<li>{$value->getDescription()}</li>
-							<li><a href="action.php?action=changePluginState&plugin={$value->getUid()}&state={$value->getState()}" class="button">{$value->getState()=="0"?I18n::t('ENABLE'):I18n::t('DISABLE')}</a></li>
+							<li><a href="action.php?action=changePluginState&plugin={$value->getUid()}&state={$value->getState()}" class="button">{$value->getState()=="0"?_t('ENABLE'):_t('DISABLE')}</a></li>
 						</ul>
 					</li>
 					{/loop}
@@ -266,7 +266,7 @@
 					</ul>
 
 					{else}
-					<p>{function="I18n::t('YOU_MUST_BE_CONNECTED_PLUGIN')"}</p>
+					<p>{function="_t('YOU_MUST_BE_CONNECTED_PLUGIN')"}</p>
 					{/if}
 				</section>
 
@@ -282,8 +282,8 @@
 {else}
 	<div id="main" class="wrapper clearfix">
 		<article>
-				<h3>{function="I18n::t('YOU_MUST_BE_CONNECTED_FEED')"}</h3>
-				<p>{function="I18n::t('IF_ADMIN_THEN_CONFIG')"}</p>
+				<h3>{function="_t('YOU_MUST_BE_CONNECTED_FEED')"}</h3>
+				<p>{function="_t('IF_ADMIN_THEN_CONFIG')"}</p>
 		</article>
 	</div>