<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][7565] trunk: Remove 'notifications' language in Settings component</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/7565">7565</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-11-13 01:42:14 +0000 (Wed, 13 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove 'notifications' language in Settings component
We previously used the word "notification" to refer to the email notices
sent when certain events happened on the site. This causes some confusion with
the new top-level Notifications item, so we change the wording a bit.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5240">#5240</a>
Props imath, r-a-y</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpsettingsbpsettingsloaderphp">trunk/bp-settings/bp-settings-loader.php</a></li>
<li><a href="#trunkbptemplatesbplegacybuddypressmemberssinglesettingsnotificationsphp">trunk/bp-templates/bp-legacy/buddypress/members/single/settings/notifications.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssinglesettingsnotificationsphp">trunk/bp-themes/bp-default/members/single/settings/notifications.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpsettingsbpsettingsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-settings/bp-settings-loader.php (7564 => 7565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-settings/bp-settings-loader.php 2013-11-12 16:10:24 UTC (rev 7564)
+++ trunk/bp-settings/bp-settings-loader.php 2013-11-13 01:42:14 UTC (rev 7565)
</span><span class="lines">@@ -100,9 +100,10 @@
</span><span class="cx"> 'user_has_access' => bp_core_can_edit_settings()
</span><span class="cx"> );
</span><span class="cx">
</span><del>- // Add Notifications nav item
</del><ins>+ // Add Email nav item. Formerly called 'Notifications', we
+ // retain the old slug and function names for backward compat
</ins><span class="cx"> $sub_nav[] = array(
</span><del>- 'name' => __( 'Notifications', 'buddypress' ),
</del><ins>+ 'name' => __( 'Email', 'buddypress' ),
</ins><span class="cx"> 'slug' => 'notifications',
</span><span class="cx"> 'parent_url' => $settings_link,
</span><span class="cx"> 'parent_slug' => $this->slug,
</span></span></pre></div>
<a id="trunkbptemplatesbplegacybuddypressmemberssinglesettingsnotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/buddypress/members/single/settings/notifications.php (7564 => 7565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/buddypress/members/single/settings/notifications.php 2013-11-12 16:10:24 UTC (rev 7564)
+++ trunk/bp-templates/bp-legacy/buddypress/members/single/settings/notifications.php 2013-11-13 01:42:14 UTC (rev 7565)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <?php do_action( 'bp_before_member_settings_template' ); ?>
</span><span class="cx">
</span><span class="cx"> <form action="<?php echo bp_displayed_user_domain() . bp_get_settings_slug() . '/notifications'; ?>" method="post" class="standard-form" id="settings-form">
</span><del>- <p><?php _e( 'Send a notification by email when:', 'buddypress' ); ?></p>
</del><ins>+ <p><?php _e( 'Send an email notice when:', 'buddypress' ); ?></p>
</ins><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_notification_settings' ); ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssinglesettingsnotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/settings/notifications.php (7564 => 7565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/settings/notifications.php 2013-11-12 16:10:24 UTC (rev 7564)
+++ trunk/bp-themes/bp-default/members/single/settings/notifications.php 2013-11-13 01:42:14 UTC (rev 7565)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> <?php do_action( 'bp_template_content' ); ?>
</span><span class="cx">
</span><span class="cx"> <form action="<?php echo bp_displayed_user_domain() . bp_get_settings_slug() . '/notifications'; ?>" method="post" class="standard-form" id="settings-form">
</span><del>- <p><?php _e( 'Send a notification by email when:', 'buddypress' ); ?></p>
</del><ins>+ <p><?php _e( 'Send an email notice when:', 'buddypress' ); ?></p>
</ins><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_notification_settings' ); ?>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>