aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRahul R <rahulr92@gmail.com>2012-04-08 22:52:49 +0530
committerRahul R <rahulr92@gmail.com>2012-04-08 22:52:49 +0530
commit2dec700aabcb8b5bebf707b41378ede61512e745 (patch)
tree55992445c7d625c4a725356472631083de147a0f
parentdd3b8e74b33da4dabb60001c2bffa5d8b2cec236 (diff)
downloadforums-2dec700aabcb8b5bebf707b41378ede61512e745.tar
forums-2dec700aabcb8b5bebf707b41378ede61512e745.tar.gz
forums-2dec700aabcb8b5bebf707b41378ede61512e745.tar.bz2
forums-2dec700aabcb8b5bebf707b41378ede61512e745.tar.xz
forums-2dec700aabcb8b5bebf707b41378ede61512e745.zip
[ticket/10650] Added ellipsis to language file
Added ELLIPSIS to language file common.php and also corrected language explanation of ACP option. PHPBB3-10650
-rw-r--r--phpBB/includes/functions_display.php2
-rw-r--r--phpBB/language/en/acp/board.php2
-rw-r--r--phpBB/language/en/common.php1
3 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index fbb6d65b92..138749d2db 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -397,7 +397,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
if ($row['forum_last_post_id'])
{
$last_post_subject = $row['forum_last_post_subject'];
- $last_post_subject_truncated = truncate_string($last_post_subject, 30, 255 ,false, '&#133;');
+ $last_post_subject_truncated = truncate_string($last_post_subject, 30, 255 ,false, $user->lang['ELLIPSIS']);
$last_post_time = $user->format_date($row['forum_last_post_time']);
$last_post_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id_last_post'] . '&amp;p=' . $row['forum_last_post_id']) . '#p' . $row['forum_last_post_id'];
}
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 187d823fd0..7329f8dcaf 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -45,7 +45,7 @@ $lang = array_merge($lang, array(
'DISABLE_BOARD' => 'Disable board',
'DISABLE_BOARD_EXPLAIN' => 'This will make the board unavailable to users. You can also enter a short (255 character) message to display if you wish.',
'DISPLAY_LAST_SUBJECT' => 'Display subject of last added post on forum list',
- 'DISPLAY_LAST_SUBJECT_EXPLAIN' => 'The subject of the last added post will be displayed in the forum list with a hyperlink to the post. Subjects from password protected forums and ones in which user doesnt have read access are not shown.',
+ 'DISPLAY_LAST_SUBJECT_EXPLAIN' => 'The subject of the last added post will be displayed in the forum list with a hyperlink to the post. Subjects from password protected forums and forums in which user doesnt have read access are not shown.',
'OVERRIDE_STYLE' => 'Override user style',
'OVERRIDE_STYLE_EXPLAIN' => 'Replaces user’s style with the default.',
'SITE_DESC' => 'Site description',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 12f8edad9e..f46e5df4db 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -169,6 +169,7 @@ $lang = array_merge($lang, array(
),
'EDIT_POST' => 'Edit post',
+ 'ELLIPSIS' => ' &#133;', // ...
'EMAIL' => 'E-mail', // Short form for EMAIL_ADDRESS
'EMAIL_ADDRESS' => 'E-mail address',
'EMAIL_SMTP_ERROR_RESPONSE' => 'Ran into problems sending e-mail at <strong>Line %1$s</strong>. Response: %2$s.',