enju_leaf 1.1.0.rc12 → 1.1.0.rc13

data/app/views/user_export_files/_form.html.erb

@@ -0,0 +1,22 @@
+<%= form_for(@user_export_file) do |f| %>
+  <%= f.error_messages %>
+
+  <%= f.hidden_field :mode, value: 'export' if @user_export_file.new_record? %><br>
+  <!--
+  <div class="field">
+    <%= f.label :user_id %><br>
+    <%= @user_export_file.user.username %>
+  </div>
+  <div class="field">
+    <%= f.label :user_export %><br>
+    <%= f.text_field :user_export %>
+  </div>
+  -->
+  <div class="actions">
+    <% if @user_export_file.new_record? %>
+      <%= f.submit t('page.export') %>
+    <% else %>
+      <%= f.submit %>
+    <% end %>
+  </div>
+<% end %>

data/app/views/user_export_files/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing user_export_file</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @user_export_file %> |
+<%= link_to 'Back', user_export_files_path %>

data/app/views/user_export_files/index.html.erb

@@ -0,0 +1,44 @@
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.user_export_file')) -%></h1>
+<div id="content_list">
+
+<table class="table table-striped index">
+  <thead>
+    <tr>
+      <th>Id</th>
+      <th><%= t('activerecord.models.user') %></th>
+      <th><%= t('activerecord.attributes.user_export_file.user_export_file_name') -%></th>
+      <th><%= t('activerecord.attributes.user_export_file.state') -%></th>
+      <th></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @user_export_files.each do |user_export_file| %>
+      <tr class="line<%= cycle("0", "1") -%>">
+        <td><%= link_to user_export_file.id, user_export_file %></td>
+        <td><%= user_export_file.user.try(:username) %></td>
+        <td>
+          <%= link_to user_export_file.user_export_file_name, user_export_file.user_export.url if user_export_file.user_export.path %>
+          <br />
+          <%= user_export_file.created_at %>
+        </td>
+        <td><%= localized_state(user_export_file.current_state) -%></td>
+        <td>
+          <%= link_to t('page.destroy'), user_export_file, method: :delete, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<%= paginate(@user_export_files) %>
+
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li><%= link_to t('page.new', model: t('activerecord.models.user_export_file')), new_user_export_file_path -%></li>
+  </ul>
+</div>

data/app/views/user_export_files/new.html.erb

@@ -0,0 +1,16 @@
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.user_export_file')) -%></h1>
+<div id="content_list">
+
+  <p><%= t('export.are_you_sure_to_export') %></p>
+
+<%= render 'form' %>
+
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li><%= link_to t('page.listing', model: t('activerecord.models.user_export_file')), user_export_files_path -%></li>
+  </ul>
+</div>

data/app/views/user_export_files/show.html.erb

@@ -0,0 +1,31 @@
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.user_export_file')) -%></h1>
+<div id="content_list">
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong><%= t('activerecord.models.user') %></strong>
+  <%= @user_export_file.user.try(:username) %>
+</p>
+
+<p>
+  <strong><%= t('activerecord.attributes.user_export_file.user_export_file_name') -%></strong>
+  <%= link_to @user_export_file.user_export_file_name, @user_export_file.user_export.url if @user_export_file.user_export_file_name %>
+</p>
+
+<p>
+  <strong><%= t('activerecord.attributes.user_export_file.state') -%>:</strong>
+  <%= localized_state(@user_export_file.current_state) -%>
+</p>
+
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li><%= back_to_index(flash[:page_info]) -%></li>
+    <% if current_user.has_role?('Administrator') %>
+      <li><%= link_to 'Resque', resque_path %></li>
+    <% end %>
+  </ul>
+</div>

data/app/views/user_groups/_form.html.erb

@@ -11,23 +11,23 @@
   </div>
   <div class="field">
     <%= f.label :valid_period_for_new_user %><br />
-    <%= f.text_field :valid_period_for_new_user, :class => 'resource_integer' %>
+    <%= f.text_field :valid_period_for_new_user, class: 'resource_integer' %>
   </div>
   <div class="field">
     <%= f.label :number_of_day_to_notify_due_date %><br />
