radiant-reader-extension 3.0.0.rc4 → 3.0.0

data/app/views/admin/messages/{index.haml → index.html.haml}

@@ -7,11 +7,21 @@
       %tr
         - render_region :thead do |thead|
           - thead.subject_header do
-            %th.message Subject
+            %th.message
+              = t('reader_extension.subject')
+          - thead.function_header do
+            %th.message_function 
+              = t('reader_extension.function')
+          - thead.groups_header do
+            %th.message_groups 
+              = t('reader_extension.groups')
           - thead.sent_header do
-            %th.message_sent Delivery status
+            %th.message_sent
+              = t('reader_extension.delivery_status')
           - thead.modify_header do
-            %th.modify Modify
+            %th.modify 
+              = t('modify')
+            
     %tbody
       - @messages.each do |message|
         %tr
@@ -19,14 +29,14 @@
             - tbody.subject_cell do
               %td.name
                 = link_to message.subject, admin_message_url(message), :class => message.has_function? ? "functional" : "normal"
-                %span.function
-                  - if message.administrative?
-                    = t("message_functions.#{message.function}")
-                  - else
-                    = t("message_functions.ad_hoc")
-                  - if message.group
-                    = t('reader_extension.for')
-                    = link_to message.group.name, admin_group_url(message.group)
+            - tbody.function_cell do
+              %td.message_function
+                - if message.administrative?
+                  = t("message_functions.#{message.function}")
+            - tbody.groups_cell do
+              %td.message_groups
+                - if message.groups.any?
+                  = message.groups.map(&:name).to_sentence
 
             - tbody.sent_cell do
               %td.message_sent

data/app/views/admin/pages/_page_groups.html.haml

@@ -1,13 +1,7 @@
 - groups = Group.find(:all)
 - if groups.any?
-  .set
-    %p
-      = t('reader_extension.permitted_groups')
-      - groups.each do |group|
-        = check_box_tag "page[group_ids][]", group.id, @page.has_inherited_group?(group), :id => "page_group_#{group.id}", :disabled => @page.group_is_inherited?(group)
-        - if @page.group_is_inherited?(group)
-          %label.checkbox{:for => "page_group_#{group.id}", :class => 'disabled', :title => t('reader_extension.inherited_group')}
-            = group.name
-        - else
-          %label.checkbox{:for => "page_group_#{group.id}"}
-            = group.name
+  %p
+    = t('reader_extension.permitted_groups')
+    %br
+    - fields_for @page do |f|
+      = render :partial => 'admin/groups/chooser', :locals => {:f => f}

data/app/views/admin/permissions/_page.html.haml

@@ -1,24 +1,18 @@
 - page ||= @page
 - group ||= @group
 
-- liclass = 'loose'
-- liclass = 'attached' if page.has_group?(group)
-- liclass = 'inherited' if page.group_is_inherited?(group)
 
-- if permission = group.permission_for(page)
-  %li{:class => "fake_checkbox checked", :id => "page_#{page.id}"}
-    = link_to_remote page.title, :url => admin_group_permission_url(group, permission), :method => 'delete', :loading => "$('page_#{page.id}').addClassName('waiting')", :update => "page_holder_#{page.id}"
-
-- elsif page.has_inherited_group?(group)
-  %li{:class => "fake_checkbox inherited", :id => "page_#{page.id}"}
+- if page.has_inherited_group?(group)
+  %span{:class => "fake_checkbox inherited"}
     = page.title
 
 - else
-  %li{:class => "fake_checkbox unchecked", :id => "page_#{page.id}"}
-    = link_to_remote page.title, :url => admin_group_permissions_url(group, :page_id => page.id), :loading => "$('page_#{page.id}').addClassName('waiting')", :update => "page_holder_#{page.id}"
+  - cssclass = "fake_checkbox"
+  - cssclass << ' checked' if page.has_group?(group)
+  = link_to page.title, admin_toggle_group_permission_url(:group_id => group.id, :page_id => page.id),  {:class => cssclass, :id => "toggle_page_#{page.id}"}
 
 - if page.children.any?
   %ul
     - page.children.each do |child|
-      %div{:id => "page_holder_#{child.id}"}
+      %li{:id => "page_holder_#{child.id}"}
         = render :partial => 'admin/permissions/page', :object => child

data/app/views/admin/reader_configuration/edit.html.haml

@@ -16,6 +16,8 @@
               = edit_config('reader.allow_registration?')
             %p
               = edit_config('reader.require_confirmation?')
+            %p
+              = edit_config 'reader.directory_visibility'
             %p
               = edit_config('reader.get_profile?')
             %p

data/app/views/admin/reader_configuration/show.html.haml

@@ -12,6 +12,8 @@
         = show_config 'reader.allow_registration?'
       %p.ruled
         = show_config 'reader.require_confirmation?'
+      %p.ruled
+        = show_config 'reader.directory_visibility'
       %p.ruled
         = show_config 'reader.get_profile?'
       %p.ruled

data/app/views/groups/_group.html.haml

