github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-28 05:23:43 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: fix [Object object] on admin/groups buttons

Browse Source
This commit is contained in:
Régis Hanol 2015-03-18 22:46:24 +01:00
parent 29a0603850
commit b31c05704a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/templates/groups.hbs
View File

@ -1,6 +1,6 @@
{{#admin-nav}} {{#admin-nav}}
{{admin-nav-item route='adminGroupsType' routeParam='custom' label='admin.groups.custom'}} {{admin-nav-item route='adminGroupsType' routeParam='custom' label='admin.groups.custom.label'}}
{{admin-nav-item route='adminGroupsType' routeParam='automatic' label='admin.groups.automatic'}} {{admin-nav-item route='adminGroupsType' routeParam='automatic' label='admin.groups.automatic.label'}}
{{/admin-nav}} {{/admin-nav}}
<div class="admin-container"> <div class="admin-container">

8
config/locales/client.en.yml
View File

@ -1692,14 +1692,14 @@ en:
name: "Name" name: "Name"
add: "Add" add: "Add"
add_members: "Add members" add_members: "Add members"
custom: "Custom"
automatic: "Automatic"
automatic_membership_email_domains: "Users who register with an email domain that exactly matches one in this list will be automatically added to this group:"
automatic_membership_retroactive: "Apply the same email domain rule to add existing registered users"
custom: custom:
label: "Custom"
title: "Custom Groups" title: "Custom Groups"
automatic: automatic:
label: "Automatic"
title: "Automatic Groups" title: "Automatic Groups"
automatic_membership_email_domains: "Users who register with an email domain that exactly matches one in this list will be automatically added to this group:"
automatic_membership_retroactive: "Apply the same email domain rule to add existing registered users"
api: api:
generate_master: "Generate Master API Key" generate_master: "Generate Master API Key"