Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

2 files changed, 22 insertions, 1 deletions

diff --git a/actions/register.php b/actions/register.php
index 063bbe2cc..698137346 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -303,6 +303,27 @@ class RegisterAction extends Action
         return ($user !== false);
     }
 
+    // overrrided to add entry-title class
+    function showPageTitle() {
+        if (Event::handle('StartShowPageTitle', array($this))) {
+            $this->element('h1', array('class' => 'entry-title'), $this->title());
+        }
+    }
+
+    // overrided to add hentry, and content-inner class
+    function showContentBlock()
+    {
+        $this->elementStart('div', array('id' => 'content', 'class' => 'hentry'));
+        $this->showPageTitle();
+        $this->showPageNoticeBlock();
+        $this->elementStart('div', array('id' => 'content_inner',
+                                         'class' => 'entry-content'));
+        // show the actual content (forms, lists, whatever)
+        $this->showContent();
+        $this->elementEnd('div');
+        $this->elementEnd('div');
+    }
+
     /**
      * Instructions or a notice for the page
      *
diff --git a/actions/showapplication.php b/actions/showapplication.php
index d307ea452..020d62480 100644
--- a/actions/showapplication.php
+++ b/actions/showapplication.php
@@ -201,7 +201,7 @@ class ShowApplicationAction extends OwnerDesignAction
         $userCnt = $appUsers->count();
 
         $this->raw(sprintf(
-            _('created by %1$s - %2$s access by default - %3$d users'),
+            _('Created by %1$s - %2$s access by default - %3$d users'),
               $profile->getBestName(),
               $defaultAccess,
               $userCnt