From 8b81f3d83548afaef4bb9b9d8430e50fa903ed47 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 23 Feb 2015 13:05:27 -0500 Subject: [PATCH] server-side support for hidden option in group admin, #2758 --- public/language/en_GB/groups.json | 15 +++++++++++++-- src/groups.js | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/public/language/en_GB/groups.json b/public/language/en_GB/groups.json index 964b5f42c6..a72cf20110 100644 --- a/public/language/en_GB/groups.json +++ b/public/language/en_GB/groups.json @@ -5,6 +5,9 @@ "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -15,12 +18,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", "details.latest_posts": "Latest Posts", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/src/groups.js b/src/groups.js index 1eae52699b..985cfc2e9d 100644 --- a/src/groups.js +++ b/src/groups.js @@ -510,7 +510,7 @@ var async = require('async'), description: values.description || '', icon: values.icon || '', labelColor: values.labelColor || '#000000', - hidden: values.hidden || '0', + hidden: values.hidden === true ? '1' : '0', 'private': values.private === false ? '0' : '1' };