mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 09:16:55 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'github-nickvergessen/ticket/12371' into develop-ascraeus

Browse Source 
* github-nickvergessen/ticket/12371:
  [ticket/12371] Fix language string
  [ticket/12371] Fix typos in comment
  [ticket/12371] Fix redirect link for approve_post and post_in_queue
  [ticket/12371] Delete the approve_post notification when editing a post
  [ticket/12371] Fix language in comment
  [ticket/12371] Reapprove the post and topic again in tests
  [ticket/12371] Correctly set is_starter when editing first post of the topic
  [ticket/12371] Add functional tests for reapproving
  [ticket/12371] Fix query in mcp_sorting()
  [ticket/12371] Rename disapprove and softdelete tests
  [ticket/12371] We do not group quote notifications anymore
  [ticket/12371] Fix SQL query
  [ticket/11772] Do not send out new topic/post notifications when reapproving
  [ticket/12052] Use different visibility when post was edited
  [ticket/12052] Add support for ITEM_UNAPPROVED to set_post_visibility method
  [ticket/12371] Do not add unlimited users as responders
  [ticket/12371] Do not update the notification entry unneccessarily
  [ticket/12371] Do not delete post related notifications when a post is deleted
  [ticket/12371] Allow notification types to redirect to a different url
  [ticket/12371] Do not group "quote" notifications
This commit is contained in:
Nils Adermann
2014-05-02 12:11:09 +02:00
parent 73b950d2f1 5c7199f3dd
commit d36795b844
31 changed files with 646 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/language/en/common.php
View File

@@ -422,14 +422,16 @@ $lang = array_merge($lang, array(
'NOT_WATCHING_FORUM' => 'You are no longer subscribed to updates on this forum.',
'NOT_WATCHING_TOPIC' => 'You are no longer subscribed to this topic.',
'NOTIFICATIONS' => 'Notifications',
// This applies for NOTIFICATION_BOOKMARK, NOTIFICATION_POST, and NOTIFICATION_QUOTE.
// This applies for NOTIFICATION_BOOKMARK and NOTIFICATION_POST.
// %1$s will return a list of users that's concatenated using "," and "and" - see STRING_LIST
// Once the user count reaches 5 users or more, the list is trimmed using NOTIFICATION_X_OTHERS
// Once the user count reaches 20 users or more, the list is trimmed using NOTIFICATION_MANY_OTHERS
// Examples:
// A replied...
// A and B replied...
// A, B and C replied...
// A, B, C and 2 others replied...
// A, B, C and others replied...
'NOTIFICATION_BOOKMARK' => array(
1 => '%1$s replied to the topic “%2$s” you have bookmarked.',
),
@@ -454,7 +456,8 @@ $lang = array_merge($lang, array(
'NOTIFICATION_TOPIC_IN_QUEUE' => 'A new topic titled "%2$s" was posted by %1$s and needs approval.',
'NOTIFICATION_TYPE_NOT_EXIST' => 'The notification type "%s" is missing from the file system.',
'NOTIFICATION_ADMIN_ACTIVATE_USER' => 'The user “%1$s” is newly registered and requires activation.',
// Used in conjuction with NOTIFICATION_BOOKMARK, NOTIFICATION_POST, and NOTIFICATION_QUOTE.
// Used in conjuction with NOTIFICATION_BOOKMARK and NOTIFICATION_POST.
'NOTIFICATION_MANY_OTHERS' => 'others',
'NOTIFICATION_X_OTHERS' => array(
2 => '%d others',
),