Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

2013-01-14 17:44:54 +01:00
parent ffbc326454 886f6d864b
commit 71e863c6f5
7 changed files with 62 additions and 23 deletions
@@ -81,6 +81,7 @@
 				<img src="../img/admin/edit.gif" />
 			</a>
 		</div>
+		{l s='Language:'} {if isset($customerLanguage)}{$customerLanguage->name}{else}{l s='undefined'}{/if}<br />
 		{l s='Newsletter:'} {if $customer->newsletter}<img src="../img/admin/enabled.gif" />{else}<img src="../img/admin/disabled.gif" />{/if}<br />
 		{l s='Opt in:'} {if $customer->optin}<img src="../img/admin/enabled.gif" />{else}<img src="../img/admin/disabled.gif" />{/if}<br />
 		{l s='Age:'} {$customer_stats['age']} {if isset($customer->birthday['age'])}({$customer_birthday}){else}{l s='unknown'}{/if}<br /><br />