droom 0.4.3 → 0.5.3

data/app/views/droom/users/show/_profile.html.haml

@@ -0,0 +1,33 @@
+- user ||= @user
+
+#user
+  .header
+    = link_to "X", '#', :class => "closer", :data => {:action => "close"}
+    %h2.titlebar
+      = t :profile
+    
+  .user
+    .mugshot.full{:style => "background-image: url(#{user.image.url('thumb')})"}
+    .detail
+      %h3
+        = user.colloquial_name
+
+      %p.contact
+        - if user.organisation
+          %strong
+            = user.organisation.name
+            %br
+        - if user.email?
+          = mail_to user.email
+        - if user.email? && user.phone?
+          = t :or
+        - if user.phone?
+          = user.phone
+
+      - if Droom.use_biogs?
+        .description
+          - if user.description?
+            = sanitize(user.description.html_safe)
+          - else
+            %p
+              = t :no_user_description

data/app/views/droom/users/show/_tabled.html.haml

@@ -0,0 +1,28 @@
+- tabled ||= nil
+- user ||= tabled || @user
+- rowid = "user_#{user.id}"
+- cssclass = "user"
+
+%tr{:id => rowid, :class => cssclass, data: {refreshable: true, url: user_url(user, view: 'tabled', format: :js)}}
+  %td.name
+    = link_to user.informal_name, edit_user_url(user), :data => {:action => "popup", :affected => "##{rowid}"}
+
+  %td.email
+    = mail_to user.email
+
+  %td.confirmed.toggle{:data => {:hoverable => true}}
+    - if user.confirmed?
+      %span.yes
+    - else
+      = link_to " ", user_url(user, :user => { :confirm => true }, :format => :js), :class => "no", :method => :put, :remote => true, :data => {:action => "affect", :affected => "##{rowid}" }
+
+  %td.d.admin.toggle{:data => {:hoverable => true}}
+    - if user.admin?
+      = link_to " ", user_url(user, :user => { :admin => false }, :format => :js), :class => "yes", :method => :put, :remote => true, :data => {:action => "affect", :affected => "##{rowid}" }
+    - else
+      = link_to " ", user_url(user, :user => { :admin => true }, :format => :js), :class => "no", :method => :put, :remote => true, :data => {:action => "affect", :affected => "##{rowid}" }
+
+  - groups = Droom::Group.all
+  - groups.each_with_index do |group, i|
+    %td.toggle.group{:class => "g_#{group.id} #{'d' if i == groups.length-1}", :data => {:hoverable => true}}
+      = render :partial => "droom/memberships/toggle", :locals => {:group => group, :user => user}

data/config/initializers/chronic.rb

@@ -0,0 +1,2 @@
+require 'chronic'
+Chronic.time_class = Time.zone

data/config/initializers/devise.rb

@@ -1,3 +1,5 @@
+require 'devise/strategies/cookie_authenticatable'
+
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
 Devise.setup do |config|
@@ -70,7 +72,8 @@ Devise.setup do |config|
   # Notice that if you are skipping storage for all authentication paths, you
   # may want to disable generating routes to Devise's sessions controller by
   # passing :skip => :sessions to `devise_for` in your config/routes.rb
-  config.skip_session_storage = [:http_auth]
+  # config.skip_session_storage = [:http_auth]
+  config.skip_session_storage = [:http_auth, :token_auth]
 
   # ==> Configuration for :database_authenticatable
   # For bcrypt, this is the cost for hashing the password and defaults to 10. If
@@ -236,5 +239,35 @@ Devise.setup do |config|
   #
   # When using omniauth, Devise cannot automatically set Omniauth path,
   # so you need to do it manually. For the users scope, it would be:
-  config.omniauth_path_prefix = "/droom/users/auth"
+  # config.omniauth_path_prefix = "/droom/users/auth"
+
+  config.warden do |manager|
+    # for shared-cookie auth
+    manager.strategies.add(:cookie_authenticatable, Devise::Strategies::CookieAuthenticatable)
+    manager.default_strategies :cookie_authenticatable, :database_authenticatable, scope: :user
+  end
+
+  # Set shared domain cookie on sign in or any other user-identifying step
+  #
+  Warden::Manager.after_set_user do |user, warden, options|
+    warden.raw_session["session_validity_check"] = user.reset_session_id!
+    Droom::AuthCookie.new(warden.cookies).set(user)
+  end
+
+  # Unset shared domain cookie on sign out.
+  #
+  Warden::Manager.before_logout do |user, warden, options|
+    Droom::AuthCookie.new(warden.cookies).unset
+    user.clear_session_id! if user
+  end
+    
+  # Sign out unless session id is valid, if user retrieved from session
+  #
+  Warden::Manager.after_fetch do |user, warden, options|
+    unless user.session_id == warden.raw_session["session_validity_check"]
+      warden.logout
+      throw :warden, message: :unauthenticated
+    end
+  end
+
 end

