diff --git a/app/views/aspects/_edit_aspect_pane.html.haml b/app/views/aspects/_edit_aspect_pane.html.haml index 7d1365747..62ebfb7ca 100644 --- a/app/views/aspects/_edit_aspect_pane.html.haml +++ b/app/views/aspects/_edit_aspect_pane.html.haml @@ -15,6 +15,11 @@ %hr = form_for aspect do |asp| = asp.text_field :name, :value => aspect.name + = t('aspects.contacts_visible') + = aspect.check_box :contacts_visible, :default => true + %br + = t('aspects.contacts_not_visible') + -#contacts_visible should be editable here = asp.submit t('aspects.edit.rename_aspect') %hr diff --git a/app/views/aspects/_new_aspect.haml b/app/views/aspects/_new_aspect.haml index e15eab1f3..d531b4890 100644 --- a/app/views/aspects/_new_aspect.haml +++ b/app/views/aspects/_new_aspect.haml @@ -12,5 +12,9 @@ %p = aspect.label :name , t('.name') = aspect.text_field :name, :maxlength => 20 + = t('aspects.contacts_visible') + = aspect.check_box :contacts_visible, :default => true + %br + = t('aspects.contacts_not_visible') = aspect.submit t('.create'), :class => 'button' diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 79232d2ab..346a26b26 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -138,6 +138,8 @@ en: all_contacts: "All contacts" cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)" aspects: + contacts_visible: "Contacts in this aspect will be able to see each other." + contacts_not_visible: "Contacts in this aspect will not be able to see each other." edit: remove_aspect: "Delete this aspect" confirm_remove_aspect: "Are you sure you want to delete this aspect?" @@ -166,6 +168,7 @@ en: new_aspect: name: "Name" create: "Create" + create: success: "Your new aspect %{name} was created" failure: "Aspect creation failed."