Changeset 4933

Timestamp:

05/20/2013 08:21:30 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Move user base setting into new Users section. Tweak some verbiage to be more succinct. See #1500.

File:

• trunk/includes/admin/settings.php (modified) (14 diffs)

trunk/includes/admin/settings.php

@@ -234 +234 @@
             // Root slug setting
             '_bbp_root_slug' => array(
-                'title'             => __( 'Forums base', 'bbpress' ),
+                'title'             => __( 'Forum Root', 'bbpress' ),
                 'callback'          => 'bbp_admin_setting_callback_root_slug',
                 'sanitize_callback' => 'esc_sql',
@@ -263 +263 @@
             // Forum slug setting
             '_bbp_forum_slug' => array(
-                'title'             => __( 'Forum slug', 'bbpress' ),
+                'title'             => __( 'Forum', 'bbpress' ),
                 'callback'          => 'bbp_admin_setting_callback_forum_slug',
                 'sanitize_callback' => 'sanitize_title',
@@ -271 +271 @@
             // Topic slug setting
             '_bbp_topic_slug' => array(
-                'title'             => __( 'Topic slug', 'bbpress' ),
+                'title'             => __( 'Topic', 'bbpress' ),
                 'callback'          => 'bbp_admin_setting_callback_topic_slug',
                 'sanitize_callback' => 'sanitize_title',
@@ -279 +279 @@
             // Topic tag slug setting
             '_bbp_topic_tag_slug' => array(
-                'title'             => __( 'Topic tag slug', 'bbpress' ),
+                'title'             => __( 'Topic Tag', 'bbpress' ),
                 'callback'          => 'bbp_admin_setting_callback_topic_tag_slug',
                 'sanitize_callback' => 'sanitize_title',
@@ -285 +285 @@
             ),
 
+            // View slug setting
+            '_bbp_view_slug' => array(
+                'title'             => __( 'Topic View', 'bbpress' ),
+                'callback'          => 'bbp_admin_setting_callback_view_slug',
+                'sanitize_callback' => 'sanitize_title',
+                'args'              => array()
+            ),
+
             // Reply slug setting
             '_bbp_reply_slug' => array(
-                'title'             => __( 'Reply slug', 'bbpress' ),
+                'title'             => __( 'Reply', 'bbpress' ),
                 'callback'          => 'bbp_admin_setting_callback_reply_slug',
                 'sanitize_callback' => 'sanitize_title',
@@ -293 +301 @@
             ),
 
+            // Search slug setting
+            '_bbp_search_slug' => array(
+                'title'             => __( 'Search', 'bbpress' ),
+                'callback'          => 'bbp_admin_setting_callback_search_slug',
+                'sanitize_callback' => 'sanitize_title',
+                'args'              => array()
+            )
+        ),
+
+        /** User Slugs ********************************************************/
+
+        'bbp_settings_user_slugs' => array(
+
             // User slug setting
             '_bbp_user_slug' => array(
-                'title'             => __( 'User slug', 'bbpress' ),
+                'title'             => __( 'User Base', 'bbpress' ),
                 'callback'          => 'bbp_admin_setting_callback_user_slug',
                 'sanitize_callback' => 'sanitize_title',
@@ -301 +322 @@
             ),
 
-            // View slug setting
-            '_bbp_view_slug' => array(
-                'title'             => __( 'Topic view slug', 'bbpress' ),
-                'callback'          => 'bbp_admin_setting_callback_view_slug',
-                'sanitize_callback' => 'sanitize_title',
-                'args'              => array()
-            ),
-
-            // Search slug setting
-            '_bbp_search_slug' => array(
-                'title'             => __( 'Search slug', 'bbpress' ),
-                'callback'          => 'bbp_admin_setting_callback_search_slug',
-                'sanitize_callback' => 'sanitize_title',
-                'args'              => array()
-            )
-        ),
-
-        /** User Slugs ********************************************************/
-
-        'bbp_settings_user_slugs' => array(
-
             // Topics slug setting
             '_bbp_topic_archive_slug' => array(
-                'title'             => __( 'User Topics', 'bbpress' ),
+                'title'             => __( 'Topics Started', 'bbpress' ),
                 'callback'          => 'bbp_admin_setting_callback_topic_archive_slug',
                 'sanitize_callback' => 'esc_sql',
@@ -332 +332 @@
             // Replies slug setting
             '_bbp_reply_archive_slug' => array(
-                'title'             => __( 'User Replies', 'bbpress' ),
+                'title'             => __( 'Replies Created', 'bbpress' ),
                 'callback'          => 'bbp_admin_setting_callback_reply_archive_slug',
                 'sanitize_callback' => 'esc_sql',
@@ -340 +340 @@
             // Favorites slug setting
             '_bbp_user_favs_slug' => array(
-                'title'             => __( 'User Favorite Topics', 'bbpress' ),
+                'title'             => __( 'Favorite Topics', 'bbpress' ),
                 'callback'          => 'bbp_admin_setting_callback_user_favs_slug',
                 'sanitize_callback' => 'esc_sql',
@@ -348 +348 @@
             // Subscriptions slug setting
             '_bbp_user_subs_slug' => array(
-                'title'             => __( 'User Subscribed Topics', 'bbpress' ),
+                'title'             => __( 'Topic Subscriptions', 'bbpress' ),
                 'callback'          => 'bbp_admin_setting_callback_user_subs_slug',
                 'sanitize_callback' => 'esc_sql',
@@ -761 +761 @@
         flush_rewrite_rules(); ?>
 
-    <p><?php _e( 'Custom root slug to prefix your forums section with. This can be partnered with a WordPress page and Shortcode to allow more flexibility.', 'bbpress' ); ?></p>
+    <p><?php _e( 'Customize your Forums root. Partner with a WordPress Page and use Shortcodes for more flexibility.', 'bbpress' ); ?></p>
 
 <?php
@@ -844 +844 @@
 ?>
 
-    <p><?php _e( 'Custom slugs to customize your forums user profiles.', 'bbpress' ); ?></p>
-
-<?php
+    <p><?php _e( 'Customize your user profile slugs.', 'bbpress' ); ?></p>
+
+<?php
+}
+
+/**
+ * User slug setting field
+ *
+ * @since bbPress (r2786)
+ *
+ * @uses bbp_form_option() To output the option value
+ */
+function bbp_admin_setting_callback_user_slug() {
+?>
+
+    <input name="_bbp_user_slug" type="text" id="_bbp_user_slug" class="regular-text code" value="<?php bbp_form_option( '_bbp_user_slug', 'users', true ); ?>"<?php bbp_maybe_admin_setting_disabled( '_bbp_user_slug' ); ?> />
+
+<?php
+    // Slug Check
+    bbp_form_slug_conflict_check( '_bbp_user_slug', 'users' );
 }
 
@@ -927 +944 @@
 ?>
 
-    <p><?php printf( __( 'Custom slugs for single forums, topics, replies, tags, users, and views here. If you change these, existing permalinks will also change.', 'bbpress' ), get_admin_url( null, 'options-permalink.php' ) ); ?></p>
+    <p><?php printf( __( 'Custom slugs for single forums, topics, replies, tags, views, and search.', 'bbpress' ), get_admin_url( null, 'options-permalink.php' ) ); ?></p>
 
 <?php
@@ -999 +1016 @@
     // Slug Check
     bbp_form_slug_conflict_check( '_bbp_topic_tag_slug', 'topic-tag' );
-}
-
-/** Other Slugs ***************************************************************/
-
-/**
- * User slug setting field
- *
- * @since bbPress (r2786)
- *
- * @uses bbp_form_option() To output the option value
- */
-function bbp_admin_setting_callback_user_slug() {
-?>
-
-    <input name="_bbp_user_slug" type="text" id="_bbp_user_slug" class="regular-text code" value="<?php bbp_form_option( '_bbp_user_slug', 'users', true ); ?>"<?php bbp_maybe_admin_setting_disabled( '_bbp_user_slug' ); ?> />
-
-<?php
-    // Slug Check
-    bbp_form_slug_conflict_check( '_bbp_user_slug', 'users' );
 }