data/config/initializers/paperclip.rb

@@ -1,11 +1,7 @@
 require 'paperclip'
 
-Paperclip.interpolates :dav_root do |attachment, style|
-  Droom.dav_root
-end
-
-Paperclip.interpolates :person do |attachment, style|
-  attachment.instance.person_id
+Paperclip.interpolates :user do |attachment, style|
+  attachment.instance.user_id
 end
 
 # Slug in this context will be the identifying string for either the group or the event
@@ -24,3 +20,12 @@ Paperclip.interpolates :category_and_slug do |attachment, style|
   fragment = "#{fragment}/#{attachment.instance.category.slug}" if attachment.instance.category
   fragment
 end
+
+require 'paperclip/media_type_spoof_detector'
+module Paperclip
+  class MediaTypeSpoofDetector
+    def spoofed?
+      false
+    end
+  end
+end

data/config/locales/devise.en.yml

@@ -26,7 +26,7 @@ en:
       failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
       success: "Successfully authenticated from %{kind} account."
     passwords:
-      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+      no_token: "You can't access this page without coming from a password reset email. If you have come from a password reset email, please make sure you used the full URL provided."
       send_instructions: "You will receive an email with instructions about how to reset your password in a few minutes."
       send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
       updated: "Your password was changed successfully. You are now signed in."

data/config/locales/en.yml

@@ -2,61 +2,75 @@
 # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 en:
-  activerecord:
-    attributes:
-      droom:
-        document:
-          category: "Category"
-          name: "Name"
-          filename: "Filename"
-          filesize: "Size"
-          created_at: "Created"
-          attached_to: "Attached to"
-          name: "Document name"
-          description: "Document description"
-        event:
-          name: "Event name"
-          venue_name: "Choose or add a location"
-          start_time: "Time"
-          finish_time: "Finish (optional)"
-          start_date: "Date"
-          calendar_id: "Calendar"
-          private: "hidden unless attending"
-        folder: 
-          name: "Folder name"
-        organisation:
-          name: "Name"
-          url: "Web link"
-          description: "Mission and description"
-        person:
-          invite_on_creation: "Invite on creation"
-          admin_user: "...as admin user"
-          post_line1: "Address"
-          post_line2: ""
-          post_city: "City"
-          post_region: "Region"
-          post_country: "Country"
-          post_code: "Postcode"
-          dob: "Date of birth"
-          organisation_id: "Organisation"
-        scrap:
-          scraptype:
-            image: "Image"
-          scraptype_text: "Text"
-          scraptype_video: "Video"
-          scraptype_link: "Link"
-          scraptype_quote: "Quote"
-        user:
-          name: "Preferred name"
-          email: "Private email address"
-          update_person_email: "Set your public address to match"
+  helpers:
+    label:
+      document:
+        category: "Category"
+        name: "Name"
+        filename: "Filename"
+        filesize: "Size"
+        created_at: "Created"
+        attached_to: "Attached to"
+        name: "Document name"
+        description: "Document description"
+      event:
+        name: "Event name"
+        venue_name: "Choose or add a location"
+        start_time: "Time"
+        finish_time: "Finish (optional)"
+        start_date: "Date"
+        calendar_id: "Calendar"
+        private: "hidden unless attending"
+      group:
+        name: "Group name"
+        description: "Notes"
+        directory: "Show in directory"
+      folder: 
+        name: "Folder name"
+        slug: "Folder path"
+      organisation:
+        name: "Name"
+        url: "Web link"
+        description: "Mission and description"
+      permission:
+        service_id: "Service"
+        name: "Title or link text"
+        url: "Link destination"
+        body: "Body text"
+      scrap:
+        name: "Title"
+        url: "Link destination"
+        body: "Body text or quote"
+        note: "Caption"
+        scraptype_image: "Image"
+        scraptype_text: "Text"
+        scraptype_video: "Video"
+        scraptype_link: "Link"
+        scraptype_quote: "Quote"
+      service:
+        name: "Name"
+        description: "Notes"
+        slug: "Key"
+      user:
+        given_name: "Given name"
+        family_name: "Family name"
+        chinese_name: "中国姓名"
+        email: "Email"
+        phone: "Telephone"
+        mobile: "Mobile/cell"
+        address: "Postal address"
+        dob: "Date of birth"
+        organisation_id: "Organisation"
+        group_ids: "Group memberships"
+        send_confirmation: "Invite now"
+        admin: "Administrator?"
+        gender: "Gender:"
+        gender_f: "female"
+        gender_m: "male"
+        group_ids: "Groups"
+        send_confirmation: "Send an invitation message when saved"
+        defer_confirmation: "Send no email"
   preferences:
-    dav:
-      enabled?: "Use DAV folder"
-      strategy:
-        everything: "Sync everything"
-        relevant: "Sync only relevant documents"
-        clicked: "Copy on command only"
     dropbox:
       strategy:
         everything: "Sync everything"
@@ -77,36 +91,48 @@ en:
       next: "»"
   account: "Account"
   action: "*"
+  active: "active"
   admin: "Admin"
   advanced_search: "Search terms"
   advanced_search_link: "...advanced search"
   quick_search_prompt: "Type anything here"
   attachments: "Attachments"
   attending: "Attending"
-  by_name: "Search by name or filename"
-  by_name_or_email: "Search by name or email"
   cancel: "cancel"
   mon: "MON"
   devices: "Devices"
   dom: "00"
   year: "YEAR"
-  add_event: "add an event"
-  add_document: "add a document"
+  access_control: "Access control"
+  add_event: "Add Event"
+  add_document: "Add document"
   add_document_to: "Add a document to the"
-  add_folder: "add a folder"
-  add_root_folder: "add a new root folder"
-  add_member: "add group member"
+  add_folder: "Add Folder"
+  add_root_folder: "Add root folder"
+  add_member: "Add group member"
   add_member_to: Add a member to the
-  add_page: "add a page"
-  add_person: "add a person"
-  add_group: "add a group"
+  add_page: "Add page"
+  add_permission: "Add a permission"
+  add_group: "Add group"
+  add_new_user: "Invite a new data room user"
+  add_permission: "Add permission"
+  add_service: "Add service"
+  add_subfolder: Add sub-folder
   add_to_stream: "add to stream"
-  add_subfolder: add a sub-folder
-  by: "by"
+  add_user: "Add user"
   added_to: "has been added to '%{group}'."
+  backto: "what you were doing before"
+  by: "by"
+  by_name: "Search by name or filename"
+  by_name_or_email: "Search by name or email"
+  by_title_or_filename: "by title or filename"
+  calendar: "Calendar"
+  calendar_introduction: 'This is a chronological list of all our future events, with the next first.<br />You can also see a similar <a href="%{url}">list of all past events</a>.'
+  calendar_past_introduction: 'This is a chronological list of all our past events, with the most recent first.<br />You can also see a similar <a href="%{url}">list of events coming up</a>.'
   continue: "Continue"
   copy: "copy"
   dashboard: "Dashboard"
+  directory_introduction: "The directory organises people by group. To find someone quickly, start typing their name on the right."
   document_created: "Document '%{name}' created"
   download_folder: "download as zipfile"
   hello: "Hello world"
@@ -116,28 +142,33 @@ en:
   clear_search: "Clear search"
   click_to_choose_file: "Click to choose a file"
   click_to_upload: "Click here to choose an image file"
-  dav_preferences: "Document reader preferences"
+  close: "Close"
   drop_to_upload: "or drop a picture in this box"
   confirm_delete_document: "Are you sure you want to delete the document '%{name}'? This cannot be undone."
   confirm_delete_folder: "Are you sure you want to delete the folder '%{path}'? This will permanentely delete all the documents in the folder."
   confirm_delete_event: "Are you sure you want to delete the event '%{name}'? This cannot be undone."
   confirm_delete_group: "Are you sure you want to delete the group '%{name}'? Its members will remain the system but the group cannot be retrieved."
   confirm_delete_page: "Are you sure you want to delete the page '%{title}'? This cannot be undone."
