From b31c05704a00f08f4f66a33686fc6a8f017690e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Wed, 18 Mar 2015 22:46:24 +0100
Subject: [PATCH] UX: fix [Object object] on admin/groups buttons
---
app/assets/javascripts/admin/templates/groups.hbs | 4 ++--
config/locales/client.en.yml | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/assets/javascripts/admin/templates/groups.hbs b/app/assets/javascripts/admin/templates/groups.hbs
index 0de3fc5c7..754ad6744 100644
--- a/app/assets/javascripts/admin/templates/groups.hbs
+++ b/app/assets/javascripts/admin/templates/groups.hbs
@@ -1,6 +1,6 @@
{{#admin-nav}}
- {{admin-nav-item route='adminGroupsType' routeParam='custom' label='admin.groups.custom'}}
- {{admin-nav-item route='adminGroupsType' routeParam='automatic' label='admin.groups.automatic'}}
+ {{admin-nav-item route='adminGroupsType' routeParam='custom' label='admin.groups.custom.label'}}
+ {{admin-nav-item route='adminGroupsType' routeParam='automatic' label='admin.groups.automatic.label'}}
{{/admin-nav}}
<div class="admin-container">
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 2320f3730..60d311b7b 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1692,14 +1692,14 @@ en:
name: "Name"
add: "Add"
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:
+ label: "Custom"
title: "Custom Groups"
automatic:
+ label: "Automatic"
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:
generate_master: "Generate Master API Key"