[dw-free] Remove opportunity for OpenID to join communities after clicking Subscribe

[afuna]

[commit: http://hg.dwscoalition.org/dw-free/rev/6b95b555fb1e]

http://bugs.dwscoalition.org/show_bug.cgi?id=504

Remove "join community" wording for OpenID users on subscribe.

Patch by denise.

Files modified:

• htdocs/manage/circle/add.bml
• htdocs/manage/circle/add.bml.text

--------------------------------------------------------------------------------
diff -r 854b69496b9d -r 6b95b555fb1e htdocs/manage/circle/add.bml
--- a/htdocs/manage/circle/add.bml	Wed Mar 18 00:34:39 2009 +0800
+++ b/htdocs/manage/circle/add.bml	Tue Mar 17 17:12:48 2009 +0000
@@ -139,7 +139,11 @@
             $windowtitle = BML::ml('.confirm.title.community', {'user'=> $user });
             $title = BML::ml('.confirm.title.community', {'icon'=> $icon, 'user'=> $user });
             unless ( $remote->member_of( $u ) ) {
-                $body .= "<?p " . BML::ml('.confirm.text1.community2', {'aopts' => "href='$LJ::SITEROOT/community/join.bml?comm=$user'"}) . " p?>";
+                if ( $remote->is_person ) {
+                    $body .= "<?p " . BML::ml( '.confirm.text1.community2', {'aopts' => "href='$LJ::SITEROOT/community/join.bml?comm=$user'"} ) . " p?>";
+                } else {
+                    $body .= "<?p $ML{'.confirm.text1.community2.openid'} p?>";
+                }
             }
         } elsif ($u->{'journaltype'} eq "N") {
             $windowtitle = BML::ml('.confirm.title.news', {'user'=> $user });
diff -r 854b69496b9d -r 6b95b555fb1e htdocs/manage/circle/add.bml.text
--- a/htdocs/manage/circle/add.bml.text	Wed Mar 18 00:34:39 2009 +0800
+++ b/htdocs/manage/circle/add.bml.text	Tue Mar 17 17:12:48 2009 +0000
@@ -43,6 +43,8 @@
 .confirm.text=To add <b>[[user]]</b> to your friends list, click the button below.
 
 .confirm.text1.community2=Adding a community allows you to read the community's public posts on your reading page. If you would like to post to the community and be listed as a member, you'll need to <a [[aopts]]>join the community</a>.
+
+.confirm.text1.community2.openid=Adding a community allows you to read the community's public posts on your reading page.
 
 .confirm.text1.feed=Adding a feed allows you to read new content from the feed on your reading page.
 
--------------------------------------------------------------------------------