From 0060163a76652a5f6cbe3d32306308c6fa7f9d3c Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 26 Feb 2010 09:59:36 -0800
Subject: [PATCH 1/2] Temp fix for mismatched newlines in Telugu; gettext
 sometimes refuses to complete when such mismatches are present. (Needs to be
 fixed upstream in TranslateWiki separately so it doesn't revert.)

---
 locale/te/LC_MESSAGES/statusnet.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 37a2582b30..09ede3d86c 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -5341,7 +5341,7 @@ msgstr ""
 "%7$s.\n"
 "\n"
 "----\n"
-"మీ ఈమెయిలు చిరునామాని లేదా గమనింపుల ఎంపికలను %8$s వద్ద మార్చుకోండి"
+"మీ ఈమెయిలు చిరునామాని లేదా గమనింపుల ఎంపికలను %8$s వద్ద మార్చుకోండి\n"
 
 #: lib/mail.php:258
 #, php-format

From c95daacfdb6d89098716b8eeccfdd82124019d7a Mon Sep 17 00:00:00 2001
From: Christopher Vollick <psycotica0@gmail.com>
Date: Fri, 26 Feb 2010 10:10:38 -0500
Subject: [PATCH 2/2] Updated ShowGroup to Resolve Aliases Again.

The way we find groups changed with this new Local_group table.
I had to update this too.
---
 actions/showgroup.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/actions/showgroup.php b/actions/showgroup.php
index 0139ba157d..4e1fcb6c7b 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -125,14 +125,6 @@ class ShowgroupAction extends GroupDesignAction
         $local = Local_group::staticGet('nickname', $nickname);
 
         if (!$local) {
-            common_log(LOG_NOTICE, "Couldn't find local group for nickname '$nickname'");
-            $this->clientError(_('No such group.'), 404);
-            return false;
-        }
-
-        $this->group = User_group::staticGet('id', $local->group_id);
-
-        if (!$this->group) {
             $alias = Group_alias::staticGet('alias', $nickname);
             if ($alias) {
                 $args = array('id' => $alias->group_id);
@@ -142,11 +134,19 @@ class ShowgroupAction extends GroupDesignAction
                 common_redirect(common_local_url('groupbyid', $args), 301);
                 return false;
             } else {
+                common_log(LOG_NOTICE, "Couldn't find local group for nickname '$nickname'");
                 $this->clientError(_('No such group.'), 404);
                 return false;
             }
         }
 
+        $this->group = User_group::staticGet('id', $local->group_id);
+
+        if (!$this->group) {
+            $this->clientError(_('No such group.'), 404);
+            return false;
+        }
+
         common_set_returnto($this->selfUrl());
 
         return true;