aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorJames Atkinson <thefinn@users.sourceforge.net>2001-10-06 04:44:47 +0000
committerJames Atkinson <thefinn@users.sourceforge.net>2001-10-06 04:44:47 +0000
commitea5590297d01c62bbc1edbf59cd5d6efe62f5d63 (patch)
tree8cac89cd67eff1fd69b993cf29066779a3aa870b /phpBB/language
parentb431e279cedbfbb893812ff3771e60302e77bbc6 (diff)
downloadforums-ea5590297d01c62bbc1edbf59cd5d6efe62f5d63.tar
forums-ea5590297d01c62bbc1edbf59cd5d6efe62f5d63.tar.gz
forums-ea5590297d01c62bbc1edbf59cd5d6efe62f5d63.tar.bz2
forums-ea5590297d01c62bbc1edbf59cd5d6efe62f5d63.tar.xz
forums-ea5590297d01c62bbc1edbf59cd5d6efe62f5d63.zip
Group CP is done (I hope). The group moderator and admin can add and remove users from groups.
There are several things in this I would like to change but its too late for 2.0, someone remind me during 2.2 discussions git-svn-id: file:///svn/phpbb/trunk@1134 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rwxr-xr-xphpBB/language/email/group_added_english.tpl9
-rwxr-xr-xphpBB/language/lang_english.php5
2 files changed, 14 insertions, 0 deletions
diff --git a/phpBB/language/email/group_added_english.tpl b/phpBB/language/email/group_added_english.tpl
new file mode 100755
index 0000000000..e6f0e0bba1
--- /dev/null
+++ b/phpBB/language/email/group_added_english.tpl
@@ -0,0 +1,9 @@
+Congratulations,
+
+You have been added to the "{GROUP_NAME}" group on {SITENAME}.
+This action was done by the group moderator or the site administrator, contact them for more information.
+
+You can view your groups information here:
+{U_GROUPCP}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php
index b1e6ec8109..53277c1f76 100755
--- a/phpBB/language/lang_english.php
+++ b/phpBB/language/lang_english.php
@@ -526,6 +526,9 @@ $lang['No_group_members'] = "This group has no members";
$lang["Group_joined"] = "You have successfully subscribed to this group, you will be notifed when your subscription is approved by the group moderator.";
$lang['Group_request'] = "A request to join your group has been made";
$lang['Group_approved'] = "Your request has been approved";
+$lang['Group_added'] = "You have been added!";
+
+$lang['Could_not_add_user'] = "Could not add the selected user. Please go back and make sure you typed the correct username.";
$lang['Confirm_unsub'] = "Are you sure you want to unsubscribe from this group?";
$lang['Confirm_unsub_pending'] = "Are you sure you want to unsubscribe from this group? You subscription has not yet been approved or denied!";
@@ -535,6 +538,8 @@ $lang['Usub_success'] = "You have been successfully unsubscribed from this group
$lang['Approve_selected'] = "Approve Selected";
$lang['Deny_selected'] = "Deny Selected";
$lang['Not_logged_in'] = "You must be logged in to join a group.";
+$lang['Remove_selected'] = "Remove Selected";
+$lang['Add_member'] = "Add Member";
$lang['This_open_group'] = "This is an open group, click to request membership";
$lang['This_closed_group'] = "This is a closed group, no more users accepted";