-    <%= f.text_field :number_of_day_to_notify_due_date, :class => 'resource_integer' %>
+    <%= f.text_field :number_of_day_to_notify_due_date, class: 'resource_integer' %>
   </div>
   <div class="field">
     <%= f.label :number_of_day_to_notify_overdue %><br />
-    <%= f.text_field :number_of_day_to_notify_overdue, :class => 'resource_integer' %>
+    <%= f.text_field :number_of_day_to_notify_overdue, class: 'resource_integer' %>
   </div>
   <div class="field">
     <%= f.label :number_of_time_to_notify_overdue %><br />
-    <%= f.text_field :number_of_time_to_notify_overdue, :class => 'resource_integer' %>
+    <%= f.text_field :number_of_time_to_notify_overdue, class: 'resource_integer' %>
   </div>
 
   <% if defined?(EnjuCirculation) and !@user_group.new_record? %>
-    <%= render 'user_groups/checkout_form', :f => f %>
+    <%= render 'user_groups/checkout_form', f: f %>
   <% end %>
 
   <div class="field">

data/app/views/user_groups/edit.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.user_group')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.user_group')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

data/app/views/user_groups/index.html.erb

@@ -1,13 +1,16 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-  <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.user_group')) -%></h1>
+  <h1 class="title"><%= t('page.listing', model: t('activerecord.models.user_group')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
   <tr>
     <th id="position"></th>
     <th><%= t('activerecord.attributes.user_group.name') -%></th>
-    <th><%= t('activerecord.attributes.user_group.display_name') -%></th>
-    <th><%= t('activerecord.attributes.user_group.note') -%></th>
+    <th>
+      <%= t('activerecord.attributes.user_group.display_name') -%>
+      /
+      <%= t('activerecord.attributes.user_group.note') -%>
+    </th>
     <th></th>
   </tr>
 
@@ -18,15 +21,18 @@
         <%= move_position(user_group) -%>
       <%- end -%>
     </td>
-    <td><%= link_to user_group.name, user_group -%></td>
-    <td><%= link_to user_group.display_name.localize, user_group -%></td>
-    <td><%= user_group.note -%></td>
+    <td><%= user_group.name -%></td>
+    <td>
+      <%= link_to user_group.display_name.localize, user_group -%>
+      <br />
+      <%= user_group.note -%>
+    </td>
     <td>
       <%- if can? :update, user_group -%>
         <%= link_to t('page.edit'), edit_user_group_path(user_group) -%>
       <% end %>
       <%- if can? :destroy, user_group -%>
-        <%= link_to t('page.destroy'), user_group_path(user_group), :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to t('page.destroy'), user_group_path(user_group), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <% end %>
     </td>
   </tr>
@@ -38,6 +44,6 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.user_group')), new_user_group_path -%></li>
+    <li><%= link_to t('page.new', model: t('activerecord.models.user_group')), new_user_group_path -%></li>
   </ul>
 </div>

data/app/views/user_groups/new.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.user_group')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.user_group')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

data/app/views/user_groups/show.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.user_group')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.user_group')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
@@ -41,7 +41,7 @@
     <%- @user_group.user_group_has_checkout_types.each do |available_checkout_type| -%>
       <li>
         <%= link_to available_checkout_type.checkout_type.display_name.localize, available_checkout_type.checkout_type -%>
-        (<%= link_to t('page.number_of_days', :count => available_checkout_type.checkout_period), edit_user_group_user_group_has_checkout_type_path(@user_group, available_checkout_type) -%>)
+        (<%= link_to t('page.number_of_days', count: available_checkout_type.checkout_period), edit_user_group_user_group_has_checkout_type_path(@user_group, available_checkout_type) -%>)
       </li>
     <%- end -%>
   </ul>
@@ -59,6 +59,6 @@
   <ul>
     <li><%= link_to t('page.edit'), edit_user_group_path(@user_group) -%></li>
     <li><%= back_to_index(flash[:page_info]) -%></li>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.checkout_type')), new_user_group_user_group_has_checkout_type_path(@user_group) -%></li>
