Ticket #646: user.inc.patch

user.inc

@@ -80 +80 @@
-    }
-    echo "<tr>
-        <td>$x</td>
-right
-right
-right
+\"right\"
+\"right\"
+\"right\"
-        </tr>
-    ";
-}
@@ -96 +96 @@
-    if (count($user->projects) > 1) {
-        usort($user->projects, "cmp");
-        if ($personal) {
-Projects in which you are participating
+".tra("Projects in which you are participating")."
-        } else {
-Projects in which $user->name is participating
+."tra("Projects in which %1 is participating", $user->name)."
-        }
-        start_table();
-        row_heading_array(array(
-"Project<br><span class=note>Click for user page</span>", "Total credit", "Average credit", "Since"
+tra("Project"), "<br/><span class=\"note\">".tra("Click for user page")."</span>", tra("Total credit"), tra("Average credit"), tra("Since")
-        ));
-        foreach($user->projects as $project) {
-            show_project($project);
@@ -132 +132 @@
-    if (parse_bool($config, "show_results")) {
-        row2(tra("Pending credit"), "<a href=\"pending.php\">".tra("View")."</a>");
-    }
-
-
-
+
-    row2(tra("Tasks"), "<a href=\"results.php?userid=$user->id\">".tra("View")."</a>");
-    $cpid = md5($user->cross_project_id . $user->email_addr);
-    $x = "";
@@ -142 +140 @@
-    foreach ($cpid_stats_sites as $site) {
-        $name = $site[0];
-        $y = sprintf($site[1], $cpid);
-
+/
-    }
-
+/
-    row2(tra("Cross-project statistics"), $x);
-    row2(tra("Stats on your cell phone"), URL_BASE."userw.php?id=$user->id");
-}
@@ -191 +189 @@
-    row2(tra("%1 member since", PROJECT), date_str($user->create_time));
-    row2(tra("Change"), "<a href=\"edit_email_form.php\">".tra("email address")."</a> | <a href=\"edit_passwd_form.php\">".tra("password")."</a> | <a href=\"edit_user_info_form.php\">".tra("other account info")."</a>");
-    row2("", "<a href=\"logout.php?".url_tokens($user->authenticator)."\">".tra("Log out")."</a>");
-"User ID<br><span class=note>Used in community functions
-"Account key<br><span class=note>Provides full access to your account
-"Weak account key<br><span class=note>Provides <a href=weak_auth.php> limited access</a> to your account
+tra("User ID"), "<br/><span class=\"note\">".tra("Used in community functions")."
+tra("Account key"), "<br/><span class=\"note\">".tra("Provides full access to your account")."
+tra("Weak account key"), "<br/><span class=\"note\">".tra("Provides")." <a href=\"weak_auth.php\">".tra("limited access")."</a>".tra("to your account")."
-
-    row1("<a name=\"prefs\"></a>".tra("Preferences"));
-    row2(
@@ -219 +217 @@
-    row2(tra("Profile"), $x);
-    $tot = total_posts($user);
-    if ($tot) {
-".URL_BASE."forum_user_posts.php?userid=$user->id
+\"".URL_BASE."forum_user_posts.php?userid=$user->id\"
-    }
-    
-    row2(tra("Private messages"), pm_notification($user).pm_email_remind($user));
@@ -230 +228 @@
-        foreach ($notifies as $notify) {
-            $x .= "&bull; ".notify_description($notify)."<br>";
-        }
-".notify_rss_url($user)."><img vspace=4 border=0 src=img/rss_icon.gif alt=RSS
-"Notifications"
+\"".notify_rss_url($user)."\"><img vspace=\"4\" border=\"0\" src=\"img/rss_icon.gif\" alt=\"RSS\" /
+tra("Notifications")
-    }
-
-    if ($user->teamid) {
@@ -245 +243 @@
-        // if there's a foundership request, notify the founder
-        //
-        if ($user->id==$team->userid && $team->ping_user >0) {
- <font color=red>(foundership change request pending)</font
+<span style=\"color:red;\">".tra("(foundership change request pending)")."</span
-        }
-        row2(tra("Member of team"), $x);
-    } else {
@@ -258 +256 @@
-            $x = "<a href=\"team_display.php?teamid=$team->id\">$team->name</a>";
-            $x .= "| <a href=\"team_manage.php?teamid=".$team->id."\">".tra("Administer")."</a>";
-            if ($team->ping_user > 0) {
- <font color=red>(foundership change request pending)</font
+<span style=\"color:red;\">".tra("(foundership change request pending)")."</span
-            }
-            row2(tra("Founder but not member of"), $x);
-        }
-    }
-
-    $friends = BoincFriend::enum("user_src=$user->id and reciprocated=1");
-user_search.php>Find friends</a><br
+\"user_search.php\">".tra("Find friends")."</a><br\
-    $n = count($friends);
-    if ($n) {
-        foreach($friends as $friend) {
-            $fuser = BoincUser::lookup_id($friend->user_dest);
-            $x .= friend_links($fuser);
-        }
-"Friends 
+tra("Friends"), "
-    } else {
-"Friends"
+tra("Friends")
-    }
-}
-
@@ -282 +280 @@
-//
-function show_user_summary_public($user) {
-    global $g_logged_in_user;
-PROJECT." member since"
-"Country"
+"%1 member since", PROJECT)
+tra("Country")
-    if (strlen($user->url)) {
-"URL"
+tra("URL")
-    }
-    show_credit($user);
-
-    if ($user->show_hosts) {
-"Computers", "<a href=\"".URL_BASE."hosts_user.php?userid=$user->id\">View
+tra("Computers"), "<a href=\"".URL_BASE."hosts_user.php?userid=$user->id\">".tra("View")."
-    } else {
-"Computers", "hidden"
+tra("Computers"), tra("hidden")
-    }
-    if ($user->donated == 1) { 
-        if (file_exists("../project/donations.inc")) {
-            require_once("../project/donations.inc");
-            $x .= DONATION_LINK;
-"Donor",
+tra("Donor"), 
-        }
-    }
-    
-}
-
-function community_links($user) {
-    global $g_logged_in_user;
-    if ($user->teamid && ($team = lookup_team($user->teamid))) {
-"Team"
+tra("Team")
-    } else {
-"Team", "None"
+tra("Team"), tra("None")
-    }
-    $tot = total_posts($user);
-    if ($tot) {
-"Message boards", "<a href=\"".URL_BASE."forum_user_posts.php?userid=$user->id\">$tot posts
+tra("Message boards"), "<a href=\"".URL_BASE."forum_user_posts.php?userid=$user->id\">".tra("%1 posts", $tot)."
-    }
-    if ($g_logged_in_user && $g_logged_in_user->id != $user->id) {
-"Contact", "<a href=\"pm.php?action=new&userid=".$user->id."\">Send private message
+tra("Contact"), "<a href=\"pm.php?action=new&userid=".$user->id."\">".tra("Send private message")."
-        $friend = BoincFriend::lookup($g_logged_in_user->id, $user->id);
-        if ($friend && $friend->reciprocated) {
-"This person is a friend"
-friend.php?action=cancel_confirm&userid=$user->id>Cancel friendship
+tra("This person is a friend")
+\"friend.php?action=cancel_confirm&userid=$user->id\">".tra("Cancel friendship")."
-            );
-        } else if ($friend) {
-"Friends", "<a href=friend.php?action=add&userid=$user->id>Request pending
+tra("Friends"),  "<a href=\"friend.php?action=add&userid=$user->id\">".tra("Request pending")."
-        } else {
-"Friends", "<a href=friend.php?action=add&userid=$user->id>Add as friend
+tra("Friends"),  "<a href=\"friend.php?action=add&userid=$user->id\">".tra("Add as friend")."
-        }
-    }
-    $friends = BoincFriend::enum("user_src=$user->id and reciprocated=1");
@@ -336 +333 @@
-            $fuser = BoincUser::lookup_id($friend->user_dest);
-            $x .= friend_links($fuser);
-        }
-"Friends 
+tra("Friends"), "
-    }
-
-}
-
-function show_profile_link($user) {
-    if ($user->has_profile) {
-"Profile", "<a href=\"view_profile.php?userid=$user->id\">View
+tra("Profile"), "<a href=\"view_profile.php?userid=$user->id\">".tra("View")."
-    }
-}
-