Handle parentheses correctly for the inbox count in the Read menu.
Patch by afuna.
diffs (43 lines):
diff -r 946bc750542f -r 5f9962fc1e20 bin/upgrading/en.dat
--- a/bin/upgrading/en.dat Sun Dec 13 17:48:17 2009 +0000
+++ b/bin/upgrading/en.dat Mon Dec 14 16:39:17 2009 +0000
@@ -2120,7 +2120,7 @@ menunav.read=Read
menunav.read.inbox.nounread=Inbox
-menunav.read.inbox.unread=Inbox ([[num]])
+menunav.read.inbox.unread2=Inbox [[num]]
menunav.read.network=Network Page
diff -r 946bc750542f -r 5f9962fc1e20 cgi-bin/DW/Logic/MenuNav.pm
--- a/cgi-bin/DW/Logic/MenuNav.pm Sun Dec 13 17:48:17 2009 +0000
+++ b/cgi-bin/DW/Logic/MenuNav.pm Mon Dec 14 16:39:17 2009 +0000
@@ -181,8 +181,8 @@ sub get_menu_navigation {
},
{
url => "$LJ::SITEROOT/inbox/",
- text => $inbox_count ? "menunav.read.inbox.unread" :
"menunav.read.inbox.nounread",
- text_opts => { num => "<span
id='Inbox_Unread_Count_Menu'>$inbox_count</span>" },
+ text => $inbox_count ? "menunav.read.inbox.unread2" :
"menunav.read.inbox.nounread",
+ text_opts => { num => "<span id='Inbox_Unread_Count_Menu'>
($inbox_count)</span>" },
display => $loggedin,
},
],
diff -r 946bc750542f -r 5f9962fc1e20 htdocs/js/livejournal.js
--- a/htdocs/js/livejournal.js Sun Dec 13 17:48:17 2009 +0000
+++ b/htdocs/js/livejournal.js Mon Dec 14 16:39:17 2009 +0000
@@ -101,10 +101,11 @@ LiveJournal.gotInboxUpdate = function (r
var unread_menu = $("Inbox_Unread_Count_Menu");
if (! unread && ! unread_menu) return;
+ var unread_count = resp.unread_count? " (" + resp.unread_count + ")" : "";
if ( unread )
- unread.innerHTML = resp.unread_count ? " (" + resp.unread_count + ")"
: "";
+ unread.innerHTML = unread_count;
if ( unread_menu )
- unread_menu.innerHTML = resp.unread_count ? resp.unread_count : "";
+ unread_menu.innerHTML = unread_count;
};
// Search for placeholders and initialize them
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog
