[Piwik-svn] r388 - in trunk: lang modules plugins/Login themes/default

[svnmaster at piwik.org]

Author: matt
Date: 2008-03-19 01:48:09 +0100 (Wed, 19 Mar 2008)
New Revision: 388

Removed:
   trunk/themes/default/login.tpl
Modified:
   trunk/lang/en.php
   trunk/lang/fr.php
   trunk/modules/Translate.php
   trunk/plugins/Login/Controller.php
   trunk/plugins/Login/Form.php
Log:
- now works when function _( is an alias of gettext( in some php configurations

Modified: trunk/lang/en.php
===================================================================
--- trunk/lang/en.php	2008-03-19 00:30:40 UTC (rev 387)
+++ trunk/lang/en.php	2008-03-19 00:48:09 UTC (rev 388)
@@ -8,5 +8,4 @@
 	'Login_login' => 'login:',
 	'Login_password' => 'pass:',
 	
-);
-?>
+);
\ No newline at end of file

Modified: trunk/lang/fr.php
===================================================================
--- trunk/lang/fr.php	2008-03-19 00:30:40 UTC (rev 387)
+++ trunk/lang/fr.php	2008-03-19 00:48:09 UTC (rev 388)
@@ -9,4 +9,3 @@
 	'Login_password' => 'pass:',
 	
 );
-?>

Modified: trunk/modules/Translate.php
===================================================================
--- trunk/modules/Translate.php	2008-03-19 00:30:40 UTC (rev 387)
+++ trunk/modules/Translate.php	2008-03-19 00:48:09 UTC (rev 388)
@@ -80,11 +80,5 @@
 	throw new Exception("Translation string '$index' not available.");
 }
 
-if(!function_exists('_'))
-{
-	function _($translationIndex)
-	{
-		return Piwik_Translate($translationIndex);
-	}
-}
 
+

Modified: trunk/plugins/Login/Controller.php
===================================================================
--- trunk/plugins/Login/Controller.php	2008-03-19 00:30:40 UTC (rev 387)
+++ trunk/plugins/Login/Controller.php	2008-03-19 00:48:09 UTC (rev 388)
@@ -63,7 +63,7 @@
 			}
 			else
 			{
-				$messageNoAccess = _('Login_LoginPasswordNotCorrect');
+				$messageNoAccess = Piwik_Translate('Login_LoginPasswordNotCorrect');
 			}
 		}
 		$view = new Piwik_View('Login/templates/login.tpl');	

Modified: trunk/plugins/Login/Form.php
===================================================================
--- trunk/plugins/Login/Form.php	2008-03-19 00:30:40 UTC (rev 387)
+++ trunk/plugins/Login/Form.php	2008-03-19 00:48:09 UTC (rev 388)
@@ -35,19 +35,19 @@
 		}
 		
 		$formElements = array(
-			array('text', 'form_login', _('Login_login')),
-			array('password', 'form_password', _('Login_password')),
+			array('text', 'form_login', Piwik_Translate('Login_login')),
+			array('password', 'form_password', Piwik_Translate('Login_password')),
 			array('hidden', 'form_url', $urlToGoAfter),
 		);
 		$this->addElements( $formElements );
 		
 		$formRules = array(
-			array('form_login', sprintf(_('General_Required'), 'login'), 'required'),
-			array('form_password', sprintf(_('General_Required'), 'password'), 'required'),
+			array('form_login', sprintf(Piwik_Translate('General_Required'), 'login'), 'required'),
+			array('form_password', sprintf(Piwik_Translate('General_Required'), 'password'), 'required'),
 		);
 		$this->addRules( $formRules );	
 		
-		$this->addElement('submit', 'submit', _('Login_Go'));
+		$this->addElement('submit', 'submit', Piwik_Translate('Login_Go'));
 	
 	}
 	

Deleted: trunk/themes/default/login.tpl
===================================================================
--- trunk/themes/default/login.tpl	2008-03-19 00:30:40 UTC (rev 387)
+++ trunk/themes/default/login.tpl	2008-03-19 00:48:09 UTC (rev 388)
@@ -1,67 +0,0 @@
-<link rel="stylesheet" href="themes/default/common-admin.css">
-<div style="width:520px;margin:auto;padding-top:40px;">
-
-	<div id="logo">
-		<h1>Piwik <span class="description"># open source web analytics</span></h1>
-		
-	</div>
-
-<div style="border: 1px solid #ddd;padding:15px;">
-
-{if $AccessErrorString}
-<div class="access_error">{$AccessErrorString}</div>
-{/if}
-
-{if $form_data.errors}
-	<div class="warning">
-	<div style="float:left;margin-right:20px;margin-bottom:40px;"><img src="themes/default/images/warning_medium.png"></div>
-	<div>
-	<strong>Please fix the following errors:</strong>
-	<ul>
-	{foreach from=$form_data.errors item=data}
-	<li>{$data}</li>
-	{/foreach}
-	</ul>
-	</div>
-	</div>
-{/if}
-
-{*
-{if isset($form_text)}
-<p>{$form_text}</p>
-{/if}
-*}
-
-<form {$form_data.attributes}>
-<!-- Output hidden fields -->
-
-<!-- Display the fields -->
-{foreach from=$element_list key=title item=data}
-	<h3>{$title}</h3>
-	
-	<table>
-	{foreach from=$data item=fieldname}
-		{* normal form *}
-		{if $form_data.$fieldname.label}
-		<tr>
-			<td>{$form_data.$fieldname.label}</td>
-			<td>{$form_data.$fieldname.html}</td>
-		
-		{elseif $form_data.$fieldname.type == 'hidden'}
-			{$form_data.$fieldname.html}
-		{/if}</tr>
-	{/foreach}
-	</table>
-	
-{/foreach}
-
-<div id="submit">
-{$form_data.submit.html}
-</div>
-
-</form> 
-
-
-</div>
-
-</div>