From dc4fafbbd16adecc94fb1e3ee889689cfb786c3a Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 3 Nov 2010 12:59:19 -0700
Subject: [PATCH] General cleanup & part of ticket #2864: use
 User_group->getFancyName() instead of replicating the logic in various
 places. Encapsulates and allows for localization of parens.

---
 actions/showgroup.php                           | 7 +------
 lib/util.php                                    | 2 +-
 plugins/GroupFavorited/groupfavoritedaction.php | 7 +------
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/actions/showgroup.php b/actions/showgroup.php
index c872828442..f38cd420ac 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -68,12 +68,7 @@ class ShowgroupAction extends GroupDesignAction
      */
     function title()
     {
-        if (!empty($this->group->fullname)) {
-            // @todo FIXME: Needs proper i18n. Maybe use a generic method for this?
-            $base = $this->group->fullname . ' (' . $this->group->nickname . ')';
-        } else {
-            $base = $this->group->nickname;
-        }
+        $base = $this->group->getFancyName();
 
         if ($this->page == 1) {
             // TRANS: Page title for first group page. %s is a group name.
diff --git a/lib/util.php b/lib/util.php
index d50fa20814..8f2a9f1738 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1010,7 +1010,7 @@ function common_group_link($sender_id, $nickname)
         $attrs = array('href' => $group->permalink(),
                        'class' => 'url');
         if (!empty($group->fullname)) {
-            $attrs['title'] = $group->fullname . ' (' . $group->nickname . ')';
+            $attrs['title'] = $group->getFancyName();
         }
         $xs = new XMLStringer();
         $xs->elementStart('span', 'vcard');
diff --git a/plugins/GroupFavorited/groupfavoritedaction.php b/plugins/GroupFavorited/groupfavoritedaction.php
index dbd37abbcf..dcbf7d0bc5 100644
--- a/plugins/GroupFavorited/groupfavoritedaction.php
+++ b/plugins/GroupFavorited/groupfavoritedaction.php
@@ -41,12 +41,7 @@ class GroupFavoritedAction extends ShowgroupAction
      */
     function title()
     {
-        if (!empty($this->group->fullname)) {
-            // @todo Create a core method to create this properly. i18n issue.
-            $base = $this->group->fullname . ' (' . $this->group->nickname . ')';
-        } else {
-            $base = $this->group->nickname;
-        }
+        $base = $this->group->getFancyName();
 
         if ($this->page == 1) {
             // TRANS: %s is a group name.