kareila: (Default)
kareila ([personal profile] kareila) wrote in [site community profile] changelog2010-07-25 10:08 am

[dw-free] Retitle "Reading" link for communities

[commit: http://hg.dwscoalition.org/dw-free/rev/4b455e1f6389]

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

Change name of navigation link on community journals from "Reading" to
"Member Posts" and remove redundant line of code for network view.

Patch by [personal profile] ninetydegrees.

Files modified:
  • bin/upgrading/s2layers/core2.s2
--------------------------------------------------------------------------------
diff -r de336091a661 -r 4b455e1f6389 bin/upgrading/s2layers/core2.s2
--- a/bin/upgrading/s2layers/core2.s2	Sun Jul 25 04:44:28 2010 -0500
+++ b/bin/upgrading/s2layers/core2.s2	Sun Jul 25 05:08:14 2010 -0500
@@ -2018,7 +2018,7 @@ set text_view_recent = "Recent Entries";
 set text_view_recent = "Recent Entries";
 set text_view_recent_tagged = "Entries tagged with ";
 set text_view_friends = "Reading";
-set text_view_friends_comm = "Reading";
+set text_view_friends_comm = "Member Posts";
 set text_view_friends_filter = "Reading (Custom filter)";
 set text_view_network = "Network";
 set text_view_network_filter = "Network (Custom filter)";
@@ -2923,9 +2923,16 @@ function lang_viewname(string viewid) [n
 function lang_viewname(string viewid) [notags] : string
 "Overriding this function is NOT RECOMMENDED. Overriding this function could prevent sitewide improvements to styles, accessibility, or other functionality from operating in your layout. Sets strings according to layer or wizard supplied string properties."
 {
+    var Page p = get_page();
     if ($viewid == "recent") { return $*text_view_recent; }
     if ($viewid == "archive") { return $*text_view_archive; }
-    if ($viewid == "read") { return $*text_view_friends; }
+    if ($viewid == "read") {
+        if ( $p.journal.journal_type == "C" ) {
+            return $*text_view_friends_comm;
+        } else {
+            return $*text_view_friends;
+        }
+    }
     if ($viewid == "network") { return $*text_view_network; }
     if ($viewid == "day") { return "Day"; }
     if ($viewid == "month") { return "Month"; }
@@ -2934,7 +2941,6 @@ function lang_viewname(string viewid) [n
     if ($viewid == "reply") { return "Post Comment"; }
     if ($viewid == "tags") { return "$*text_view_tags"; }
     if ($viewid == "memories") { return $*text_view_memories; }
-    if ($viewid == "network") { return $*text_view_network; }
     return "Unknown View";
 }
 
--------------------------------------------------------------------------------
azurelunatic: Picture of a dude point to the horse is is upon. Text: GET ON MY HORSE  (Get On My Horse)

[personal profile] azurelunatic 2010-07-25 10:10 am (UTC)(link)
I SEE THAT IT IS SUNDAY NOW.

:D
:D
:D