diff options
| author | David King <imkingdavid@gmail.com> | 2013-09-12 21:25:00 -0700 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-09-12 21:25:00 -0700 |
| commit | f22b959257deba0f00a4330df9103c47673032b8 (patch) | |
| tree | 36ca640a1a9744c0a17260e85a25e159b9421de3 /phpBB/language | |
| parent | d62973867511d4f2b337a4c1cf3654ee20a2a107 (diff) | |
| parent | 32b92547400c14a402f64463661ce7c1b44e81b3 (diff) | |
| download | forums-f22b959257deba0f00a4330df9103c47673032b8.tar forums-f22b959257deba0f00a4330df9103c47673032b8.tar.gz forums-f22b959257deba0f00a4330df9103c47673032b8.tar.bz2 forums-f22b959257deba0f00a4330df9103c47673032b8.tar.xz forums-f22b959257deba0f00a4330df9103c47673032b8.zip | |
Merge pull request #1620 from EXreaction/ticket/11745
Group join approved notification
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/common.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/email/group_approved.txt | 10 |
2 files changed, 1 insertions, 10 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index d94896decc..e5c0478d98 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -424,6 +424,7 @@ $lang = array_merge($lang, array( ), 'NOTIFICATION_BOOKMARK' => '%1$s replied to the topic "%2$s" you have bookmarked.', 'NOTIFICATION_GROUP_REQUEST' => '%1$s is requesting to join the group %2$s.', + 'NOTIFICATION_GROUP_REQUEST_APPROVED' => 'Your request to join the group %1$s has been approved.', 'NOTIFICATION_PM' => '%1$s sent you a Private Message "%2$s".', 'NOTIFICATION_POST' => '%1$s replied to the topic "%2$s".', 'NOTIFICATION_POST_APPROVED' => 'Your post was approved "%2$s".', diff --git a/phpBB/language/en/email/group_approved.txt b/phpBB/language/en/email/group_approved.txt deleted file mode 100644 index 24afefcd07..0000000000 --- a/phpBB/language/en/email/group_approved.txt +++ /dev/null @@ -1,10 +0,0 @@ -Subject: Your request has been approved - -Congratulations, - -Your request to join the "{GROUP_NAME}" group on "{SITENAME}" has been approved. -Click on the following link to see your group membership. - -{U_GROUP} - -{EMAIL_SIG} |