@@ -0,0 +1,12 @@
+.group        
+  %h3
+    = link_to group.name, group_url(group)
+      
+  %p.context
+    = t("reader_extension.member_count", :count => group.readers.count) + '.'
+    = link_to t('reader_extension.directory.vcard_link'), group_url(group, :format => :vcard), :class => 'vcard'
+    = link_to t('reader_extension.directory.csv_link'), group_url(group, :format => :csv), :class => 'csv'
+    
+  - if group.description
+    %p
+      = group.description

data/app/views/groups/show.html.haml

@@ -1,6 +1,11 @@
 - content_for :breadhead do
+  = link_to t('reader_extension.readers_title').titlecase, reader_index_url
+  = t('reader_extension.separator')
   = link_to t('reader_extension.groups').titlecase, groups_url
   = t('reader_extension.separator')
+  - if @group.parent
+    = link_to @group.parent.name, group_url(@group.parent)
+    = t('reader_extension.separator')
 
 - content_for :title do
   = @group.name
@@ -22,10 +27,12 @@
     = t('or')
     = link_to t("reader_extension.vcard_file"), group_url(@group, :format => :vcard), :class => 'vcard'
 
-  %h3
-    = t('reader_extension.group_members')
+  - if @group.children.any?
+    %h2
+      = t('reader_extension.subgroups', :name => @group.name)
+    = render :partial => 'groups/group', :collection => @group.children
 
-  = render :partial => 'accounts/list', :readers => @readers
+  = render :partial => 'readers/people', :readers => @readers
 
 = yield :main
 

data/app/views/readers/_description.html.haml

@@ -0,0 +1,3 @@
+- reader ||= @reader
+- unless reader.description.blank?
+  = clean_html(reader.description)

data/app/views/readers/_groups.html.haml

@@ -0,0 +1,9 @@
+- groups ||= @groups
+
+%h2
+  = t('reader_extension.groups')
+- if groups.any?
+  = render :partial => 'groups/group', :collection => groups
+- else
+  %p
+    = t('reader_extension.no_groups')

data/app/views/{accounts → readers}/_links.html.haml

@@ -4,9 +4,9 @@
   %li
     = link_to t("reader_extension.directory.link"), readers_url
   %li
-    = link_to t("reader_extension.directory.csv_link"), readers_url(:format => :csv)
+    = link_to t("reader_extension.directory.csv_link"), readers_url(:format => :csv), :class => 'csv'
   %li
     = link_to t("reader_extension.directory.vcard_link"), readers_url(:format => :vcard), :class => 'vcard'
   - Group.visible_to(current_reader).each do |group|
     %li
-      = link_to_group(group)
+      = link_to_group(group) + ' ' + t('group')

data/app/views/readers/_list.html.haml

@@ -0,0 +1,23 @@
+- readers ||= []
+
+- if readers.any?
+  - if readers.respond_to?(:previous_page) && readers.previous_page
+    = pagination_and_summary_for(readers, t('reader_extension.person'))
+
+  - if @display == 'gallery'
+    - if readers.size > 1
+      - cols = 3
+      - columns = readers.in_groups_of((readers.size / cols), false)
+    - else
+      - columns = [readers]
+    - columns.each do |column|
+      %div.column
+        = render :partial => 'readers/mugshot', :collection => column
+
+  - else
+    %table.readers
+      %tbody
+        = render :partial => 'readers/reader', :collection => readers
+
+  - if readers.respond_to?(:next_page) && readers.next_page
+    = pagination_and_summary_for(readers, t('reader_extension.person'))

data/app/views/{accounts/_groups.html.haml → readers/_memberships.html.haml}

@@ -1,5 +1,4 @@
 - reader ||= @reader
-
 - groups = reader.groups.visible_to(current_reader)
 - if groups.any?
   %ul.groups

data/app/views/{accounts/_reader.html.haml → readers/_mugshot.html.haml}

@@ -1,6 +1,6 @@
 .reader        
   %h2
-    = link_to standard_gravatar_for(reader), reader_url(reader), {:title => reader.name}
+    = link_to gravatar_for(reader, :size => 128), reader_url(reader), :title => reader.name
     = link_to reader.name, reader_url(reader)
     %span.headernote
       = link_to ' ', reader_url(reader, :format => :vcard), :class => 'vcard'

data/app/views/readers/_people.html.haml

@@ -0,0 +1,6 @@
+- readers ||= @readers
+
+%h2
+  = t('reader_extension.people').titlecase
+
+= render :partial => 'readers/list', :locals => {:readers => readers}

data/app/views/readers/_profile.html.haml

