diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-01-07 11:04:22 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-01-07 11:04:22 +0100 |
| commit | c7b3407eb2f9946a561eb0a4d4b0a20387bd6c33 (patch) | |
| tree | a550764be98f7b52645ea60bfccab1313c4d8bb2 | |
| parent | 1b4bad6583ffa8a7ba8a1e7f5f9c29c5654bba99 (diff) | |
| parent | 2119dee53d6409cbe77ec944fd322e3f8df0dcae (diff) | |
| download | forums-c7b3407eb2f9946a561eb0a4d4b0a20387bd6c33.tar forums-c7b3407eb2f9946a561eb0a4d4b0a20387bd6c33.tar.gz forums-c7b3407eb2f9946a561eb0a4d4b0a20387bd6c33.tar.bz2 forums-c7b3407eb2f9946a561eb0a4d4b0a20387bd6c33.tar.xz forums-c7b3407eb2f9946a561eb0a4d4b0a20387bd6c33.zip | |
Merge pull request #5068 from Derky/ticket/15489
[ticket/15489] Remove NO_FORUMS message for categories with subforums
| -rw-r--r-- | phpBB/language/en/viewforum.php | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/viewforum_body.html | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/language/en/viewforum.php b/phpBB/language/en/viewforum.php index cab205ddf9..e2a6e2a718 100644 --- a/phpBB/language/en/viewforum.php +++ b/phpBB/language/en/viewforum.php @@ -54,6 +54,7 @@ $lang = array_merge($lang, array( 'NO_NEW_POSTS_HOT' => 'No new posts [ Popular ]', // Not used anymore 'NO_NEW_POSTS_LOCKED' => 'No new posts [ Locked ]', // Not used anymore 'NO_READ_ACCESS' => 'You do not have the required permissions to view or read topics within this forum.', + 'NO_FORUMS_IN_CATEGORY' => 'This category has no forums.', 'NO_UNREAD_POSTS_HOT' => 'No unread posts [ Popular ]', 'NO_UNREAD_POSTS_LOCKED' => 'No unread posts [ Locked ]', diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index 994d75f244..b5e12cdde4 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -250,10 +250,10 @@ <strong>{L_NO_TOPICS}</strong> </div> </div> - <!-- ELSE IF not S_USER_CAN_POST --> + <!-- ELSE IF not S_HAS_SUBFORUM --> <div class="panel"> <div class="inner"> - <strong>{L_NO_FORUMS}</strong> + <strong>{L_NO_FORUMS_IN_CATEGORY}</strong> </div> </div> <!-- ENDIF --> |