Changeset 2531

Timestamp:

08/26/2010 05:22:51 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Add contexts to localized strings, fix verbiage, and fix missing fieldset close tag. Fixes #1324.

Location:

trunk

Files:

• bb-admin/includes/functions.bb-admin.php (modified) (2 diffs)
• bb-includes/class.bb-query.php (modified) (2 diffs)
• bb-post.php (modified) (1 diff)

trunk/bb-admin/includes/functions.bb-admin.php

@@ -604 +604 @@
             $r .= "\t\t<label for='userrole'>" . __('Role') . "</label>";
             $r .= "\t\t<div><select name='userrole[]' id='userrole'>\n";
-            $r .= "\t\t\t<option value=''>All</option>\n";
+            $r .= "\t\t\t<option value=''>" . _x( 'All', 'user roles' ) . "</option>\n";
             
             foreach ( $roles as $role => $display ) {
@@ -980 +980 @@
 }
 ?>
-    <fieldset class="submit">
+        <fieldset class="submit">
 <?php if ( $forum_id ) : ?>
-        <input type="hidden" name="forum_id" value="<?php echo $forum_id; ?>" />
+            <input type="hidden" name="forum_id" value="<?php echo $forum_id; ?>" />
 <?php endif; ?>
-        <?php bb_nonce_field( 'order-forums', 'order-nonce' ); ?>
-        <?php bb_nonce_field( $action . '-forum' ); ?>
-        <input type="hidden" name="action" value="<?php echo $action; ?>" />
-        <input class="submit" type="submit" name="submit" value="<?php echo $submit; ?>" />
+            <?php bb_nonce_field( 'order-forums', 'order-nonce' ); ?>
+            <?php bb_nonce_field( $action . '-forum' ); ?>
+            <input type="hidden" name="action" value="<?php echo $action; ?>" />
+            <input class="submit" type="submit" name="submit" value="<?php echo $submit; ?>" />
+        </fieldset>
     </fieldset>
 </form>

trunk/bb-includes/class.bb-query.php

@@ -958 +958 @@
         }
 
-        $stati = apply_filters( 'bb_query_form_post_status', array( 'all' => __('All'), '0' => __('Normal'), '1' => __('Deleted') ), $this->type );
+        $stati = apply_filters( 'bb_query_form_post_status', array( 'all' => _x( 'All', 'post status' ), '0' => __('Normal'), '1' => __('Deleted') ), $this->type );
 
         if ( $topic_status ) {
@@ -991 +991 @@
             $r .= "\t<div><label for=\"topic-open\">" . __('Open?') . "</label>\n";
             $r .= "\t\t<div><select name='open' id='topic-open'>\n";
-            foreach ( array( 'all' => __('All'), '1' => _x( 'Open', 'posting status' ), '0' => __('Closed') ) as $status => $label ) {
+            foreach ( array( 'all' => _x( 'All', 'posting status' ), '1' => _x( 'Open', 'posting status' ), '0' => __('Closed') ) as $status => $label ) {
                 $label = esc_html( $label );
                 $selected = (string) $status == (string) $q_open ? " selected='selected'" : '';

trunk/bb-post.php

@@ -19 +19 @@
             bb_die( __( 'You need to submit your name!' ) );
         elseif ( !$post_email = sanitize_email( trim( $_POST['email'] ) ) )
-            bb_die( __( 'You need to submit a valid email id!' ) );
+            bb_die( __( 'You need to submit a valid email address!' ) );
 
         if ( !empty( $_POST['url'] ) )