@@ -0,0 +1,30 @@
+- if Radiant.config['reader.share_details?']
+  - reader ||= @reader
+  
+  - if reader.unshareable?
+    - if reader == current_reader
+      %p.warning
+        = t('reader_extension.you_are_not_shared')
+  - else
+    %div.contact
+      %h3
+        = link_to reader.name, reader_url(reader, :format => :vcard), :class => 'vcard', :title => t('reader_extension.directory.vcard_link')
+      %ul
+        - if email = reader.email
+          %li
+            = t("reader_extension.directory.email") + ': '
+            = email_link email
+        - %w{phone mobile}.each do |field|
+          - if value = reader.send(field.to_sym)
+            %li
+              = t("reader_extension.directory.#{field}") + ': '
+              = value
+        - if reader.postal_address?
+          %li
+            %span.indent
+              = t("reader_extension.directory.postal_address") + ': '
+            = reader.postal_address.to_html
+        - if reader == current_reader
+          %li
+            = link_to t("reader_extension.edit_profile"), reader_edit_profile_url, :class => 'edit'
+          

data/app/views/readers/_reader.html.haml

@@ -0,0 +1,28 @@
+%tr.reader
+  - if reader.unshareable?
+    %td{:colspan => 7}
+      = t("reader_extension.listing_denied")
+  - else
+    %td.gravatar
+      = link_to gravatar_for(reader, {:size => 18}, {:class => 'gravatar'}), reader_url(reader), :title => reader.name
+    %td.name
+      %h3
+        = link_to reader.name, reader_url(reader)
+    %td.email
+      %p
+        = mail_to reader.email, nil, :encode => 'hex', :replace_at => " #{t('reader_extension.at')} "
+
+    - [:phone, :mobile].each do |field|
+      - value = reader.send(field)
+      - unless value.blank?
+        %td{:class => field.to_s}
+          %p
+            = value
+      - else
+        %td.missing
+          %p
+            = t("reader_extension.no_#{field}")
+
+    %td.vcard
+      %p
+        = link_to t('reader_extension.vcard'), reader_url(reader, :format => :vcard), :class => 'vcard'

data/app/views/readers/index.html.haml

@@ -0,0 +1,20 @@
+- content_for :introduction do
+  %p
+    = t("reader_extension.readers_introduction_#{Radiant.config['reader.directory_visibility']}")
+    - if current_reader && Radiant.config['reader.directory_visibility'] != 'none'
+      = t("reader_extension.readers_introduction_edit", :url => reader_edit_profile_url)
+
+- content_for :breadcrumbs do
+  = link_to t('reader_extension.home').titlecase, '/'
+  = t('reader_extension.separator')
+  = t('reader_extension.people').titlecase
+
+- content_for :title do
+  = t('reader_extension.readers_title').titlecase
+
+= render :partial => 'shared/standard_reader_parts'
+
+- content_for :main do
+  = render_region :main
+
+= yield :main

data/app/views/{accounts → readers}/show.html.haml

@@ -1,5 +1,5 @@
 - content_for :breadhead do
-  = link_to t('reader_extension.readers').titlecase, readers_url
+  = link_to t('reader_extension.readers').titlecase, reader_index_url
   = t('reader_extension.separator')
 
 - content_for :title do
@@ -18,6 +18,5 @@
 - content_for :main do
   - render_region :main
 
-
 = yield :main
 

data/app/views/shared/_standard_reader_parts.html.haml

@@ -6,7 +6,7 @@
   = link_to t('reader_extension.navigation.readers'), readers_url, :class => 'section'
   - if current_reader
     = link_to t('reader_extension.navigation.dashboard'), reader_dashboard_url
-    = link_to t('reader_extension.navigation.directory'), readers_url
+    = link_to t('reader_extension.navigation.directory'), reader_index_url
     = link_to t('reader_extension.navigation.profile'), reader_profile_url
     = link_to t('reader_extension.navigation.account'), reader_account_url
     = link_to t('reader_extension.navigation.log_out'), reader_logout_url

data/app/views/shared/not_allowed.html.haml

@@ -0,0 +1,16 @@
+- content_for :title do
+  = t('reader_extension.access_denied')
+
+= render :partial => 'shared/standard_reader_parts'
+
+- content_for :main do
+  %p
+    = t('reader_extension.explain_access_error')
+
+  %p.exception
+    = @message
+
+  %p
+    = t('reader_extension.mistaken_access_error')
+
+= yield :main

data/config/initializers/formats.rb

@@ -1,2 +1 @@
-Mime::Type.register "text/x-vcard", :vcard
-Mime::Type.register "text/csv", :csv
+Mime::Type.register "text/x-vcard", :vcard unless Mime::Type.lookup(:vcard)

data/config/initializers/radiant_config.rb

@@ -5,12 +5,15 @@ Radiant.config do |config|
     reader.define 'layout', :select_from => lambda { Layout.all.map(&:name) }, :allow_blank => false
     reader.define 'get_profile?', :default => true
     reader.define 'public?', :default => false
-    reader.define 'confine_to_groups?', :default => false
+    reader.define 'directory_visibility', :select_from => %w{public private grouped none}, :allow_blank => false, :default => 'private'
     reader.define 'share_details?', :default => false
+    reader.define 'profiles_path', :default => ""
+    reader.define 'preferences_path', :default => ""
+    reader.define 'login_to', :default => "dashboard"
   end
   config.namespace('email') do |email|
     email.define 'layout', :select_from => lambda { Layout.all.map(&:name) }, :allow_blank => true
     email.define 'name', :allow_blank => false