-  confirm_delete_person: "Are you sure you want to delete the person '%{name}'? This cannot be undone."
+  confirm_delete_permission: "Are you sure you want to delete the permission '%{name}' from the '%{service_name}' service? All related grants will be deleted."
+  confirm_delete_service: "Are you sure you want to delete the service '%{name}' and all associated permissions? This cannot be undone"
+  confirm_delete_user: "Are you sure you want to delete the person '%{name}'? This cannot be undone."
   confirm_remove_document: "Are you sure you want to remove the document '%{name}'?" 
   confirm_remove_member: "Are you sure you want to remove '%{name}' from '%{group}'?"
   confirm_uninvite_group: "Are you sure you want to remove '%{name}' from '%{event_name}'?"
   confirm_uninvite_person: "Are you sure you want to remove '%{name}' from '%{event_name}'?"
   contact_information_unavailable: "No contact"
   copy_to_dropbox: "Copy folder to dropbox"
-  delete_event: "remove event"
-  delete_folder: "delete folder"
-  delete_group: "delete group"
-  delete_scrap: "remove"
-  delete_person: "delete person"
+  delete_event: "Delete Event"
+  delete_folder: "Delete Folder"
+  delete_group: "Delete Group"
+  delete_scrap: "Remove"
+  delete_user: "Delete Person"
+  delete_service: "Delete Service"
+  delete_permission: "Delete Permission"
   confirm_delete_scrap: "Are you sure you want to remove this %{type} scrap?"
   containing: "containing"
-  detach_upload: "detach upload"
+  detach_upload: "Detach Upload"
+  dropbox_access_revoked: "We have detached from your dropbox. You can delete the hkfx folder."
   attachment_count: 
     zero: "No documents attached."
     one: "One document attached."
@@ -159,16 +190,22 @@ en:
   dropbox_copy_personal: "Copy only the most useful folders"
   dropbox_copy_topics: "Copy only selected topics"
   dropbox_copy_selected: "Copy only when you click"
-  dropbox_introduction: "We can copy document folders to your dropbox either automatically or in response to your selections. They will be placed within a new '%{name}' folder. To begin, please click the link below and log into your dropbox."
+  dropbox_introduction: "This will create a '%{name}' folder in your dropbox into which you can copy folders and documents."
   edit: "Edit"
-  edit_event: "edit event"
-  edit_folder: "edit folder"
-  edit_group: "edit group"
-  edit_person: "edit person"
-  edit_scrap: "edit"
-  edit_profile: "edit profile"
-  edit_organisation: "edit organisation"
-  edit_account: "edit preferences"
+  edit_account: "Edit account settings"
+  edit_account_of: "Edit account settings for %{name}"
+  edit_event: "Edit event"
+  edit_event_folder: "Edit event folder"
+  edit_folder: "Edit folder"
+  edit_group: "Edit group"
+  edit_person: "Edit person"
+  edit_profile: "Edit profile"
+  edit_profile_of: "Edit profile for %{name}"
+  edit_scrap: "Edit"
+  edit_organisation: "Edit organisation"
+  edit_permission: "Edit permission"
+  edit_service: "Edit service"
+  edit_user: "Edit user"
   edit_your_preferences: "Edit your account settings"
   edit_your_preferences_note: "These are administrative settings like your password and private email address. "
   edit_your_profile: "Edit your profile"
@@ -179,18 +216,27 @@ en:
   events_in: "Events in %{period}"
   events_on: "Events on %{day}"
   event_created: "Event '%{name}' created"
+  event_introduction: ""
+  event_no_description: "No description available"
   expel: "remove from group"
+  file_under: "File under"
   find_documents: "Find documents"
+  find_document_notes: "Type a fragment of a filename or title here to see all matching documents. Full contents search will be added soon."
   find_people: "Find people"
+  find_people_notes: "The quickest way to find a particular person is to start typing their name or email address here."
   folder: "folder"
   follow_stream: "Follow the stream in an RSS reader"
+  future_events: "Events coming up"
   group: "group"
   group_admin: "Directory"
   group_created: "Group '%{name}' created"
+  invite_person: "invite a new person"
+  invite_to_group: "Invite and add to group"
   calendar: "Calendar"
   library: "Library" 
   networks: "Networks"
   next: "Next"
+  no_events: "No events to display."
   normal_RSS_link: "normal RSS link"
   personal_RSS_link: "personal link"
   previous: "Previous"
@@ -201,13 +247,14 @@ en:
   update_person_email: "also update your public email address"
   your_preferences_saved: "Thank you. Your preferences have been updated"
   posted: "Posted"
+  posted_by: "posted by"
   directory: "Directory"
   hide_empty_folders: "hide empty folders"
   invite: "Invite"
   invite_group: "invite a group"
   invite_group_to: "Invite a group to %{name}"
-  invite_person: "invite a person"
-  invite_person_to: "Invite a person to %{name}"
+  invite_user: "Invite a new user"
+  invite_user_to: "Invite a person to %{name}"
   group_name: "Name"
   group_description: "Description"
   invitations_highlighted: "Events to which you are invited will be highlighted."
@@ -216,7 +263,13 @@ en:
   copy_to_dropbox: "copy to dropbox"
   loading_people: "Loading people"
   loading_documents: "Loading documents"
-  
+  masthead:
+    admin: "Admin"
+    configuration: "Configuration"
+    search: "Search"
+  message_sent: "Message sent"
+  no_attachments: "Nothing has been attached"
+  no_invitations: "Nobody has been invited"
   page_title: "Page title"
   page_slug: "Slug"
   page_video_id: "Youtube video id"
@@ -225,8 +278,11 @@ en:
   page_slug_explanation: "The 'slug' is a unique identifier that we use to build an address for this page. Users will find the page at /help/slug. If you leave this field blank we will derive a slug automatically from the page title."
   page_summary_explanation: "The page summary is a two- or three-line description that we use whenever this page appears in a list. You would normally see it on the help index page."
   page_youtube_explanation: "Soon there will be a little video-finding gadget here, but to start with please paste in a video id. The embedding will be handled automatically. Omit if not relevant."
-  
   password_notice: "You must choose a password before you can proceed (unless you remember your old one: in that case you can just log in)."
+  password_reset_complete: "Thank you for persevering with all the account administration. Your password has been reset and you have been signed in automatically."
+  password_reset_instructions: "Please enter your email address below. A message will be sent containing a link that will let you reset your password."
+  password_reset_message_sent: "A message has been sent to your email address containing a link that will let you reset your password. Please allow a few minutes for it to arrive, and keep an eye on your spam folder. The address it will come from is %{sender}."
+  password_reset_welcome: "Please use the form below to set a new password for your account. A confirmation box will appear when your password meets the requirements, and the submit button will go green and become clickable when the passwords match."
   person_title: "Title"
   person_forename: "Forename"
   person_name: "Name"
@@ -239,10 +295,13 @@ en:
   person_post_region: "Region"
   person_post_country: "Country"
   person_post_code: "Post code"
+  profile: "Profile"
+  send_message: "Send Message"
   has_been_created: "has been added to the system"
   and_invited: "and invited to log in."
   new_membership_instructions: "Start typing a name here and a list of possible matches will appear. Click on someone to add them to the %{name} group."
   new_event_note: ""
+  no_user_description: "This person has not yet supplied a description of him or herself."
   type_name: "Start typing a name"
   profile: "Profile"
   search: "Search"
@@ -264,10 +323,12 @@ en:
   loading_stream: "Loading stream: please wait."
   finish_time: "Finish?"
   event_url: "Web link?"
+  new_user_note: "An invitation message will be sent automatically to this person. If you have assigned group membership then the invitation may be specific to the group."
   other_documents: "Other available documents"
   personal_calendar_feed: "Personal calendar subscription"
   general_calendar_feed: "General calendar subscription"
   more_in_calendar: "More future events..."
+  more_past_events: "More past events..."
   password_confirmation_instructions: "Please confirm your password."
   password_instructions: "Please choose a password of at least six letters."
   password_leave_same: "Leave this field blank to keep your existing password."
@@ -279,14 +340,18 @@ en:
   save_event: "Save event"
   save_document: "Save document"
   save_folder: "Save folder"
+  save_permission: "Save permission"
   save_person: "Save person"
+  save_service: "Save service"
   save_your_profile: "Save profile"
   send_reset_instructions: "Send reset instructions"
+  signed_in_as: "Signed in as <strong>%{name}</strong>."
   suggestions: "Suggestions"
-  manage_folders: "manage folders"
-  manage_groups: "manage groups"
-  manage_users: "manage users"
-  manage_venues: "manage locations"
+  manage_folders: "Folders"
+  manage_groups: "Groups"
+  manage_permissions: "Access"
+  manage_users: "Users"
+  manage_venues: "Places"
   map: "Map"
   my_future_events: "Your invitations"
   my_past_events: "Your past events"
@@ -298,31 +363,61 @@ en:
   quick_search: "Quick search"
   future_events: "Events coming up"
   event_name: "Event name"
+  search_youtube: "Search Youtube"
+  save_user: "Save user"
   slug_note: "Spaces and odd characters will be replaced with dashes"
