Changeset 3375
- Timestamp:
- 07/25/2011 06:18:18 AM (12 years ago)
- Location:
- branches/plugin
- Files:
-
- 8 edited
-
bbp-admin/bbp-admin.php (modified) (3 diffs)
-
bbp-admin/importers/bbpress.php (modified) (1 diff)
-
bbp-includes/bbp-core-widgets.php (modified) (2 diffs)
-
bbp-themes/bbp-twentyten/bbpress/form-anonymous.php (modified) (1 diff)
-
bbp-themes/bbp-twentyten/bbpress/form-topic.php (modified) (1 diff)
-
bbp-themes/bbp-twentyten/bbpress/form-user-edit.php (modified) (1 diff)
-
bbp-themes/bbp-twentyten/bbpress/form-user-login.php (modified) (2 diffs)
-
bbp-themes/bbp-twentyten/bbpress/form-user-register.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/plugin/bbp-admin/bbp-admin.php
r3367 r3375 215 215 216 216 // Add the per page section 217 add_settings_section( 'bbp_per_page', __( 'Per Page', 'bbpress' ),'bbp_admin_setting_callback_per_page_section', 'bbpress' );217 add_settings_section( 'bbp_per_page', __( 'Per Page', 'bbpress' ), 'bbp_admin_setting_callback_per_page_section', 'bbpress' ); 218 218 219 219 // Topics per page setting 220 add_settings_field( '_bbp_topics_per_page', __( 'Topics Per Page', 'bbpress' ),'bbp_admin_setting_callback_topics_per_page', 'bbpress', 'bbp_per_page' );220 add_settings_field( '_bbp_topics_per_page', __( 'Topics', 'bbpress' ), 'bbp_admin_setting_callback_topics_per_page', 'bbpress', 'bbp_per_page' ); 221 221 register_setting ( 'bbpress', '_bbp_topics_per_page', 'intval' ); 222 222 223 223 // Replies per page setting 224 add_settings_field( '_bbp_replies_per_page', __( 'Replies Per Page', 'bbpress' ),'bbp_admin_setting_callback_replies_per_page', 'bbpress', 'bbp_per_page' );224 add_settings_field( '_bbp_replies_per_page', __( 'Replies', 'bbpress' ), 'bbp_admin_setting_callback_replies_per_page', 'bbpress', 'bbp_per_page' ); 225 225 register_setting ( 'bbpress', '_bbp_replies_per_page', 'intval' ); 226 226 … … 228 228 229 229 // Add the per page section 230 add_settings_section( 'bbp_per_rss_page', __( 'Per RSS Page', 'bbpress' ),'bbp_admin_setting_callback_per_rss_page_section', 'bbpress' );230 add_settings_section( 'bbp_per_rss_page', __( 'Per RSS Page', 'bbpress' ), 'bbp_admin_setting_callback_per_rss_page_section', 'bbpress' ); 231 231 232 232 // Topics per page setting 233 add_settings_field( '_bbp_topics_per_page', __( 'Topics Per Page', 'bbpress' ),'bbp_admin_setting_callback_topics_per_rss_page', 'bbpress', 'bbp_per_rss_page' );233 add_settings_field( '_bbp_topics_per_page', __( 'Topics', 'bbpress' ), 'bbp_admin_setting_callback_topics_per_rss_page', 'bbpress', 'bbp_per_rss_page' ); 234 234 register_setting ( 'bbpress', '_bbp_topics_per_rss_page', 'intval' ); 235 235 236 236 // Replies per page setting 237 add_settings_field( '_bbp_replies_per_page', __( 'Replies Per Page', 'bbpress' ),'bbp_admin_setting_callback_replies_per_rss_page', 'bbpress', 'bbp_per_rss_page' );237 add_settings_field( '_bbp_replies_per_page', __( 'Replies', 'bbpress' ), 'bbp_admin_setting_callback_replies_per_rss_page', 'bbpress', 'bbp_per_rss_page' ); 238 238 register_setting ( 'bbpress', '_bbp_replies_per_rss_page', 'intval' ); 239 239 … … 244 244 245 245 // Root slug setting 246 add_settings_field ( '_bbp_root_slug', __( 'Forums Base', 'bbpress' ), 'bbp_admin_setting_callback_root_slug', 'bbpress', 'bbp_root_slug' );246 add_settings_field ( '_bbp_root_slug', __( 'Forums base', 'bbpress' ), 'bbp_admin_setting_callback_root_slug', 'bbpress', 'bbp_root_slug' ); 247 247 register_setting ( 'bbpress', '_bbp_root_slug', 'esc_sql' ); 248 248 249 249 // Topic archive setting 250 add_settings_field ( '_bbp_topic_archive_slug', __( 'Topics Base', 'bbpress' ), 'bbp_admin_setting_callback_topic_archive_slug', 'bbpress', 'bbp_root_slug' );250 add_settings_field ( '_bbp_topic_archive_slug', __( 'Topics base', 'bbpress' ), 'bbp_admin_setting_callback_topic_archive_slug', 'bbpress', 'bbp_root_slug' ); 251 251 register_setting ( 'bbpress', '_bbp_topic_archive_slug', 'esc_sql' ); 252 252 -
branches/plugin/bbp-admin/importers/bbpress.php
r3363 r3375 873 873 874 874 if ( !$forums = bb_get_forums() ) { 875 echo "<li><strong>" . __( 'No forums were found!', 'bbpress' ) . "</strong></li></ol>\n";875 echo "<li><strong>" . __( 'No forums found', 'bbpress' ) . "</strong></li></ol>\n"; 876 876 return; 877 877 } -
branches/plugin/bbp-includes/bbp-core-widgets.php
r3291 r3375 67 67 <form method="post" action="<?php bbp_wp_login_action( array( 'context' => 'login_post' ) ); ?>" class="bbp-login-form"> 68 68 <fieldset> 69 <legend><?php _e( 'Log in', 'bbpress' ); ?></legend>69 <legend><?php _e( 'Log In', 'bbpress' ); ?></legend> 70 70 71 71 <div class="bbp-username"> … … 375 375 376 376 <p> 377 <label for="<?php echo $this->get_field_id( 'parent_forum' ); ?>"><?php _e( 'Parent forum:', 'bbpress' ); ?>377 <label for="<?php echo $this->get_field_id( 'parent_forum' ); ?>"><?php _e( 'Parent Forum:', 'bbpress' ); ?> 378 378 <input class="widefat" id="<?php echo $this->get_field_id( 'parent_forum' ); ?>" name="<?php echo $this->get_field_name( 'parent_forum' ); ?>" type="text" value="<?php echo $parent_forum; ?>" /> 379 379 </label> -
branches/plugin/bbp-themes/bbp-twentyten/bbpress/form-anonymous.php
r3207 r3375 13 13 14 14 <fieldset class="bbp-form"> 15 <legend><?php ( bbp_is_topic_edit() || bbp_is_reply_edit() ) ? _e( 'Author information', 'bbpress' ) : _e( 'Your information:', 'bbpress' ); ?></legend>15 <legend><?php ( bbp_is_topic_edit() || bbp_is_reply_edit() ) ? _e( 'Author Information', 'bbpress' ) : _e( 'Your information:', 'bbpress' ); ?></legend> 16 16 <p> 17 17 <label for="bbp_anonymous_author"><?php _e( 'Name (required):', 'bbpress' ); ?></label><br /> -
branches/plugin/bbp-themes/bbp-twentyten/bbpress/form-topic.php
r3366 r3375 37 37 <?php 38 38 if ( bbp_is_topic_edit() ) 39 printf( __( ' Edit topic "%s"', 'bbpress' ), bbp_get_topic_title() );39 printf( __( 'Now Editing “%s”', 'bbpress' ), bbp_get_topic_title() ); 40 40 else 41 bbp_is_single_forum() ? printf( __( 'Create new topic in: “%s”', 'bbpress' ), bbp_get_forum_title() ) : _e( 'Create new topic', 'bbpress' );41 bbp_is_single_forum() ? printf( __( 'Create New Topic in “%s”', 'bbpress' ), bbp_get_forum_title() ) : _e( 'Create New Topic', 'bbpress' ); 42 42 ?> 43 43 -
branches/plugin/bbp-themes/bbp-twentyten/bbpress/form-user-edit.php
r3207 r3375 103 103 104 104 <div> 105 <label for="email"><?php _e( 'E -mail', 'bbpress' ); ?></label>105 <label for="email"><?php _e( 'Email', 'bbpress' ); ?></label> 106 106 107 107 <input type="text" name="email" id="email" value="<?php echo esc_attr( bbp_get_displayed_user_field( 'user_email' ) ); ?>" class="regular-text" /> -
branches/plugin/bbp-themes/bbp-twentyten/bbpress/form-user-login.php
r3302 r3375 12 12 <form method="post" action="<?php bbp_wp_login_action( array( 'context' => 'login_post' ) ); ?>" class="bbp-login-form"> 13 13 <fieldset class="bbp-form"> 14 <legend><?php _e( 'Log in', 'bbpress' ); ?></legend>14 <legend><?php _e( 'Log In', 'bbpress' ); ?></legend> 15 15 16 16 <div class="bbp-username"> … … 33 33 <?php do_action( 'login_form' ); ?> 34 34 35 <input type="submit" name="user-submit" value="<?php _e( 'Log in', 'bbpress' ); ?>" tabindex="<?php bbp_tab_index(); ?>" class="user-submit" />35 <input type="submit" name="user-submit" value="<?php _e( 'Log In', 'bbpress' ); ?>" tabindex="<?php bbp_tab_index(); ?>" class="user-submit" /> 36 36 37 37 <?php bbp_user_login_fields(); ?> -
branches/plugin/bbp-themes/bbp-twentyten/bbpress/form-user-register.php
r3207 r3375 26 26 27 27 <div class="bbp-email"> 28 <label for="user_email"><?php _e( 'Email Address', 'bbpress' ); ?>: </label>28 <label for="user_email"><?php _e( 'Email', 'bbpress' ); ?>: </label> 29 29 <input type="text" name="user_email" value="<?php bbp_sanitize_val( 'user_email' ); ?>" size="20" id="user_email" tabindex="<?php bbp_tab_index(); ?>" /> 30 30 </div>
Note: See TracChangeset
for help on using the changeset viewer.