[Oscss-commit] SF.net SVN: oscss:[4602] branches/2.1.1/catalog

[<os...@us...>]

Revision: 4602
          http://oscss.svn.sourceforge.net/oscss/?rev=4602&view=rev
Author:   oscim
Date:     2012-09-07 16:09:29 +0000 (Fri, 07 Sep 2012)
Log Message:
-----------
correction chargement des elements de langue

Modified Paths:
--------------
    branches/2.1.1/catalog/includes/languages/fr_FR/boxes/myaccount.txt
    branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.myaccount.gab

Modified: branches/2.1.1/catalog/includes/languages/fr_FR/boxes/myaccount.txt
===================================================================
--- branches/2.1.1/catalog/includes/languages/fr_FR/boxes/myaccount.txt	2012-09-04 11:57:42 UTC (rev 4601)
+++ branches/2.1.1/catalog/includes/languages/fr_FR/boxes/myaccount.txt	2012-09-07 16:09:29 UTC (rev 4602)
@@ -8,5 +8,15 @@
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
 */
+
+
 $lang['box heading my account']="Espace perso" ;
+$lang['my account title']="Mon compte" ;
+
+$lang['my account information']="Coordonnées" ;
+$lang['my account password']="Mot de passe" ;
+$lang['email notifications newsletters']="Newsletters" ;
+$lang['text logoff']="Déconnexion" ;
+$lang['email notifications title']="Notifications" ;
+
 ?>
\ No newline at end of file

Modified: branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.myaccount.gab
===================================================================
--- branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.myaccount.gab	2012-09-04 11:57:42 UTC (rev 4601)
+++ branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.myaccount.gab	2012-09-07 16:09:29 UTC (rev 4602)
@@ -14,14 +14,14 @@
 
 	$ModuleAccount = account::getInstance();
   $module=$page->_call('account','ret_modules');
-// print_r($ModuleAccount->CstrMenu());
+// var_dump($account);
 
 ?>
-	<h3><?php echo MY_ACCOUNT_TITLE; ?></h3>
+	<h3><?php echo __('my account title'); ?></h3>
 	<ul>
-		<li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, 'action=edit', 'SSL') . '">' . MY_ACCOUNT_INFORMATION . '</a>'; ?></li>
-		<li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, 'action=password', 'SSL') . '">' . MY_ACCOUNT_PASSWORD . '</a>'; ?></li>
-		<li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, 'action=newsletters', 'SSL') . '">' . EMAIL_NOTIFICATIONS_NEWSLETTERS . '</a>'; ?></li>
+		<li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, 'action=edit', 'SSL') . '">' . __('my account information') . '</a>'; ?></li>
+		<li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, 'action=password', 'SSL') . '">' . __('my account password') . '</a>'; ?></li>
+		<li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, 'action=newsletters', 'SSL') . '">' . __('email notifications newsletters') . '</a>'; ?></li>
 		<?php foreach($ModuleAccount->CstrMenu() as $k=>$aca_mod) :  ?>
 			<!-- 		dynamic myaccount menu -->
 			<?php if($aca_mod->pile =='myaccount') :  ?>
@@ -32,13 +32,14 @@
 				<?php endforeach; ?>
 			<?php endif; ?>
 		<?php endforeach; ?>
-		<li><?php echo '<a href="' . tep_href_link(FILENAME_LOGOFF, '', 'NONSSL') . '">' .TEXT_LOGOFF . '</a>'; ?></li>
+		<li><?php echo '<a href="' . tep_href_link(FILENAME_LOGOFF, '', 'NONSSL') . '">' .__('text logoff') . '</a>'; ?></li>
 	</ul>
 
-	<?php if($account['customers_newsletter'] > 0 || @$account['global_product_notifications'] > 0 ) :  ?>
+	<?php //if($account['customers_newsletter'] > 0 || @$account['global_product_notifications'] > 0 ) :  ?>
+	<?php if($account->customers_newsletter > 0 || $account->global_product_notifications > 0 ) :  ?>
 <!-- 		dynamic notification menu -->
     <div class="contentBox myEmail">
-      <h3><?php echo EMAIL_NOTIFICATIONS_TITLE; ?></h3>
+      <h3><?php echo __('email notifications title'); ?></h3>
         <ul>
 				<?php foreach($ModuleAccount->CstrMenu() as $k=>$aca_mod) :  ?>
 					<?php if($aca_mod->pile =='notification') :  ?>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.