[dw-free] Navbar displaying wrong relationship level

[kareila]

[commit: http://hg.dwscoalition.org/dw-free/rev/257410deeeaa]

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

Correct navbar text for mutual subscriptions or mutual access.

Patch by yvi.

Files modified:

• bin/upgrading/en.dat
• cgi-bin/weblib.pl

--------------------------------------------------------------------------------
diff -r af4a985f0c05 -r 257410deeeaa bin/upgrading/en.dat
--- a/bin/upgrading/en.dat	Mon Sep 07 20:07:09 2009 -0500
+++ b/bin/upgrading/en.dat	Tue Sep 08 07:39:12 2009 -0500
@@ -3798,11 +3798,15 @@ web.controlstrip.status.member=You are a
 
 web.controlstrip.status.memberwatcher=You are a member of and are watching [[user]]
 
+web.controlstrip.status.mutualtrust=[[user]] and you have mutual access
+
 web.controlstrip.status.mutualtrust_mutualwatch=[[user]] and you have mutual access and mutual subscriptions
 
 web.controlstrip.status.mutualtrust_watch=[[user]] and you have mutual access and you subscribe to them
 
 web.controlstrip.status.mutualtrust_watchedby=[[user]] and you have mutual access and they subscribe to you
+
+web.controlstrip.status.mutualwatch=[[user]] and you have mutual subscriptions
 
 web.controlstrip.status.other=You are viewing [[user]]
 
diff -r af4a985f0c05 -r 257410deeeaa cgi-bin/weblib.pl
--- a/cgi-bin/weblib.pl	Mon Sep 07 20:07:09 2009 -0500
+++ b/cgi-bin/weblib.pl	Tue Sep 08 07:39:12 2009 -0500
@@ -2546,9 +2546,11 @@ sub control_strip
                     'community'         => BML::ml('web.controlstrip.status.community', {'user' => $journal_display}),
                     'syn'               => BML::ml('web.controlstrip.status.syn', {'user' => $journal_display}),
                     'other'             => BML::ml('web.controlstrip.status.other', {'user' => $journal_display}),
+                    'mutualtrust' => BML::ml('web.controlstrip.status.mutualtrust', {'user' => $journal_display}),
                     'mutualtrust_mutualwatch' => BML::ml('web.controlstrip.status.mutualtrust_mutualwatch', {'user' => $journal_display}),
                     'mutualtrust_watch' => BML::ml('web.controlstrip.status.mutualtrust_watch', {'user' => $journal_display}),
                     'mutualtrust_watchedby' => BML::ml('web.controlstrip.status.mutualtrust_watchedby', {'user' => $journal_display}),
+                    'mutualwatch' => BML::ml('web.controlstrip.status.mutualwatch', {'user' => $journal_display}),
                     'trust_mutualwatch' => BML::ml('web.controlstrip.status.trust_mutualwatch', {'user' => $journal_display}),
                     'trust_watch' => BML::ml('web.controlstrip.status.trust_watch', {'user' => $journal_display}),
                     'trust_watchedby' => BML::ml('web.controlstrip.status.trust_watchedby', {'user' => $journal_display}),
@@ -2680,14 +2682,20 @@ sub control_strip
             } elsif ( $trusted && $mutual_watch ) {
                 $ret .= "$statustext{trust_mutualwatch}<br />";
                 $ret .= "$links{edit_friend}";
+            } elsif ( $trusted_by && $mutual_watch ) {
+                $ret .= "$statustext{trustedby_mutualwatch}<br />";
+                $ret .= "$links{edit_friend}";
+            } elsif ( $mutual_trust ) {
+                $ret .= "$statustext{mutualtrust}<br />";
+                $ret .= "$links{edit_friend}";
+            } elsif ( $mutual_watch ) {
+                $ret .= "$statustext{mutualwatch}<br />";
+                $ret .= "$links{edit_friend}";
             } elsif ( $trusted && $watched ) {
                 $ret .= "$statustext{trust_watch}<br />";
                 $ret .= "$links{edit_friend}";
             } elsif ( $trusted && $watched_by ) {
                 $ret .= "$statustext{trust_watchedby}<br />";
-                $ret .= "$links{edit_friend}";
-            } elsif ( $trusted_by && $mutual_watch ) {
-                $ret .= "$statustext{trustedby_mutualwatch}<br />";
                 $ret .= "$links{edit_friend}";
             } elsif ( $trusted_by && $watched ) {
                 $ret .= "$statustext{trustedby_watch}<br />";
--------------------------------------------------------------------------------