L10n/i18n updated.

[quix0rs-gnu-social.git] / lib / accountprofileblock.php

diff --git a/lib/accountprofileblock.php b/lib/accountprofileblock.php
index ea6e27ac76dfb78a5d89e171bf8846752c38bdb1..1c3a8dc536267e757552fae89d6b9eb14d795937 100644 (file)
--- a/lib/accountprofileblock.php
+++ b/lib/accountprofileblock.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2011, StatusNet, Inc.
  *
  * Profile block to show for an account
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -44,7 +44,6 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class AccountProfileBlock extends ProfileBlock
 {
     protected $profile = null;
@@ -63,8 +62,8 @@ class AccountProfileBlock extends ProfileBlock
         if (empty($avatar)) {
             $avatar = $this->profile->getAvatar(73);
         }
-        return (!empty($avatar)) ? 
-            $avatar->displayUrl() : 
+        return (!empty($avatar)) ?
+            $avatar->displayUrl() :
             Avatar::defaultImage(AVATAR_PROFILE_SIZE);
     }
 
@@ -95,21 +94,22 @@ class AccountProfileBlock extends ProfileBlock
 
     function showActions()
     {
-        if ($this->profile->hasRole(Profile_role::DELETED)) {
-            $this->out->elementStart('div', 'entity_actions');
-            // TRANS: H2 for user actions in a profile.
-            $this->out->element('h2', null, _('User actions'));
-            $this->out->elementStart('ul');
-            $this->out->elementStart('p', array('class' => 'profile_deleted'));
-            // TRANS: Text shown in user profile of not yet compeltely deleted users.
-            $this->out->text(_('User deletion in progress...'));
-            $this->out->elementEnd('p');
-            $this->out->elementEnd('ul');
-            $this->out->elementEnd('div');
-            return;
-        }
         if (Event::handle('StartProfilePageActionsSection', array($this->out, $this->profile))) {
 
+            if ($this->profile->hasRole(Profile_role::DELETED)) {
+                $this->out->elementStart('div', 'entity_actions');
+                // TRANS: H2 for user actions in a profile.
+                $this->out->element('h2', null, _('User actions'));
+                $this->out->elementStart('ul');
+                $this->out->elementStart('p', array('class' => 'profile_deleted'));
+                // TRANS: Text shown in user profile of not yet compeltely deleted users.
+                $this->out->text(_('User deletion in progress...'));
+                $this->out->elementEnd('p');
+                $this->out->elementEnd('ul');
+                $this->out->elementEnd('div');
+                return;
+            }
+
             $cur = common_current_user();
 
             $this->out->elementStart('div', 'entity_actions');
@@ -130,9 +130,9 @@ class AccountProfileBlock extends ProfileBlock
                         $this->out->elementStart('li', 'entity_edit');
                         $this->out->element('a', array('href' => common_local_url('profilesettings'),
                                                   // TRANS: Link title for link on user profile.
-                                                  'title' => _('Edit profile settings')),
+                                                  'title' => _('Edit profile settings.')),
                                        // TRANS: Link text for link on user profile.
-                                       _('Edit'));
+                                       _m('BUTTON','Edit'));
                         $this->out->elementEnd('li');
                     } else { // someone else's page
 
@@ -143,6 +143,9 @@ class AccountProfileBlock extends ProfileBlock
                         if ($cur->isSubscribed($this->profile)) {
                             $usf = new UnsubscribeForm($this->out, $this->profile);
                             $usf->show();
+                        } else if ($cur->hasPendingSubscription($this->profile)) {
+                            $sf = new CancelSubscriptionForm($this->out, $this->profile);
+                            $sf->show();
                         } else {
                             $sf = new SubscribeForm($this->out, $this->profile);
                             $sf->show();
@@ -156,9 +159,9 @@ class AccountProfileBlock extends ProfileBlock
                             $this->out->elementStart('li', 'entity_send-a-message');
                             $this->out->element('a', array('href' => common_local_url('newmessage', array('to' => $this->user->id)),
                                                       // TRANS: Link title for link on user profile.
-                                                      'title' => _('Send a direct message to this user')),
+                                                      'title' => _('Send a direct message to this user.')),
                                            // TRANS: Link text for link on user profile.
-                                           _('Message'));
+                                           _m('BUTTON','Message'));
                             $this->out->elementEnd('li');
 
                             // nudge
@@ -284,6 +287,6 @@ class AccountProfileBlock extends ProfileBlock
         $this->out->element('a', array('href' => $url,
                                   'class' => 'entity_remote_subscribe'),
                        // TRANS: Link text for link that will subscribe to a remote profile.
-                       _('Subscribe'));
+                       _m('BUTTON','Subscribe'));
     }
-}
\ No newline at end of file
+}