-    email.define 'address', :allow_blank => false 
+    email.define 'address', :allow_blank => false
   end
 end 

data/config/locales/en.yml

@@ -1,38 +1,41 @@
 en:
   activerecord:
     attributes:
+      group:
+        name: "Name"
+        description: "Description"
+        parent_id: "Subgroup of"
+        homepage_id: "Group home page"
       reader:
-        description: "Biog"
+        description: "Biog or remarks"
         email: "Email address"
-        phone: "Home phone"
-        mobile: "Mobile phone"
         forename: "Forename"
         honorific: "Title or rank"
         login: "Login username"
+        mobile: "Mobile phone"
         name: "Your name"
         password: "Password"
         password_confirmation: "Confirm password"
-        postal_address: "Postal address"
-        post_organisation: "Organisation"
+        phone: "Home phone"
+        post_city: "City or town"
+        post_country: "Country"
         post_line1: "Building name or number"
         post_line2: "Street"
-        post_city: "City or town"
+        post_organisation: "Organisation"
         post_province: "County"
-        post_country: "Country"
+        postal_address: "Postal address"
         postcode: "Postcode"
         surname: "Surname"
         unshareable: "Share none of this information"
       message:
-        subject: "Message Subject"
-        filter_id: "Filter"
         body: "Message body"
+        filter_id: "Filter"
+        subject: "Message Subject"
+        group_ids: "Groups"
     errors:
       models:
         reader:
           attributes:
-            name:
-              blank: "please enter a name"
-              too_long: "this is too long: 100 characters max"
             email:
               blank: "please enter your email address"
               invalid: "this doesn't look like an email address"
@@ -40,54 +43,66 @@ en:
               taken_by_author: "this address belongs to an author here. You don't need to register here: just log in to admin."
             login:
               taken: "this login is already in use here"
+            name:
+              blank: "please enter a name"
+              too_long: "this is too long: 100 characters max"
             password:
               too_short: "this must have at least six characters"
               invalid: "this must include at least one non-letter"
   config:
     reader:
       allow_registration?: "Allow registration"
-      require_confirmation?: "Confirm email addresses"
-      use_honorifics?: "Use honorifics"
-      layout: "Layout for forms"
+      directory_visibility: "Access to directory"
       get_profile?: "Ask for profile text"
+      layout: "Layout for forms"
       public?: "Readers list public"
-      confine_to_groups?: "Show only members of shared groups"
+      require_confirmation?: "Confirm email addresses"
+      use_honorifics?: "Use honorifics"
     email:
-      name: "Message sender"
       address: "Message reply-to"
-      prefix: "Subject prefix"
       layout: "Email layout"
-  reader: "Reader"
-  readers: "Readers"
+      name: "Message sender"
+      prefix: "Subject prefix"
+  group: "group"
   groups: "Groups"
-  messages: "Messages"
-  settings: "Settings"
+  message: "message"
   message_functions:
     activation: "Activation instructions"
     ad_hoc: "Ad hoc message"
-    invitation: "Invitation"
-    group_welcome: "Group welcome"
     group_invitation: "Group invitation"
+    group_welcome: "Group welcome"
+    invitation: "Invitation"
     password_reset: "Password instructions"
     welcome: "Registration complete"
+  messages: "Messages"
+  reader: "reader"
   reader_extension:
-    access_denied: "Access denied"
+    access_denied: "Not allowed!"
     account_settings: "Account settings"
     account_updated: "Your account has been updated"
     activate_account: "Activate your account"
     activation_complete: "Thank you very much for persevering with the registration process. Your account is now active."
     activation_message_sent: "Account activation instructions have been emailed to you."
     activation_required: "Please check your email for an activation message"
-    activation_required_header: "Please check your email"
     activation_required_explanation: "You should have received a confirmation message containing a link that will activate your account."
+    activation_required_header: "Please check your email"
     activation_sent: "Activation message sent"
+    add_members: "add members"
+    add_subgroup: "add subgroup"
+    admin_messages: "Administrative messages"
     affected_fields_highlighted: "The affected fields are highlighted below."
     all: "All"
     all_deliveries_failed: "All deliveries failed"
+    all_in_group: "Everyone in the group"
+    allowed_groups: "Allow access only to:"
     already_active: "Your account is already active."
     already_logged_in: "You're already logged in!"
     already_registered: "If you've already registered, you should only need to"
     and_try_again: "and try again."
+    any_option: "<any>"
+    at: "at"
+    belongs_to_group: 'This message belongs to the <a href="%{href}">%{name}</a> group.'
+    belongs_to_these_groups: "This message is sent to these groups:"
     bold_required: "Fields with bold headings are required and will cause grumbling if left blank."
     but_not_active: 'but your account is not yet activated. Please check your email for our activation message.'
     cancel: "cancel"
@@ -96,8 +111,10 @@ en:
     change_gravatar: "change gravatar image"
     change_password: "Change your password"
     check_email: "Please check your email for an activation message"
+    check_invitation_list: "Check the invitation list"
+    check_invitation_message: "Preview invitation message"
     check_vcard: "Check your contact card"
-    checked_fields_public: "Uncheck any field (by clicking on the green tick) that you do not want to publish."
+    checked_fields_public: "Uncheck any field (by clicking on the green tick) that you do not want to make visible to other members."
     checked_fields_uncheck: "Click on the arrow to make that field private."
     confirm_new_password: "Confirm new password"
     confirm_password: "Confirm password"
@@ -108,69 +125,111 @@ en:
       zero: "(nobody)"
       one: "(one person)"
       other: "(%{count} people)"
+    create_account: "Register"
+    create_group_invitation: "Create group invitation message"
+    create_group_welcome: "Create group welcome message"
+    create_invitation: "create invitation"
+    create_invitation_message: "create invitation message"
+    create_message: "Create new message"
     create_message: "create message"
-    csv_file: "a csv file"
+    create_new_message: "Send a new message"
+    create_welcome: "create welcome"
+    csv_file: "CSV data"
     dashboard:
+      account: "Account settings"
       directory: "Directory"
       edit_profile: "Edit profile"
-      profile: "Your page"
-      account: "Account settings"
-      listing: "Directory listing"
-      introduction: "Hello %{name}. Welcome back to %{site}. This page gathers together recent activity, useful links and bits of administration. You can always get back here by clicking on a 'dashboard' link."
-      welcome: "Hello %{name}. Welcome to %{site} and thank you for persevering with the registration process. Your account is now active and this is your (empty) dashboard page."
       groups: "Your groups"
+      introduction: "Hello %{name}. Welcome back to %{site}. This page gathers together recent activity, useful links and bits of administration. You can always get back here by clicking on a 'dashboard' link."
+      listing: "Directory listing"
       messages: "Messages for you"
+      profile: "Your page"
       title: "Welcome"
+      welcome: "Hello %{name}. Welcome to %{site} and thank you for persevering with the registration process. Your account is now active and this is your (empty) dashboard page."
+    delete_group: "delete group"
+    delete_message: "Delete message"
+    delete_message: "delete message"
+    delete_reader: "delete reader"
+    delivery_status: "Delivery"
     directory: 
-      name: "Full name"
       contact: "Contact"
-      profile: "Profile"
+      csv_link: "Download CSV data"
       email: "Email"
-      phone: "Telephone"
+      groups: "Groups"
+      link: "Browse members list"
       mobile: "Mobile"
+      name: "Full name"
+      phone: "Telephone"
       postal_address: "Address"
-      link: "Browse members list"
+      profile: "Profile"
       title: "Directory"
-      csv_link: "Download as CSV file"
-      vcard_link: "Download to your address book"
-      groups: "Groups"
+      vcard_link: "Download address book file"
     dont_fill: "Don't fill this in!"
     download_as: "Download as"
     download_group_as: "Download the whole group as"
+    download_vcard: "Download vcard"
+    edit_group: "edit group"
+    edit_message: "Edit message"
     edit_profile: "Edit your profile"
+    email: "email"
     email_unknown: "Sorry. That email address is not known here."
     enter_code: "Please enter confirmation code"
     enter_email_for_reminder: "enter your email address and we will send the message again"
+    everyone: "Everyone"
     everyone_in_group: "Everyone in the group"
+    everyone_inactive: "Anyone who has not activated their account"
+    everyone_unsent: "Anyone who has not received this message"
+    explain_access_error: "Sorry: you have run into a barrier and are not allowed to do whatever it was you just tried to do. The error message was:"
+    for: 'for'
+    for_group: "for the %{name} group"
+    for_the_groups: 
+      zero: "without group links"
+      one: "for the %{names} group"
+      other: "for the %{names} groups"
     forgotten_password: "Forgotten your password?"
     form_notes:
       account:
-        description: "you can fill this in later. Textile formatting is allowed."
+        description: "This appears at the top of your profile page."
         email: "we will send activation instructions to this address"
         existing_password: "leave blank to keep present password. If changing, at least four characters."
+        honorific: "this is prepended to your name but only in a formal setting"
         login: "you can always use your email address instead"
+        mobile: "without country code"
         name: "this is how you will be referred to on the site"
         new_password: "at least six characters, please, and with at least one non-letter character"
-        honorific: "this is prepended to your name but only in a formal setting"
+        phone: "with area code but no country code"
         post_country: "Please choose from the list"
         post_organisation: "You can omit this unless it's part of your postal address"
-        unshareable: "to keep one field private, uncheck it above. To keep all your contact information private and receive only administrative messages, check this box."
-        phone: "with area code but no country code"
-        mobile: "without country code"
+        unshareable: "To keep your contact information private and receive only administrative messages, check this box."
     form_problem: "there was a problem with the form"
+    full_name: "full name"
+    function: "Function"
     getting_gravatar: "If you would like a picture to appear next to your messages, give yourself a gravatar at"
-    groups: "Groups"
+    group: "group"
     group_filter: "Show only members of the group: "
+    group_invitation: "This is the invitation message"
     group_members: "Group Members"
+    group_members: "Group members"
+    group_page: "group page"
+    group_welcome: "This is the welcome message"
+    groups: "Groups"
+    groups_introduction: ""
     hello: "hello"
+    home: 'home'
     honorific: "Title or rank"
-    invitation_message: "Invitation message"
-    invite_description: '<a href="%{url}">Edit your preferences to put some text about yourself here.'
     if_cant_find: "If you can't find the message, we can"
     if_mistake_see_admin: "If this is a mistake, please talk to the site administrator about your account."
     if_not_you: "If that's not you, please"
+    inactive_in_group: "Group members who have not activated their account"
+    inherited_group: "group is attached higher in the page tree: can't be detached here"
+    invitation_instructions: "This is a quick way to bring a group of people into the system in one go. Enter a comma-separated list of names and email addresses (one person per line) and after a bit of checking and tweaking on the next page, each of those people will be invited into the system and issued an account with a vaguely adequate username and entirely random password. Anyone who is already here will just be added to the group."
+    invitation_message: "Invitation message"
+    invitation_preview_instructions: "Fields in red have validation problems. That usually means an email address or login needs checking. Hover your mouse pointer over the affected field to find out more. Fields in grey show that we already have that person here (based on their email address). You can still bring them into the group but you can't edit their details here."
+    invite_description: '<a href="%{url}">Edit your preferences to put some text about yourself here.'
+    invite_into_group: "Invite people into the %{name} group"
     is_free_and_quick: " is free and only takes a moment"
     joined_on: "Joined on"
+    last_sent: "last sent"
     log_in: 'log in'
     log_in_or_register: "Please log in here. If you haven't already, you will need to <a href='/register'>register</a> first."
     log_out: "log out"
@@ -179,43 +238,64 @@ en:
     login_unknown: "Sorry: we don't recognise that combination of username and password."
     logout_message: "You are logged out. Bye!"
     member: "member"
-    message_delivered: "Message delivered"
-    message_preview_introduction: "This is a snapshot of the message that was delivered to you %{date}. If it contains instructions they may now be out of date."
-    must_be_empty: "must be empty"
+    member_count:
+      zero: "No members."
+      one: "One member"
+      other: "%{count} members"
     message_adhoc: "This is an ad-hoc message you can send at any time."
     message_administrative: "This message is sent automatically"
-    message_group_adhoc: 'It is restricted to members of the <a href="%{href}">%{name}</a> group.'
-    message_group_administrative: "It is sent automatically"
+    message_delivered: "Message delivered"
     message_function:
-      welcome: "when someone completes the registration and email-confirmation process."
-      password_reset: "when someone asks to reset their password."
       activation: "when someone registers here."
-      invitation: "when someone is invited to visit the site."
-      group_welcome: "when someone is admitted to the group."
       group_invitation: "when someone is invited into the group."
+      group_welcome: "when someone is admitted to the group."
+      invitation: "when someone is invited to visit the site."
+      password_reset: "when someone asks to reset their password."
+      welcome: "when someone completes the registration and email-confirmation process."
+    message_group_adhoc: 'It is restricted to members of the <a href="%{href}">%{name}</a> group.'
+    message_group_administrative: "It is sent automatically"
+    message_preview_introduction: "This is a snapshot of the message that was delivered to you %{date}. If it contains instructions they may now be out of date."
+    mistaken_access_error: "If you think that's a mistake, and that you should be allowed to do whatever it was you just tried to do, please contact your site administrator."
+    must_be_empty: "must be empty"
     navigation:
-      account: "Your account"
+      account: "Preferences"
       activate: "Activate account"
       admin: "Admin"
       dashboard: "Dashboard"
       directory: "Directory"
       greeting: "Hello %{name}"
       help: "Help"
-      readers: "Members"
-      preferences: "Preferences"
-      profile: "Profile"
+      loading: "Loading..."
       log_in: "Log in"
       log_out: "Log out"
-      loading: "Loading..."
+      preferences: "Preferences"
+      profile: "Profile"
+      readers: "Members"
       register: "Register"
       your_account: "Preferences"
+    never_sent: 'never sent'
     new_account: "Register here"
+    new_group: "new group"
     new_password: "New password"
     new_password_instructions: "Please enter and confirm the new password you would like to use. It should be at least six characters long, nothing obvious or typical and with at least one non-letter character."
     'no': "no"
     no_description: "No description available"
+    no_invitation_message: "This group has no invitation message. You will need to create one before you can invite people into it."
+    no_mobile: "no mobile"
+    none_option: "<none>"
+    no_phone: "no phone"
+    no_postal_address: "no address"
+    nobody_to_list: "There is nobody to display here."
+    none: "none"
     notes: "notes"
+    optional_login: "[login]"
+    optional_phone: "[phone]"
+    or_edit_preferences: 'You can also <a href="%{url}">edit your account preferences</a>.'
+    or_edit_profile: 'You can also <a href="%{url}">edit your profile</a> to add more information about yourself.'
+    other_messages: "Ad-hoc messages"
+    page_not_public: "The page you have requested is not public. Please log in. If your account has the necessary permission you will be taken straight there."
     page_permission_denied: "You don't have permission to see the page that you have requested."
+    page_private: "Sorry: you don't have permission to view that page."
     password: "Password"
     password_incorrect: "Sorry. Wrong password."
     password_mismatch: "Passwords don't match! Please try again."
@@ -234,17 +314,31 @@ en:
     please_read_our: "Please read our"
     please_register: "Please take a moment to choose a login and password. We need your email address to confirm your identity and send administrative messages: any other information you can fill in later."
     please_use_form: "Please use the registration form"
-    preferences_intro: "You can use this form to change your preferences and enter a bit more information about yourself."
-    profile_intro_private: "The information that you put in here is made available to other members both on the site and in their address books. It is not available to the public and nobody will see it who is not logged in to this site."
+    preferences_intro: "Use this form to change your account preferences."
+    preview_and_send_message: "Preview and send message"
+    private_page_explanation: "The pages selected on the left are only visible to the people selected on the right (unless another group is also given permission to see that page)."
+    private_pages: "Private pages"
     profile_intro_grouped: "The information that you put in here is made available to the other members of your groups both on the site and in their address books. It is not available to the public or to users of this site outside your groups."
+    profile_intro_private: "The information that you put in here is made available to other members both on the site and in their address books. It is not available to the public and nobody will see it who is not logged in to this site."
     profile_intro_public: "The information that you put in here is made visible to the public. Email addresses are spam-protected but your contact information will be visible to everyone."
+    public_if_no_groups: "Leave all groups unchecked for public access"
+    reader: 'Reader'
     reader_admin: "Reader administration"
+    reader_configuration_page: "reader settings"
     reader_emails: "Administrative messages"
-    reader: 'Reader'
     reader_logged_in_as: "You are logged in as %{name}."
+    reader_required: "Sorry: this part of the site requires an account."
     reader_saved: "Reader saved"
     readers: 'People'
-    readers_introduction: "This is a list of everyone who has joined the site. It's only visible to logged-in users."
+    readers_introduction_edit: 'You can update your listing by <a href="%{url}">editing your profile</a>.'
+    readers_introduction_grouped: "This is a private directory and will only show people who are in the same groups as you."
+    readers_introduction_none: "This site does not provide a directory of members."
+    readers_introduction_private: "This is a private directory visible only to logged-in users of the site."
+    readers_introduction_public: "Click on a person to see their profile, contact information and other details."
+    readers_title: "Directory"
+    really_delete_group: "Are you sure you want to completely remove the '%{name}' group? This cannot be undone."
+    really_delete_message: "Are you sure you want to delete the message '%{title}'? This cannot be undone."
+    really_delete_reader: "Are you sure you want to remove the reader %{name}? This cannot be undone."
     register: "register"
     registration: "registration"
     registration_disallowed: "Sorry. This site does not allow visitors to register"
@@ -253,15 +347,21 @@ en:
     reset_message_instructions: "Thank you. A message has been sent containing the instructions for setting a new password. Remember it hasn't changed yet and won't until you follow the instructions in the message. If you remember your old password, you can just carry on using it and ignore the reset message."
     reset_message_sent: "Password-reset instructions have been emailed to you"
     reset_not_found: "Password-reset code not found"
-    sorry_reset_not_found: "Sorry: the system can't find you. That link must have been garbled somewhere along the line. Please paste the 20-character confirmation code into the box below and we'll try again."
     reset_password: "Reset your password"
     restart_password_change: "Send another password-reset message"
     return_to_page: "return to the page you were looking at before you started registering"
     select_all: "Select all"
     selected_people: "Selected people"
     send_it_again: "send it again"
+    send_message: "Send message"
     send_reset_button: "send me instructions"
+    send_to: "Send to"
     sent_on: "sent %{date}"
+    sent_to_group: "sent automatically to the %{name} group"
+    sent_to_these_groups: "sent automatically to these groups"
+    separator: " &raquo; "
+    set_message_function: "Message function"
+    set_message_groups: "Message groups"
     set_new_password: "set new password"
     showing: "Showing"
     showing_of_total:
@@ -271,92 +371,33 @@ en:
     some_deliveries_failed: "Some deliveries failed"
     sorry: "sorry"
     sorry_access_denied: "Sorry: access denied"
+    sorry_reset_not_found: "Sorry: the system can't find you. That link must have been garbled somewhere along the line. Please paste the 20-character confirmation code into the box below and we'll try again."
     spam_trap: "it's a spam trap and shouldn't be visible"
     status_check: "Please wait: loading controls"