+  stream_events: "Stream events"
   to: "to"
   venue_name: "Venue name"
   venue_post_code: "Post Code"
   of_the: "of the"
   preferred_name_explanation: "This is the name by which we will address you. To change your directory entry, please edit your profile."
+  no_future_events: "We have no current or future events to display."
+  no_past_events: "We have no past events to display."
   no_people: "Sorry: there are no directory entries accessible by your account."
+  no_results: "Sorry: nothing to show here."
   no_stream: "Nothing yet to show here."
+  recent_events: "Past events"
+  save_profile: "Save changes"
+  save_your_profile: "Save changes"
+  save_preferences: "Save changes"
+  save_your_preferences: "Save changes"
+  set_password: "Set password"
+  quick_search: "Quick search"
   search_still_dumb: "This is a very basic title search. Full-text coming soon."
+  set_password_preamble: "We notice this is the first time that your account has been used. Before we go any further, please choose a password to secure the account."
+  show_future_events: "future events"
+  show_past_events: "past events"
   scrap_title: "Title (optional)"
   unattached_folder_note: "A folder not attached to anything is visible to everyone and can be used to share documents of general interest."
   user_admin: "User admin"
+  sign_out: "Sign out"
   stream: "Stream"
+  thank_you: "Thank you"
   uninvite: "uninvite"
+  more_documents_count:
+    zero: "No more documents"
+    one: "one more document..."
+    other: "%{count} more documents..."
+  more_subfolders_count:
+    zero: "No subfolders"
+    one: "and one subfolder..."
+    other: "and %{count} subfolders..."
   more: "more..."
   accept: "accept"
   reject: "reject"
   phone_unknown: "phone unknown"
   group_already_invited: "Already invited: select to reissue any missing personal invitations."
-  users_introduction: "Here 'people' are the people listed in the directory, and 'users' are the accounts they use to log in. The distinction is needed because a person can appear in the directory without having a login account and a user can log in to administer the site without being a person in the directory."
-  users_warning: "Most of these columns are now clickable and can be used to make quite large changes quickly. Clicking a green button under 'directory', for example, will delete a person object and all its group memberships. Please handle with care."
+  users_introduction: "This is a list of everyone known to the data room. It may include many people who do not have access to the data room itself, but whom we authenticate for access to other services."
+  users_admin_introduction: "The main purpose of this page is to manage group membership, which also does a lot to control a person's access to our web services. To begin with only people with interesting group memberships are shown, but if you enter some search text below then the list will also show ungrouped people who match that string. It's a quick way to bring people into groups."
   your_invitations: "Your invitations"
   invitation_successful: "Success: %{name} has been invited."
-  welcome_preamble: "Welcome to the data room. Before we do anything else, please choose a password for your account."
+  welcome_preamble: "Welcome to the Croucher Foundation. We notice that this is the first time you have used your Croucher Foundation account so before we go any further, please choose a password."
   hello_name: "Hello %{name}."
+  uk: "UK"
+  uk_time: "UK time"
+  other: "other"
+  would_you_like_to_return: "You probably want to return to"
   future_event_count:
     zero: "No events coming up"
     one: "One event coming up"
@@ -338,17 +433,24 @@ en:
   time:
     formats:
       natural: "%l:%M%P"
+      natural_date: "%d %B"
       natural_with_date: "%l:%M%P, %d %B %Y"
+      natural_with_year: "%-d %B %Y"
       precise: "%H:%M"
       month_and_year: "%b %Y"
+      minicalendar_title: "%B %Y"
+      minicalendar_month: "%B"
+      year: "%Y"
+      month: "%B %Y"
+      time_on_date: "%l:%M%P on %-d %B %Y"
   date:
     formats:
       dashed_short_date_format: "%d-%m-%Y"
       month_header: "%B %Y"
       natural: "%d %B"
       natural_full: "%l:%M%P, %d %B %Y"
-      natural_with_year: "%d %B %Y"
-      minimal_with_year: "%d %b %Y"
+      natural_with_year: "%-d %B %Y"
+      minimal_with_year: "%-d %b %Y"
       minicalendar_title: "%B %Y"
       minicalendar_month: "%B"
       year: "%Y"
@@ -365,13 +467,6 @@ en:
       password:
         confirmation: "The password and its confirmation do not match"
         too_short: "Your password must have at least 6 letters"
-  msg:
-    groups:
-      unconfirmed: "anyone who hasn't activated their account"
-      personed: "people in the directory"
-      administrative: "administrators"
-      selected: "selected users"
-    droom/user: "users"
 
   apps:
     data_room: "Data<br />Room"