diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-15 15:17:55 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-15 15:17:55 +0100 |
| commit | 2d987d36c15a4699d47b651aa3b1b12111f39911 (patch) | |
| tree | 8b369442c50440a78df42a9b8c5b3623c649a151 | |
| parent | eafba554fd3bf5c6898433d6cd53dc0a5c2e3637 (diff) | |
| parent | 23b7671617ef50d39253c3e73b14890fd34b3f75 (diff) | |
| download | forums-2d987d36c15a4699d47b651aa3b1b12111f39911.tar forums-2d987d36c15a4699d47b651aa3b1b12111f39911.tar.gz forums-2d987d36c15a4699d47b651aa3b1b12111f39911.tar.bz2 forums-2d987d36c15a4699d47b651aa3b1b12111f39911.tar.xz forums-2d987d36c15a4699d47b651aa3b1b12111f39911.zip | |
Merge remote-tracking branch 'maelsoucaze/develop' into develop
* maelsoucaze/develop:
[ticket/12272] Fix hardcoded colons in subforums.
[ticket/12272] Fix hardcoded colons in subforums.
| -rw-r--r-- | phpBB/includes/functions_display.php | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/forumlist_body.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/forumlist_body.html | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 05313e849d..cd2c9e5ae6 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -441,7 +441,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod } } - $l_subforums = (sizeof($subforums[$forum_id]) == 1) ? $user->lang['SUBFORUM'] . ': ' : $user->lang['SUBFORUMS'] . ': '; + $l_subforums = (sizeof($subforums[$forum_id]) == 1) ? $user->lang['SUBFORUM'] : $user->lang['SUBFORUMS']; $folder_image = ($forum_unread) ? 'forum_unread_subforum' : 'forum_read_subforum'; } else diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html index 46695b4841..3b02431183 100644 --- a/phpBB/styles/prosilver/template/forumlist_body.html +++ b/phpBB/styles/prosilver/template/forumlist_body.html @@ -40,7 +40,7 @@ <!-- ENDIF --> <!-- IF .forumrow.subforum and forumrow.S_LIST_SUBFORUMS --> <!-- EVENT forumlist_body_subforums_before --> - <br /><strong>{forumrow.L_SUBFORUM_STR}</strong> + <br /><strong>{forumrow.L_SUBFORUM_STR}{L_COLON}</strong> <!-- BEGIN subforum --> <a href="{forumrow.subforum.U_SUBFORUM}" class="subforum<!-- IF forumrow.subforum.S_UNREAD --> unread<!-- ELSE --> read<!-- ENDIF -->" title="<!-- IF forumrow.subforum.UNREAD -->{L_UNREAD_POSTS}<!-- ELSE -->{L_NO_UNREAD_POSTS}<!-- ENDIF -->">{forumrow.subforum.SUBFORUM_NAME}</a><!-- IF not forumrow.subforum.S_LAST_ROW -->{L_COMMA_SEPARATOR}<!-- ENDIF --> <!-- END subforum --> diff --git a/phpBB/styles/subsilver2/template/forumlist_body.html b/phpBB/styles/subsilver2/template/forumlist_body.html index 75646cd894..63d8aba9bb 100644 --- a/phpBB/styles/subsilver2/template/forumlist_body.html +++ b/phpBB/styles/subsilver2/template/forumlist_body.html @@ -52,7 +52,7 @@ <!-- ENDIF --> <!-- IF .forumrow.subforum and forumrow.S_LIST_SUBFORUMS --> <!-- EVENT forumlist_body_subforums_before --> - <p class="forumdesc"><strong>{forumrow.L_SUBFORUM_STR}</strong> + <p class="forumdesc"><strong>{forumrow.L_SUBFORUM_STR}{L_COLON}</strong> <!-- BEGIN subforum --> <a href="{forumrow.subforum.U_SUBFORUM}" class="subforum<!-- IF forumrow.subforum.S_UNREAD --> unread<!-- ELSE --> read<!-- ENDIF -->" title="<!-- IF forumrow.subforum.UNREAD -->{L_UNREAD_POSTS}<!-- ELSE -->{L_NO_UNREAD_POSTS}<!-- ENDIF -->">{forumrow.subforum.SUBFORUM_NAME}</a><!-- IF not forumrow.subforum.S_LAST_ROW -->{L_COMMA_SEPARATOR}<!-- ENDIF --> <!-- END subforum --> |