<!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][12776] trunk/src: Group/Member Types: More string changes.</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 { white-space: pre-line; 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/12776">12776</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12776","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnjamesjacoby</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-11-09 02:47:32 +0000 (Mon, 09 Nov 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Group/Member Types: More string changes.
This commit includes the following code changes:
* Change case of strings to match how WordPress core labels are cased
* Reorder schema so singular is before plural (see: order of adjectives)
* Adds missing taxonomy labels for core functionalities that could be activated or used later (hierarchy, popularity, etc...)
* Simplifies all verbiage, to be more concise without sacrificing accuracy or descriptiveness (removes example URLs, encoded quotes, etc...)
* Remove "member" references from default strings, and re-add them back in using member-specific variants to match how groups works
* Related inline documentation
Together, these changes bring both Group and Member types closer in readability and usability to other taxonomies, making them feel a little bit more familiar, while also keeping strings within 2 lines tall on most viewport sizes, and hopefully making them easier to understand for users who are new to these features.
See <a href="http://buddypress.trac.wordpress.org/ticket/7179">#7179</a>, <a href="http://buddypress.trac.wordpress.org/ticket/7181">#7181</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcorefunctionsphp">trunk/src/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupsfunctionsphp">trunk/src/bp-groups/bp-groups-functions.php</a></li>
<li><a href="#trunksrcbpmembersbpmembersfunctionsphp">trunk/src/bp-members/bp-members-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-functions.php 2020-11-08 19:07:25 UTC (rev 12775)
+++ trunk/src/bp-core/bp-core-functions.php 2020-11-09 02:47:32 UTC (rev 12776)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2977,9 +2977,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_get_taxonomy_common_labels() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'bp_type_name' => _x( 'Name', 'BP Type name label', 'buddypress' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'bp_type_name' => _x( 'Plural Name', 'BP Type name label', 'buddypress' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'bp_type_singular_name' => _x( 'Singular name', 'BP Type singular name label', 'buddypress' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'bp_type_has_directory' => _x( 'Add Type-Filtered Directory View', 'BP Type has directory checkbox label', 'buddypress' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'bp_type_has_directory' => _x( 'Has Directory View', 'BP Type has directory checkbox label', 'buddypress' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'bp_type_directory_slug' => _x( 'Custom type directory slug', 'BP Type slug label', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3086,27 +3086,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_get_type_metadata_schema( $suppress_filters = false, $type_taxonomy = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $schema = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'bp_type_name' => array(
- 'description' => __( 'The name of your type, at the plural form.', 'buddypress' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'bp_type_singular_name' => array(
+ 'description' => __( 'The name of this type in singular form. ', 'buddypress' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="cx" style="display: block; padding: 0 10px"> 'single' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => 'sanitize_text_field',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'bp_type_singular_name' => array(
- 'description' => __( 'The name of your type, at the singular form.', 'buddypress' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'bp_type_name' => array(
+ 'description' => __( 'The name of this type in plural form.', 'buddypress' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="cx" style="display: block; padding: 0 10px"> 'single' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => 'sanitize_text_field',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'bp_type_has_directory' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Add a list of members matching the member type available on the Members Directory page (e.g. site.url/members/type/teacher/).', 'buddypress' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Make a list matching this type available on the directory.', 'buddypress' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'boolean',
</span><span class="cx" style="display: block; padding: 0 10px"> 'single' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => 'absint',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'bp_type_directory_slug' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __( 'Custom type directory slug', 'buddypress' ),
- 'description' => __( 'If you want to use a slug that is different from the Member Type ID above, enter it here.', 'buddypress' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Type slug', 'buddypress' ),
+ 'description' => __( 'Enter if you want the type slug to be different from its ID.', 'buddypress' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="cx" style="display: block; padding: 0 10px"> 'single' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => 'sanitize_title',
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-functions.php 2020-11-08 19:07:25 UTC (rev 12775)
+++ trunk/src/bp-groups/bp-groups-functions.php 2020-11-09 02:47:32 UTC (rev 12776)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2509,29 +2509,37 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters(
</span><span class="cx" style="display: block; padding: 0 10px"> 'bp_get_group_type_tax_labels',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => _x( 'Group types', 'Group type taxonomy name', 'buddypress' ),
- 'singular_name' => _x( 'Group type', 'Group type taxonomy singular name', 'buddypress' ),
- 'search_items' => _x( 'Search Group types', 'Group type taxonomy search items label', 'buddypress' ),
- 'popular_items' => _x( 'Most used Group types', 'Group type taxonomy popular items label', 'buddypress' ),
- 'all_items' => _x( 'All Group types', 'Group type taxonomy all items label', 'buddypress' ),
- 'edit_item' => _x( 'Edit Group type', 'Group type taxonomy edit item label', 'buddypress' ),
- 'view_item' => _x( 'View Group type', 'Group type taxonomy view item label', 'buddypress' ),
- 'update_item' => _x( 'Update Group type', 'Group type taxonomy update item label', 'buddypress' ),
- 'add_new_item' => _x( 'Add new Group type', 'Group type taxonomy add new item label', 'buddypress' ),
- 'new_item_name' => _x( 'New Group type name', 'Group type taxonomy new item name label', 'buddypress' ),
- 'separate_items_with_commas' => _x( 'Separate Group types with commas', 'Group type taxonomy separate items with commas label', 'buddypress' ),
- 'add_or_remove_items' => _x( 'Add or remove Group types', 'Group type taxonomy add or remove items label', 'buddypress' ),
- 'choose_from_most_used' => _x( 'Choose from the most used Group types', 'Group type taxonomy choose from most used label', 'buddypress' ),
- 'not_found' => _x( 'No Group types found', 'Group type taxonomy not found label', 'buddypress' ),
- 'no_terms' => _x( 'No Group types', 'Group type taxonomy no terms label', 'buddypress' ),
- 'items_list_navigation' => _x( 'Group types list navigation', 'Group type taxonomy items list navigation label', 'buddypress' ),
- 'items_list' => _x( 'Group types list', 'Group type taxonomy items list label', 'buddypress' ),
- 'back_to_items' => _x( 'Back to all Group types', 'Group type taxonomy back to items label', 'buddypress' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // General labels
+ 'name' => _x( 'Group Types', 'Group type taxonomy name', 'buddypress' ),
+ 'singular_name' => _x( 'Group Type', 'Group type taxonomy singular name', 'buddypress' ),
+ 'search_items' => _x( 'Search Group Types', 'Group type taxonomy search items label', 'buddypress' ),
+ 'popular_items' => _x( 'Popular Group Types', 'Group type taxonomy popular items label', 'buddypress' ),
+ 'all_items' => _x( 'All Group Types', 'Group type taxonomy all items label', 'buddypress' ),
+ 'parent_item' => _x( 'Parent Group Type', 'Group type taxonomy parent item label', 'buddypress' ),
+ 'parent_item_colon' => _x( 'Parent Group Type:', 'Group type taxonomy parent item label', 'buddypress' ),
+ 'edit_item' => _x( 'Edit Group Type', 'Group type taxonomy edit item label', 'buddypress' ),
+ 'view_item' => _x( 'View Group Type', 'Group type taxonomy view item label', 'buddypress' ),
+ 'update_item' => _x( 'Update Group Type', 'Group type taxonomy update item label', 'buddypress' ),
+ 'add_new_item' => _x( 'Add New Group Type', 'Group type taxonomy add new item label', 'buddypress' ),
+ 'new_item_name' => _x( 'New Group Type Name', 'Group type taxonomy new item name label', 'buddypress' ),
+ 'separate_items_with_commas' => _x( 'Separate group types with commas', 'Group type taxonomy separate items with commas label', 'buddypress' ),
+ 'add_or_remove_items' => _x( 'Add or remove group types', 'Group type taxonomy add or remove items label', 'buddypress' ),
+ 'choose_from_most_used' => _x( 'Choose from the most used group types', 'Group type taxonomy choose from most used label', 'buddypress' ),
+ 'not_found' => _x( 'No group types found.', 'Group type taxonomy not found label', 'buddypress' ),
+ 'no_terms' => _x( 'No group types', 'Group type taxonomy no terms label', 'buddypress' ),
+ 'items_list_navigation' => _x( 'Group Types list navigation', 'Group type taxonomy items list navigation label', 'buddypress' ),
+ 'items_list' => _x( 'Group Types list', 'Group type taxonomy items list label', 'buddypress' ),
+
+ /* translators: Tab heading when selecting from the most used terms. */
+ 'most_used' => _x( 'Most Used', 'Group type taxonomy most used items label', 'buddypress' ),
+ 'back_to_items' => _x( '← Back to Group Types', 'Group type taxonomy back to items label', 'buddypress' ),
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Specific to BuddyPress.
</span><span class="cx" style="display: block; padding: 0 10px"> 'bp_type_id_label' => _x( 'Group Type ID', 'BP Member type ID label', 'buddypress' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'bp_type_id_description' => _x( 'Enter a lower-case string without spaces or special characters (used internally to identify the group type).', 'BP Group type ID description', 'buddypress' ),
- 'bp_type_show_in_create_screen' => _x( 'Add to Available Types on Create Screen', 'BP Group type show in create screen', 'buddypress' ),
- 'bp_type_show_in_list' => _x( 'Include when Group Types are Listed for a Group', 'BP Group type show in list', 'buddypress' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'bp_type_id_description' => _x( 'Lower-case string, no spaces or special characters. Used to identify the group type.', 'BP Group type ID description', 'buddypress' ),
+ 'bp_type_show_in_create_screen' => _x( 'Show on Group Creation', 'BP Group type show in create screen', 'buddypress' ),
+ 'bp_type_show_in_list' => _x( 'Show on Group', 'BP Group type show in list', 'buddypress' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2556,7 +2564,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'bp_get_group_type_tax_args',
</span><span class="cx" style="display: block; padding: 0 10px"> array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => _x( 'BuddyPress Group types', 'Group type taxonomy description', 'buddypress' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => _x( 'BuddyPress Group Types', 'Group type taxonomy description', 'buddypress' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'labels' => array_merge( bp_get_group_type_tax_labels(), bp_get_taxonomy_common_labels() ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> bp_get_taxonomy_common_args()
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2613,31 +2621,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_get_group_type_metadata_schema( $schema = array(), $taxonomy = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( bp_get_group_type_tax_name() === $taxonomy ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Directory
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $schema['bp_type_has_directory']['description'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $schema['bp_type_has_directory']['description'] = __( 'Add a list of groups matching the group type available on the Groups Directory page (e.g. site.url/groups/type/ninja/).', 'buddypress' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $schema['bp_type_has_directory']['description'] = __( 'Make a list of groups matching this type available on the groups directory.', 'buddypress' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Slug
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $schema['bp_type_directory_slug']['description'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $schema['bp_type_directory_slug']['description'] = __( 'If you want to use a slug that is different from the Group Type ID above, enter it here.', 'buddypress' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $schema['bp_type_directory_slug']['description'] = __( 'Enter if you want the type slug to be different from its ID.', 'buddypress' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $schema = array_merge(
- $schema,
- array(
- 'bp_type_show_in_create_screen' => array(
- 'description' => __( 'Include this group type during group creation and when a group administrator is on the group’s “Manage > Settings” page.', 'buddypress' ),
- 'type' => 'boolean',
- 'single' => true,
- 'sanitize_callback' => 'absint',
- ),
- 'bp_type_show_in_list' => array(
- 'description' => __( 'Include this group type when group types are listed, like in the group header.', 'buddypress' ),
- 'type' => 'boolean',
- 'single' => true,
- 'sanitize_callback' => 'absint',
- ),
- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Create
+ $schema['bp_type_show_in_create_screen'] = array(
+ 'description' => __( 'Show during group creation, and when a group admin is on the group’s settings page.', 'buddypress' ),
+ 'type' => 'boolean',
+ 'single' => true,
+ 'sanitize_callback' => 'absint',
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // List
+ $schema['bp_type_show_in_list'] = array(
+ 'description' => __( 'Show where group types may be listed, like in the group header.', 'buddypress' ),
+ 'type' => 'boolean',
+ 'single' => true,
+ 'sanitize_callback' => 'absint',
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $schema;
</span></span></pre></div>
<a id="trunksrcbpmembersbpmembersfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/bp-members-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/bp-members-functions.php 2020-11-08 19:07:25 UTC (rev 12775)
+++ trunk/src/bp-members/bp-members-functions.php 2020-11-09 02:47:32 UTC (rev 12776)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2689,24 +2689,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters(
</span><span class="cx" style="display: block; padding: 0 10px"> 'bp_get_member_type_tax_labels',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => _x( 'Member types', 'Member type taxonomy name', 'buddypress' ),
- 'singular_name' => _x( 'Member type', 'Member type taxonomy singular name', 'buddypress' ),
- 'search_items' => _x( 'Search Member types', 'Member type taxonomy search items label', 'buddypress' ),
- 'popular_items' => _x( 'Most used Member types', 'Member type taxonomy popular items label', 'buddypress' ),
- 'all_items' => _x( 'All Member types', 'Member type taxonomy all items label', 'buddypress' ),
- 'edit_item' => _x( 'Edit Member type', 'Member type taxonomy edit item label', 'buddypress' ),
- 'view_item' => _x( 'View Member type', 'Member type taxonomy view item label', 'buddypress' ),
- 'update_item' => _x( 'Update Member type', 'Member type taxonomy update item label', 'buddypress' ),
- 'add_new_item' => _x( 'Add new Member type', 'Member type taxonomy add new item label', 'buddypress' ),
- 'new_item_name' => _x( 'New Member type name', 'Member type taxonomy new item name label', 'buddypress' ),
- 'separate_items_with_commas' => _x( 'Separate Member types with commas', 'Member type taxonomy separate items with commas label', 'buddypress' ),
- 'add_or_remove_items' => _x( 'Add or remove Member types', 'Member type taxonomy add or remove items label', 'buddypress' ),
- 'choose_from_most_used' => _x( 'Choose from the most used Member types', 'Member type taxonomy choose from most used label', 'buddypress' ),
- 'not_found' => _x( 'No Member types found', 'Member type taxonomy not found label', 'buddypress' ),
- 'no_terms' => _x( 'No Member types', 'Member type taxonomy no terms label', 'buddypress' ),
- 'items_list_navigation' => _x( 'Member types list navigation', 'Member type taxonomy items list navigation label', 'buddypress' ),
- 'items_list' => _x( 'Member types list', 'Member type taxonomy items list label', 'buddypress' ),
- 'back_to_items' => _x( 'Back to all Member types', 'Member type taxonomy back to items label', 'buddypress' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // General labels
+ 'name' => _x( 'Member Types', 'Member type taxonomy name', 'buddypress' ),
+ 'singular_name' => _x( 'Member Type', 'Member type taxonomy singular name', 'buddypress' ),
+ 'search_items' => _x( 'Search Member Types', 'Member type taxonomy search items label', 'buddypress' ),
+ 'popular_items' => _x( 'Popular Member Types', 'Member type taxonomy popular items label', 'buddypress' ),
+ 'all_items' => _x( 'All Member Types', 'Member type taxonomy all items label', 'buddypress' ),
+ 'parent_item' => _x( 'Parent Member Type', 'Member type taxonomy parent item label', 'buddypress' ),
+ 'parent_item_colon' => _x( 'Parent Member Type:', 'Member type taxonomy parent item label', 'buddypress' ),
+ 'edit_item' => _x( 'Edit Member Type', 'Member type taxonomy edit item label', 'buddypress' ),
+ 'view_item' => _x( 'View Member Type', 'Member type taxonomy view item label', 'buddypress' ),
+ 'update_item' => _x( 'Update Member Type', 'Member type taxonomy update item label', 'buddypress' ),
+ 'add_new_item' => _x( 'Add New Member Type', 'Member type taxonomy add new item label', 'buddypress' ),
+ 'new_item_name' => _x( 'New Member Type Name', 'Member type taxonomy new item name label', 'buddypress' ),
+ 'separate_items_with_commas' => _x( 'Separate member types with commas', 'Member type taxonomy separate items with commas label', 'buddypress' ),
+ 'add_or_remove_items' => _x( 'Add or remove member types', 'Member type taxonomy add or remove items label', 'buddypress' ),
+ 'choose_from_most_used' => _x( 'Choose from the most used meber types', 'Member type taxonomy choose from most used label', 'buddypress' ),
+ 'not_found' => _x( 'No member types found.', 'Member type taxonomy not found label', 'buddypress' ),
+ 'no_terms' => _x( 'No member types', 'Member type taxonomy no terms label', 'buddypress' ),
+ 'items_list_navigation' => _x( 'Member Types list navigation', 'Member type taxonomy items list navigation label', 'buddypress' ),
+ 'items_list' => _x( 'Member Types list', 'Member type taxonomy items list label', 'buddypress' ),
+
+ /* translators: Tab heading when selecting from the most used terms. */
+ 'most_used' => _x( 'Most Used', 'Member type taxonomy most used items label', 'buddypress' ),
+ 'back_to_items' => _x( '← Back to Member Types', 'Member type taxonomy back to items label', 'buddypress' ),
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Specific to BuddyPress.
</span><span class="cx" style="display: block; padding: 0 10px"> 'bp_type_id_label' => _x( 'Member Type ID', 'BP Member type ID label', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'bp_type_id_description' => _x( 'Enter a lower-case string without spaces or special characters (used internally to identify the member type).', 'BP Member type ID description', 'buddypress' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2734,7 +2742,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'bp_get_member_type_tax_args',
</span><span class="cx" style="display: block; padding: 0 10px"> array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => _x( 'BuddyPress Member types', 'Member type taxonomy description', 'buddypress' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => _x( 'BuddyPress Member Types', 'Member type taxonomy description', 'buddypress' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'labels' => array_merge( bp_get_member_type_tax_labels(), bp_get_taxonomy_common_labels() ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> bp_get_taxonomy_common_args()
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2743,6 +2751,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Extend generic Type metadata schema to match Member Type needs.
+ *
+ * @since 7.0.0
+ *
+ * @param array $schema The generic Type metadata schema.
+ * @param string $taxonomy The taxonomy name the schema applies to.
+ * @return array The Member Type metadata schema.
+ */
+function bp_get_member_type_metadata_schema( $schema = array(), $taxonomy = '' ) {
+ if ( bp_get_member_type_tax_name() === $taxonomy ) {
+
+ // Directory
+ if ( isset( $schema['bp_type_has_directory']['description'] ) ) {
+ $schema['bp_type_has_directory']['description'] = __( 'Make a list of members matching this type available on the members directory.', 'buddypress' );
+ }
+
+ // Slug
+ if ( isset( $schema['bp_type_directory_slug']['description'] ) ) {
+ $schema['bp_type_directory_slug']['description'] = __( 'Enter if you want the type slug to be different from its ID.', 'buddypress' );
+ }
+ }
+
+ return $schema;
+}
+add_filter( 'bp_get_type_metadata_schema', 'bp_get_member_type_metadata_schema', 1, 2 );
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Registers the Member type metadata.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 7.0.0
</span></span></pre>
</div>
</div>
</body>
</html>