Skip to:
Content

bbPress.org

Changeset 3855


Ignore:
Timestamp:
04/28/2012 10:25:50 PM (9 years ago)
Author:
johnjamesjacoby
Message:

Improve forum and topic description texts to include empty cases.

Location:
branches/plugin/bbp-includes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/plugin/bbp-includes/bbp-forum-template.php

    r3842 r3855  
    18291829        remove_filter( 'bbp_get_forum_permalink', 'bbp_add_view_all' );
    18301830
    1831         // Build the forum description
    1832         $topic_count = bbp_get_forum_topics_link   ( $forum_id );
    1833         $reply_count = bbp_get_forum_reply_count   ( $forum_id );
    1834         $time_since  = bbp_get_forum_freshness_link( $forum_id );
    1835 
    1836         // Singlular/Plural
    1837         $reply_count     = sprintf( _n( '%s reply', '%s replies', $reply_count, 'bbpress' ), $reply_count );
    1838 
    1839         // Forum has posts
    1840         $last_reply = bbp_get_forum_last_active_id( $forum_id );
    1841         if ( !empty( $last_reply ) ) {
    1842 
    1843             // Freshness author
    1844             $last_updated_by = bbp_get_author_link( array( 'post_id' => $last_reply, 'size' => $size ) );
    1845 
    1846             // Category
    1847             if ( bbp_is_forum_category( $forum_id ) ) {
    1848                 $retstr = sprintf( __( 'This category contains %1$s and %2$s, and was last updated by %3$s %4$s.', 'bbpress' ), $topic_count, $reply_count, $last_updated_by, $time_since );
    1849 
    1850             // Forum
    1851             } else {
    1852                 $retstr = sprintf( __( 'This forum contains %1$s and %2$s, and was last updated by %3$s %4$s.',    'bbpress' ), $topic_count, $reply_count, $last_updated_by, $time_since );
    1853             }
     1831        // Get some forum data
     1832        $topic_count = bbp_get_forum_topic_count( $forum_id );
     1833        $reply_count = bbp_get_forum_reply_count( $forum_id );
     1834        $last_active = bbp_get_forum_last_active_id( $forum_id );
     1835
     1836        // Has replies
     1837        if ( !empty( $reply_count ) ) {
     1838            $reply_text = sprintf( _n( '%s reply', '%s replies', $reply_count, 'bbpress' ), $reply_count );
     1839        }
     1840
     1841        // Forum has active data
     1842        if ( !empty( $last_active ) ) {
     1843            $topic_text      = bbp_get_forum_topics_link( $forum_id );
     1844            $time_since      = bbp_get_forum_freshness_link( $forum_id );
     1845            $last_updated_by = bbp_get_author_link( array( 'post_id' => $last_active, 'size' => $size ) );
    18541846
    18551847        // Forum has no last active data
    18561848        } else {
    1857 
    1858             // Category
    1859             if ( bbp_is_forum_category( $forum_id ) ) {
    1860                 $retstr = sprintf( __( 'This category contains %1$s and %2$s.', 'bbpress' ), $topic_count, $reply_count );
    1861 
    1862             // Forum
     1849            $topic_text      = sprintf( _n( '%s topic', '%s topics', $topic_count, 'bbpress' ), $topic_count );
     1850        }
     1851
     1852        // Forum has active data
     1853        if ( !empty( $last_active ) ) {
     1854
     1855            if ( !empty( $reply_count ) ) {
     1856
     1857                if ( bbp_is_forum_category( $forum_id ) ) {
     1858                    $retstr = sprintf( __( 'This category contains %1$s and %2$s, and was last updated by %3$s %4$s.', 'bbpress' ), $topic_text, $reply_text, $last_updated_by, $time_since );
     1859                } else {
     1860                    $retstr = sprintf( __( 'This forum contains %1$s and %2$s, and was last updated by %3$s %4$s.',    'bbpress' ), $topic_text, $reply_text, $last_updated_by, $time_since );
     1861                }
     1862
    18631863            } else {
    1864                 $retstr = sprintf( __( 'This forum contains %1$s and %2$s.',    'bbpress' ), $topic_count, $reply_count );
     1864
     1865                if ( bbp_is_forum_category( $forum_id ) ) {
     1866                    $retstr = sprintf( __( 'This category contains %1$s, and was last updated by %2$s %3$s.', 'bbpress' ), $topic_text, $last_updated_by, $time_since );
     1867                } else {
     1868                    $retstr = sprintf( __( 'This forum contains %1$s, and was last updated by %2$s %3$s.',    'bbpress' ), $topic_text, $last_updated_by, $time_since );
     1869                }
     1870            }
     1871
     1872        // Forum has no last active data
     1873        } else {
     1874
     1875            if ( !empty( $reply_count ) ) {
     1876
     1877                if ( bbp_is_forum_category( $forum_id ) ) {
     1878                    $retstr = sprintf( __( 'This category contains %1$s and %2$s.', 'bbpress' ), $topic_text, $reply_text );
     1879                } else {
     1880                    $retstr = sprintf( __( 'This forum contains %1$s and %2$s.',    'bbpress' ), $topic_text, $reply_text );
     1881                }
     1882
     1883            } else {
     1884
     1885                if ( !empty( $topic_count ) ) {
     1886
     1887                    if ( bbp_is_forum_category( $forum_id ) ) {
     1888                        $retstr = sprintf( __( 'This category contains %1$s.', 'bbpress' ), $topic_text );
     1889                    } else {
     1890                        $retstr = sprintf( __( 'This forum contains %1$s.',    'bbpress' ), $topic_text );
     1891                    }
     1892
     1893                } else {
     1894                    $retstr = __( 'This forum is empty.', 'bbpress' );
     1895                }
    18651896            }
    18661897        }
  • branches/plugin/bbp-includes/bbp-topic-template.php

    r3845 r3855  
    27772777
    27782778        // Topic has no replies
    2779         } else {
     2779        } elseif ( ! empty( $voice_count ) && ! empty( $reply_count ) ) {
    27802780            $retstr = sprintf( __( 'This topic contains %1$s and has %2$s.', 'bbpress' ), $voice_count, $reply_count );
     2781
     2782        // Topic has no replies and no voices
     2783        } elseif ( empty( $voice_count ) && empty( $reply_count ) ) {
     2784            $retstr = sprintf( __( 'This topic has no replies.', 'bbpress' ), $voice_count, $reply_count );
    27812785        }
    27822786
Note: See TracChangeset for help on using the changeset viewer.