+    <li><%= link_to t('page.new', model: t('activerecord.models.checkout_type')), new_user_group_user_group_has_checkout_type_path(@user_group) -%></li>
   </ul>
 </div>

data/app/views/user_import_files/index.html.erb

@@ -1,15 +1,14 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.user_import_file')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.user_import_file')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
   <thead>
     <tr>
-      <th>Id</th>
+      <th style="width: 30px">Id</th>
       <th><%= t('activerecord.attributes.user_import_file.user_import_file_name') -%></th>
-      <th><%= t('activerecord.attributes.user_import_file.executed_at') -%></th>
-      <th><%= t('activerecord.models.user') -%></th>
       <th><%= t('activerecord.attributes.user_import_file.edit_mode') -%></th>
+      <th><%= t('activerecord.attributes.user_import_file.executed_at') -%></th>
       <th><%= t('activerecord.attributes.user_import_file.state') -%></th>
       <th></th>
     </tr>
@@ -18,15 +17,17 @@
   <tbody>
     <% @user_import_files.each do |user_import_file| %>
       <tr class="line<%= cycle("0", "1") -%>">
-        <td><%= link_to user_import_file.id, user_import_file -%></td>
-        <td><%= link_to user_import_file.user_import_file_name, user_import_file -%></td>
-        <td><%= l(user_import_file.executed_at) if user_import_file.executed_at -%></td>
-        <td><%= link_to user_import_file.user.username, user_import_file.user -%></td>
+        <td><%= link_to (user_import_file.id), user_import_file -%></td>
+        <td>
+          <%= link_to user_import_file.user_import_file_name, user_import_file -%>
+          <br />
+          <%= t('activerecord.models.user') -%>: <%= link_to user_import_file.user.username, user_import_file.user.profile if user_import_file.user.try(:profile) -%></td>
         <td><%= user_import_file.edit_mode -%></td>
+        <td><%= l(user_import_file.executed_at) if user_import_file.executed_at -%></td>
         <td><%= localized_state(user_import_file.current_state) -%></td>
         <td>
           <%= link_to t('page.show'), user_import_file -%>
-          <%= link_to t('page.destroy'), user_import_file, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+          <%= link_to t('page.destroy'), user_import_file, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
         </td>
       </tr>
     <% end %>
@@ -39,6 +40,6 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.user_import_file')), new_user_import_file_path -%></li>
+    <li><%= link_to t('page.new', model: t('activerecord.models.user_import_file')), new_user_import_file_path -%></li>
   </ul>
 </div>

data/app/views/user_import_files/new.html.erb

@@ -1,8 +1,8 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.user_import_file')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.user_import_file')) -%></h1>
 <div id="content_list">
 
-<%= form_for(@user_import_file, :html => { :multipart => true }) do |f| %>
+<%= form_for(@user_import_file, html: { multipart: true }) do |f| %>
   <%= f.error_messages -%>
 
   <div class="field">
@@ -14,7 +14,7 @@
     <%= f.label :edit_mode -%><br />
     <%= f.radio_button :edit_mode, 'create', checked: 'checked' %>
     <%= f.label :edit_mode, t('page.create'), value: 'create' %>
-    <%= f.radio_button :edit_mode, 'update', disabled: true %>
+    <%= f.radio_button :edit_mode, 'update' %>
     <%= f.label :edit_mode, t('page.update'), value: 'update' %>
     <%= f.radio_button :edit_mode, 'destroy' %>
     <%= f.label :edit_mode, t('page.destroy'), value: 'destroy' %>
@@ -32,6 +32,18 @@
     <%= f.label :user_encoding, 'EUC-JP', value: 'euc-jp' %>
   </div>
 
+  <div class="field">
+    <%= f.label :default_user_group_id -%>
+    <%= f.select(:default_user_group_id, @user_groups.collect{|u| [u.display_name.localize, u.id]}) -%><br />
+    <%= t('user_import_file.default_user_group') %>
+  </div>
+
+  <div class="field">
+    <%= f.label :default_library_id -%>
+    <%= f.select(:default_library_id, @libraries.collect{|l| [l.display_name.localize, l.id]}) -%><br />
+    <%= t('user_import_file.default_library') %>
+  </div>
+
   <div class="actions">
     <%= f.hidden_field :mode, value: 'import' %>
     <%= f.submit t('page.start_import') %>

data/app/views/user_import_files/show.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.user_import_file')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.user_import_file')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
@@ -10,7 +10,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.user_import_file.user_import_file_name') -%>:</strong>
-  <%= link_to @user_import_file.user_import_file_name, user_import_file_path(@user_import_file, :format => :download) -%>
+  <%= link_to @user_import_file.user_import_file_name, user_import_file_path(@user_import_file, format: :download) -%>
 </p>
 
 <p>
@@ -48,6 +48,16 @@
   <%= @user_import_file.user_encoding -%>
 </p>
 
+<p>
+  <strong><%= t('activerecord.attributes.user_import_file.default_user_group_id') -%>:</strong>
+  <%= link_to @user_import_file.default_user_group.display_name.localize, @user_import_file.default_user_group if @user_import_file.default_user_group.try(:display_name) -%>
+</p>
+
+<p>
+  <strong><%= t('activerecord.attributes.user_import_file.default_library_id') -%>:</strong>
+  <%= link_to @user_import_file.default_library.display_name.localize, @user_import_file.default_library if @user_import_file.default_library.try(:display_name) -%>
+</p>
+
 <p>
   <strong><%= t('activerecord.attributes.user_import_file.state') -%>:</strong>
   <%= localized_state(@user_import_file.current_state) -%>
@@ -60,7 +70,7 @@
 
 <p>
   <strong><%= t('activerecord.models.user') -%>:</strong>
-  <%= link_to @user_import_file.user.username, @user_import_file.user -%>
+  <%= link_to @user_import_file.user.username, @user_import_file.user.profile if @user_import_file.user.try(:profile) -%>
 </p>
 
 </div>

data/app/views/user_import_results/index.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.user_import_result')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.user_import_result')) -%></h1>
 <div id="content_list">
   <% if @user_import_file %>
     <h2 class="resource_title">
@@ -21,10 +21,10 @@
       <br />
       <%=l user_import_result.created_at %>
     </td>
-    <td><%= link_to user_import_result.user.username, user_import_result.user if user_import_result.user %></td>
+    <td><%= link_to user_import_result.user.username, user_import_result.user.profile if user_import_result.user.try(:profile) %></td>
     <td>
       <%= link_to t('page.show'), user_import_result %>
-      <%= link_to t('page.destroy'), user_import_result, :data => {:confirm => t('page.are_you_sure')}, :method => :delete %>
+      <%= link_to t('page.destroy'), user_import_result, data: {confirm: t('page.are_you_sure')}, method: :delete %>
     </td>
   </tr>
 <% end %>
@@ -39,11 +39,11 @@
   <ul>
     <li>
     <% if @user_import_file %>
-      <%= link_to((image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'TSV', :class => 'icon'), user_import_file_user_import_results_path(@user_import_file, :format => :tsv, :locale => @locale.to_s)) -%>
-      (<%= link_to 'TSV', user_import_file_user_import_results_path(:format => :tsv, :locale => @locale.to_s) -%>)
+      <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), user_import_file_user_import_results_path(@user_import_file, format: :txt, locale: @locale.to_s)) -%>
+      (<%= link_to 'TSV', user_import_file_user_import_results_path(format: :txt, locale: @locale.to_s) -%>)
     <% else %>
-      <%= link_to((image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'TSV', :class => 'icon'), user_import_results_path(:format => :tsv, :locale => @locale.to_s)) -%>
-      (<%= link_to 'TSV', user_import_results_path(:format => :tsv, :locale => @locale.to_s) -%>)
+      <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), user_import_results_path(format: :txt, locale: @locale.to_s)) -%>
+      (<%= link_to 'TSV', user_import_results_path(format: :txt, locale: @locale.to_s) -%>)
     <% end %>
     </li>
   </ul>

