Improvements to the wordings for subscription

diff --git a/lang/en/forum.php b/lang/en/forum.php
index ad4eb80e5f29aec9839954572f23a919cdcf500c..c709e00936aae00c42d5960e88fb21b8f99a14eb 100644 (file)
--- a/lang/en/forum.php
+++ b/lang/en/forum.php
@@ -86,8 +86,8 @@ $string['processingpost'] = "Processing post \$a";
 $string['rate'] = "Rate";
 $string['ratings'] = "Ratings";
 $string['ratingssaved'] = "Ratings saved";
-$string['readtherest'] = "Read the rest of this topic";
 $string['re'] = "Re:";    // Put in front of subjects that are replies to another post
+$string['readtherest'] = "Read the rest of this topic";
 $string['replies'] = "Replies";
 $string['repliesmany'] = "\$a replies so far";
 $string['repliesone'] = "\$a reply so far";
@@ -104,6 +104,8 @@ $string['subscribe'] = "Subscribe to this forum";
 $string['subscribed'] = "Subscribed";
 $string['subscribers'] = "Subscribers";
 $string['subscribersto'] = "Subscribers to '\$a'";
+$string['subscribestart'] = "Send me copies of forum posts by email";
+$string['subscribestop'] = "Do not send me copies of forum postings";
 $string['subscription'] = "Subscription";
 $string['subscriptions'] = "Subscriptions";
 $string['unsubscribe'] = "Unsubscribe from this forum";

diff --git a/mod/forum/post.html b/mod/forum/post.html
index 5b105d51aca871a3048bbbc7b0a3f5b5b05c4dd6..b8b16d073532c37d056f2bd58caa168bac8fadd5 100644 (file)
--- a/mod/forum/post.html
+++ b/mod/forum/post.html
@@ -64,12 +64,12 @@
        } else {
            unset($options);
            if (forum_is_subscribed($USER->id, $post->forum)) {
-               $options[0] = get_string("subscribed", "forum");
-               $options[1] = get_string("unsubscribe", "forum");
+               $options[0] = get_string("subscribestart", "forum");
+               $options[1] = get_string("subscribestop", "forum");
                choose_from_menu($options, "unsubscribe", 0, "");
            } else {
-               $options[0] = get_string("unsubscribed", "forum");
-               $options[1] = get_string("subscribe", "forum");
+               $options[0] = get_string("subscribestop", "forum");
+               $options[1] = get_string("subscribestart", "forum");
                choose_from_menu($options, "subscribe", 0, "");
            }
        }

diff --git a/mod/forum/view.php b/mod/forum/view.php
index 46c5ecca0858ae47f1cadb143c8e7682b8b2a407..081a56e6dc8bd04553267393f4e54428a15a70e8 100644 (file)
--- a/mod/forum/view.php
+++ b/mod/forum/view.php
@@ -102,12 +102,14 @@
             echo "</font></div>";
 
             if (forum_is_subscribed($USER->id, $forum->id)) {
+                $subtexttitle = get_string("subscribestop", "forum");
                 $subtext = get_string("unsubscribe", "forum");
             } else {
+                $subtexttitle = get_string("subscribestart", "forum");
                 $subtext = get_string("subscribe", "forum");
             }
             echo "<div align=right>";
-            echo "<font size=1><a href=\"subscribe.php?id=$forum->id\">$subtext</a></font>";
+            echo "<font size=1><a title=\"$subtexttitle\" href=\"subscribe.php?id=$forum->id\">$subtext</a></font>";
             echo "</div>";
         }
     }