Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/site/app/views/users/emailchange.thtml
diff options
context:
space:
mode:
Diffstat (limited to 'site/app/views/users/emailchange.thtml')
-rw-r--r--site/app/views/users/emailchange.thtml39
1 files changed, 26 insertions, 13 deletions
diff --git a/site/app/views/users/emailchange.thtml b/site/app/views/users/emailchange.thtml
index 9f91a53..48dc877 100644
--- a/site/app/views/users/emailchange.thtml
+++ b/site/app/views/users/emailchange.thtml
@@ -37,24 +37,37 @@
* ***** END LICENSE BLOCK ***** */
?>
-<div class="secondary" role="complementary">
- <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary" role="main">
- <?=$this->renderElement('amo2009/search')?>
+<div id="content">
+ <?=$this->renderElement('search')?>
+ <?=$this->renderElement('sidebar', array('pitch' => true))?>
+ <?=$this->renderElement('app_chooser')?>
+
+ <div id="content-main">
<?php
-$_user_emailchange_success = ___('user_emailchange_success');
-$_user_emailchange_successful_description = sprintf(___('user_emailchange_successful_description'), $newemail);
-$_user_emailchange_error = ___('user_emailchange_error');
-$_link_return_to_front_page = ___('link_return_to_front_page');
+// @partial translation fallback, 5/7/08
+if (_('user_emailchange_success') != 'user_emailchange_success') {
+ $_user_emailchange_success = _('user_emailchange_success');
+ $_user_emailchange_successful_description = sprintf(
+ _('user_emailchange_successful_description'), $newemail);
+ $_user_emailchange_error = _('user_emailchange_error');
+ $_link_return_to_front_page = _('link_return_to_front_page');
+} else {
+ $_user_emailchange_success = 'Success!';
+ $_user_emailchange_successful_description = sprintf('Your email address was '
+ .'changed successfully. From now on, please use %1$s to log in.',
+ $newemail);
+ $_user_emailchange_error = 'Error!';
+ $_link_return_to_front_page = 'Click here to return to the front page.';
+}
if (!isset($errormsg)): ?>
-<?=$this->renderElement('notification', array('type' => 'success', 'msg' => $_user_emailchange_success, 'description' => $_user_emailchange_successful_description))?>
+ <h1><?=$_user_emailchange_success?></h1>
+ <p><?=$_user_emailchange_successful_description?></p>
<?php else: ?>
-<?=$this->renderElement('notification', array('type' => 'error', 'msg' => $_user_emailchange_error, 'description' => $errormsg))?>
+ <h1><?=$_user_emailchange_error?></h1>
+ <p><?=$errormsg?></p>
<?php endif; ?>
<p><?=$html->link($_link_return_to_front_page, '/')?></p>
-
+ </div>
</div>