makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-03 00:28:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/soft-delete] Fix naming of soft delete (we wont use that in the UI)

Browse source 
PHPBB3-9567
This commit is contained in:
Joas Schilling 2012-11-03 23:37:35 +01:00
parent 334265fc83
commit 269330749f
6 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/mcp/mcp_topic.php
View file

@ -324,7 +324,7 @@ function mcp_topic_view($id, $mode, $action)
'REPORTED_IMG' => $user->img('icon_topic_reported', 'POST_REPORTED'),
'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', 'POST_UNAPPROVED'),
'DELETED_IMG' => $user->img('icon_topic_deleted', 'POST_DELETED'),
'DELETED_IMG' => $user->img('icon_topic_deleted', 'POST_DELETED_RESTORE'),
'INFO_IMG' => $user->img('icon_post_info', 'VIEW_INFO'),
'S_MCP_ACTION' => "$url&i=$id&mode=$mode&action=$action&start=$start",

9
phpBB/language/en/acp/permissions_phpbb.php
View file

@ -156,9 +156,9 @@ $lang = array_merge($lang, array(
'acl_f_flash' => array('lang' => 'Can use [flash] BBCode tag', 'cat' => 'content'),
'acl_f_edit' => array('lang' => 'Can edit own posts', 'cat' => 'actions'),
'acl_f_softdelete' => array('lang' => 'Can soft delete own posts', 'cat' => 'actions'),
'acl_f_softdelete' => array('lang' => 'Can delete own posts', 'cat' => 'actions'),
'acl_f_restore' => array('lang' => 'Can restore own posts', 'cat' => 'actions'),
'acl_f_delete' => array('lang' => 'Can delete own posts', 'cat' => 'actions'),
'acl_f_delete' => array('lang' => 'Can delete own posts permanently', 'cat' => 'actions'),
'acl_f_user_lock' => array('lang' => 'Can lock own topics', 'cat' => 'actions'),
'acl_f_bump' => array('lang' => 'Can bump topics', 'cat' => 'actions'),
'acl_f_report' => array('lang' => 'Can report posts', 'cat' => 'actions'),
@ -175,11 +175,11 @@ $lang = array_merge($lang, array(
// Moderator Permissions
$lang = array_merge($lang, array(
'acl_m_edit' => array('lang' => 'Can edit posts', 'cat' => 'post_actions'),
'acl_m_delete' => array('lang' => 'Can delete posts', 'cat' => 'post_actions'),
'acl_m_delete' => array('lang' => 'Can delete posts permanently', 'cat' => 'post_actions'),
'acl_m_approve' => array('lang' => 'Can approve posts', 'cat' => 'post_actions'),
'acl_m_report' => array('lang' => 'Can close and delete reports', 'cat' => 'post_actions'),
'acl_m_chgposter' => array('lang' => 'Can change post author', 'cat' => 'post_actions'),
'acl_m_softdelete' => array('lang' => 'Can soft delete posts', 'cat' => 'post_actions'),
'acl_m_softdelete' => array('lang' => 'Can delete posts', 'cat' => 'post_actions'),
'acl_m_restore' => array('lang' => 'Can restore deleted posts', 'cat' => 'post_actions'),
'acl_m_move' => array('lang' => 'Can move topics', 'cat' => 'topic_actions'),
@ -187,7 +187,6 @@ $lang = array_merge($lang, array(
'acl_m_split' => array('lang' => 'Can split topics', 'cat' => 'topic_actions'),
'acl_m_merge' => array('lang' => 'Can merge topics', 'cat' => 'topic_actions'),
'acl_m_info' => array('lang' => 'Can view post details', 'cat' => 'misc'),
'acl_m_warn' => array('lang' => 'Can issue warnings<br /><em>This setting is only assigned globally. It is not forum based.</em>', 'cat' => 'misc'), // This moderator setting is only global (and not local)
'acl_m_ban' => array('lang' => 'Can manage bans<br /><em>This setting is only assigned globally. It is not forum based.</em>', 'cat' => 'misc'), // This moderator setting is only global (and not local)

2
phpBB/language/en/common.php
View file

@ -475,7 +475,7 @@ $lang = array_merge($lang, array(
'POST_BY_AUTHOR' => 'by',
'POST_BY_FOE' => 'This post was made by <strong>%1$s</strong> who is currently on your ignore list. %2$sDisplay this post%3$s.',
'POST_DAY' => '%.2f posts per day',
'POST_DELETED' => 'Soft deleted post:',
'POST_DELETED' => 'Deleted post:',
'POST_DETAILS' => 'Post details',
'POST_NEW_TOPIC' => 'Post new topic',
'POST_PCT' => '%.2f%% of all posts',

8
phpBB/language/en/mcp.php
View file

@ -198,9 +198,9 @@ $lang = array_merge($lang, array(
'MCP_QUEUE_UNAPPROVED_TOPICS' => 'Topics awaiting approval',
'MCP_QUEUE_UNAPPROVED_TOPICS_EXPLAIN' => 'This is a list of all topics which require approving before they will be visible to users.',
'MCP_QUEUE_DELETED_POSTS' => 'Deleted posts',
'MCP_QUEUE_DELETED_POSTS_EXPLAIN' => 'This is a list of all posts which have been soft deleted. You can restore or permanently delete the posts from this screen.',
'MCP_QUEUE_DELETED_POSTS_EXPLAIN' => 'This is a list of all posts which have been deleted. You can restore or permanently delete the posts from this screen.',
'MCP_QUEUE_DELETED_TOPICS' => 'Deleted topics',
'MCP_QUEUE_DELETED_TOPICS_EXPLAIN' => 'This is a list of all topics which have been soft deleted. You can restore or permanently delete the topics from this screen.',
'MCP_QUEUE_DELETED_TOPICS_EXPLAIN' => 'This is a list of all topics which have been deleted. You can restore or permanently delete the topics from this screen.',
'MCP_VIEW_USER' => 'View warnings for a specific user',
@ -238,7 +238,7 @@ $lang = array_merge($lang, array(
'NO_POST' => 'You have to select a post in order to warn the user for a post.',
'NO_POST_REPORT' => 'This post was not reported.',
'NO_POST_SELECTED' => 'You must select at least one post to perform this action.',
'NO_POSTS_DELETED' => 'There are no soft deleted posts.',
'NO_POSTS_DELETED' => 'There are no deleted posts.',
'NO_POSTS_QUEUE' => 'There are no posts waiting for approval.',
'NO_REASON_DISAPPROVAL' => 'Please give an appropriate reason for disapproval.',
'NO_REPORT' => 'No report found',
@ -246,7 +246,7 @@ $lang = array_merge($lang, array(
'NO_REPORT_SELECTED' => 'You must select at least one report to perform this action.',
'NO_TOPIC_ICON' => 'None',
'NO_TOPIC_SELECTED' => 'You must select at least one topic to perform this action.',
'NO_TOPICS_DELETED' => 'There are no soft deleted topics.',
'NO_TOPICS_DELETED' => 'There are no deleted topics.',
'NO_TOPICS_QUEUE' => 'There are no topics waiting for approval.',
'ONLY_TOPIC' => 'Only topic “%s”',

2
phpBB/language/en/posting.php
View file

@ -221,8 +221,6 @@ $lang = array_merge($lang, array(
'SMILIES' => 'Smilies',
'SMILIES_ARE_OFF' => 'Smilies are <em>OFF</em>',
'SMILIES_ARE_ON' => 'Smilies are <em>ON</em>',
'SOFT_DELETE_POST' => 'Soft Delete',
'SOFT_DELETE_POST_EXPLAIN' => 'Soft Deletion can be un-done',
'STICKY_ANNOUNCE_TIME_LIMIT'=> 'Sticky/Announcement time limit',
'STICK_TOPIC_FOR' => 'Stick topic for',
'STICK_TOPIC_FOR_EXPLAIN' => 'Enter 0 or leave blank for a never ending Sticky/Announcement. Please note that this number is relative to the date of the post.',