data/app/views/user_import_results/{index.tsv.erb → index.txt.erb}

@@ -1,4 +1,4 @@
 username
 <%- @user_import_results.each do |user_import_result| -%>
-"<%= user_import_result.user.try(:username) %>"	<%= user_import_result.body %>
+"<%= user_import_result.user.try(:username) %>"	<%= user_import_result.body %><%= "\n" -%>
 <%- end -%>

data/app/views/user_import_results/show.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.user_import_result')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.user_import_result')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
@@ -10,7 +10,7 @@
 
 <p>
   <b><%= t('activerecord.models.user') %></b>
-  <%= link_to @user_import_result.user.username, @user_import_result.user if @user_import_result.user %>
+  <%= link_to @user_import_result.user.username, @user_import_result.user.profile if @user_import_result.user.try(:profile) %>
 </p>
 
 <p>

data/app/workers/user_export_file_queue.rb

@@ -0,0 +1,7 @@
+class UserExportFileQueue
+  @queue = :user_export_file
+
+  def self.perform(user_export_id)
+    UserExportFile.find(user_export_id).export!
+  end
+end

data/config/initializers/mime_types.rb

@@ -3,7 +3,7 @@
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
 # Mime::Type.register_alias "text/html", :iphone
-Mime::Type.register "text/tab-separated-values", :tsv
+Mime::Type.register_alias "text/plain", :txt
 Mime::Type.register "image/jpeg", :jpg
 Mime::Type.register "application/octet-stream",  :download
 Mime::Type.register "application/xml",  :sru

data/config/locales/devise.en.yml

@@ -3,49 +3,50 @@
 en:
   devise:
     confirmations:
-      confirmed: "Your account was successfully confirmed. You are now signed in."
-      send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
-      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes."
+      confirmed: "Your email address has been successfully confirmed."
+      send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
     failure:
       already_authenticated: "You are already signed in."
-      inactive: "Your account was not activated yet."
+      inactive: "Your account is not activated yet."
       invalid: "Invalid email or password."
-      invalid_token: "Invalid authentication token."
       locked: "Your account is locked."
-      not_found_in_database: "Invalid email or password."
-      timeout: "Your session expired, please sign in again to continue."
+      last_attempt: "You have one more attempt before your account is locked."
+      not_found_in_database: "Invalid username or password."
+      timeout: "Your session expired. Please sign in again to continue."
       unauthenticated: "You need to sign in or sign up before continuing."
-      unconfirmed: "You have to confirm your account before continuing."
+      unconfirmed: "You have to confirm your email address before continuing."
     mailer:
       confirmation_instructions:
         subject: "Confirmation instructions"
       reset_password_instructions:
         subject: "Reset password instructions"
       unlock_instructions:
-        subject: "Unlock Instructions"
+        subject: "Unlock instructions"
     omniauth_callbacks:
       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."
-      send_instructions: "You will receive an email with instructions about how to reset your password in a few minutes."
+      send_instructions: "You will receive an email with instructions on 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."
-      updated_not_active: "Your password was changed successfully."
+      updated: "Your password has been changed successfully. You are now signed in."
+      updated_not_active: "Your password has been changed successfully."
     registrations:
-      destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
+      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
       signed_up: "Welcome! You have signed up successfully."
       signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
       signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
-      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please open the link to activate your account."
-      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
-      updated: "You updated your account successfully."
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
+      updated: "Your account has been updated successfully."
     sessions:
       signed_in: "Signed in successfully."
       signed_out: "Signed out successfully."
+      already_signed_out: "Signed out successfully."
     unlocks:
-      send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes."
-      send_paranoid_instructions: "If your account exists, you will receive an email with instructions about how to unlock it in a few minutes."
+      send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
+      send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
       unlocked: "Your account has been unlocked successfully. Please sign in to continue."
   errors:
     messages: