Fix for ticket #2828, part II: apostrophe in site name set in installer created a...

[quix0rs-gnu-social.git] / plugins / Sample / hello.php

diff --git a/plugins/Sample/hello.php b/plugins/Sample/hello.php
index 0cfd8a1c3e9d9eb7e3f33a7e1830cc7ef437db13..a793ac6de2c98948a13c7268c7cad6312c85a446 100644 (file)
--- a/plugins/Sample/hello.php
+++ b/plugins/Sample/hello.php
@@ -46,7 +46,6 @@ if (!defined('STATUSNET')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
-
 class HelloAction extends Action
 {
     var $user = null;
@@ -67,7 +66,6 @@ class HelloAction extends Action
      *
      * @return boolean success flag
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -93,7 +91,6 @@ class HelloAction extends Action
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
@@ -108,27 +105,27 @@ class HelloAction extends Action
      *
      * @return string Title of the page
      */
-
     function title()
     {
         if (empty($this->user)) {
             return _m('Hello');
         } else {
-            return sprintf(_m('Hello, %s'), $this->user->nickname);
+            return sprintf(_m('Hello, %s!'), $this->user->nickname);
         }
     }
 
     /**
-     * show content in the content area
+     * Show content in the content area
      *
      * The default StatusNet page has a lot of decorations: menus,
      * logos, tabs, all that jazz. This method is used to show
      * content in the content area of the page; it's the main
      * thing you want to overload.
      *
+     * This method also demonstrates use of a plural localized string.
+     *
      * @return void
      */
-
     function showContent()
     {
         if (empty($this->user)) {
@@ -138,7 +135,9 @@ class HelloAction extends Action
             $this->element('p', array('class' => 'greeting'),
                            sprintf(_m('Hello, %s'), $this->user->nickname));
             $this->element('p', array('class' => 'greeting_count'),
-                           sprintf(_m('I have greeted you %d time(s).'),
+                           sprintf(_m('I have greeted you %d time.',
+                                      'I have greeted you %d times.',
+                                      $this->gc->greeting_count),
                                    $this->gc->greeting_count));
         }
     }
@@ -158,7 +157,6 @@ class HelloAction extends Action
      *
      * @return boolean is read only action?
      */
-
     function isReadOnly($args)
     {
         return false;