+    subgroups: "Groups within %{name}"
+    subject: "Subject"
+    subscriptions: "subscriptions"
     terms_and_conditions: "terms and conditions"
     thanks_activated: "Thank you! Your account has been activated."
     thanks_and_activation_instructions: "Thank you for registering. Now please check your email. We have sent a message containing a link that will automatically activate your account and log you in."
     this_is_your_page: "This is the page that other (logged-in) site visitors will see when they click on your name."
+    this_message_functional: "This is the %{function} message."
+    unsent_in_group: "Group members who have not received this message"
+    update_account: "Save changes"
     username: "username"
+    vcard: "vcard"
+    vcard_file: "address book file"
     welcome_back: "Welcome back"
     welcome_message: "Welcome message"
+    welcome_please_log_in: '<span class="greeting">Welcome!</span> To take part, please <a href="%{login_url}">log in</a> or <a href="%{register_url}">register</a>.'
     wrong_email: "you think you might have put the wrong email address in,"
     'yes': "yes"
-    your_description: "Some text for your profile page"
+    you_are_not_shared: "You have chosen not to share your contact information."
+    your_description: "Your profile text"
     your_email: "Your email address"
     your_name: "Your name"
-    send_to: "Send to"
-    reader_configuration_page: "reader settings"
-    welcome_please_log_in: '<span class="greeting">Welcome!</span> To take part, please <a href="%{login_url}">log in</a> or <a href="%{register_url}">register</a>.'
-    everyone_unsent: "Anyone who has not received this message"
-    everyone_inactive: "Anyone who has not activated their account"
-    everyone: "Everyone"
-    create_message: "Create new message"
-    send_message: "Send message"
-    edit_message: "Edit message"
-    delete_message: "Delete message"
-    this_message_functional: "This is the %{function} message."
-    preview_and_send_message: "Preview and send message"
-    really_delete_message: "Are you sure you want to delete the message '%{title}'? This cannot be undone."
-    delete_reader: "delete reader"
-    really_delete_reader: "Are you sure you want to remove the reader %{name}? This cannot be undone."
-    never_sent: 'never sent'
-    for: 'for'
-    home: 'home'
-    reader_required: "Sorry: this part of the site requires an account."
-    update_account: "Save changes"
-    create_account: "Register"
-    separator: " &raquo; "
-    vcard_file: "address book"
-    you_are_not_shared: "You have chosen not to share your contact information."
-
-    # group
-    group: "group"
-    subscriptions: "subscriptions"
-    inherited_group: "group is attached higher in the page tree: can't be detached here"
-    public_if_no_groups: "Leave all groups unchecked for public access"
-    allowed_groups: "Allow access only to:"
-    page_private: "Sorry: you don't have permission to view that page."
-    none: "none"
-    new_group: "new group"
-    group_members: "Group members"
-    private_pages: "Private pages"
-    admin_messages: "Administrative messages"
-    other_messages: "Ad-hoc messages"
-    create_new_message: "Send a new message"
-    delete_message: "delete message"
-    create_welcome: "create welcome"
-    create_invitation: "create invitation"
-    last_sent: "last sent"
-    private_page_explanation: "The pages selected on the left are only visible to the people selected on the right (unless another group is also given permission to see that page)."
-    sent_to_group: "sent automatically to the %{name} group"
-    sent_to_these_groups: "sent automatically to these groups"
-    group_welcome: "This is the welcome message"
-    group_invitation: "This is the invitation message"
-    all_in_group: "Everyone in the group"
-    inactive_in_group: "Group members who have not activated their account"
-    unsent_in_group: "Group members who have not received this message"
-    group_page: "group page"
-    for_group: "for the %{name} group"
-    add_members: "add members"
-    delete_group: "delete group"
-    really_delete_group: "Are you sure you want to completely remove the '%{name}' group? This cannot be undone."
-    edit_group: "edit group"
-    belongs_to_group: 'This message belongs to the <a href="%{href}">%{name}</a> group.'
-    belongs_to_these_groups: "This message is sent to these groups:"
-    invite_into_group: "Invite people into the %{name} group"
-    invitation_instructions: "This is a quick way to bring a group of people into the system in one go. Enter a comma-separated list of names and email addresses (one person per line) and after a bit of checking and tweaking on the next page, each of those people will be invited into the system and issued an account with a vaguely adequate username and entirely random password. Anyone who is already here will just be added to the group."
-    check_invitation_message: "Preview invitation message"
-    no_invitation_message: "This group has no invitation message. You will need to create one before you can invite people into it."
-    create_invitation_message: "create invitation message"
-    check_invitation_list: "Check the invitation list"
-    invitation_preview_instructions: "Fields in red have validation problems. That usually means an email address or login needs checking. Hover your mouse pointer over the affected field to find out more. Fields in grey show that we already have that person here (based on their email address). You can still bring them into the group but you can't edit their details here."
-    full_name: "full name"
-    email: "email"
-    optional_phone: "[phone]"
-    optional_login: "[login]"
-    page_not_public: "The page you have requested is not public. Please log in. If your account has the necessary permission you will be taken straight there."
-
+  readers: "Readers"
+  settings: "Settings"
   time:
     formats:
       date: "%B %e, %Y"