renalware-core 2.0.167 → 2.1.0

data/app/views/devise/mailer/confirmation_instructions.html.erb

@@ -0,0 +1,5 @@
+<p><%= t('.greeting', recipient: @email) %></p>
+
+<p><%= t('.instruction') %></p>
+
+<p><%= link_to t('.action'), confirmation_url(@resource, confirmation_token: @token) %></p>

data/app/views/devise/mailer/email_changed.html.erb

@@ -0,0 +1,7 @@
+<p><%= t('.greeting', recipient: @email) %></p>
+
+<% if @resource.try(:unconfirmed_email?) %>
+  <p><%= t('.message', email: @resource.unconfirmed_email) %></p>
+<% else %>
+  <p><%= t('.message', email: @resource.email) %></p>
+<% end %>

data/app/views/devise/mailer/password_change.html.erb

@@ -0,0 +1,3 @@
+<p><%= t('.greeting', recipient: @resource.email) %></p>
+
+<p><%= t('.message') %></p>

data/app/views/devise/mailer/reset_password_instructions.html.erb

@@ -0,0 +1,8 @@
+<p><%= t('.greeting', recipient: @resource.email) %></p>
+
+<p><%= t('.instruction') %></p>
+
+<p><%= link_to t('.action'), edit_password_url(@resource, reset_password_token: @token) %></p>
+
+<p><%= t('.instruction_2') %></p>
+<p><%= t('.instruction_3') %></p>

data/app/views/devise/mailer/unlock_instructions.html.erb

@@ -0,0 +1,7 @@
+<p><%= t('.greeting', recipient: @resource.email) %></p>
+
+<p><%= t('.message') %></p>
+
+<p><%= t('.instruction') %></p>
+
+<p><%= link_to t('.action'), unlock_url(@resource, unlock_token: @token) %></p>

data/app/views/devise/passwords/edit.html.erb

@@ -0,0 +1,27 @@
+<h2><%= t(".change_your_password") %></h2>
+
+<%= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
+  <%= f.error_notification %>
+
+  <%= f.input :reset_password_token, as: :hidden %>
+  <%= f.full_error :reset_password_token %>
+
+  <div class="form-inputs">
+    <%= f.input :password,
+                label: t(".new_password"),
+                required: true,
+                autofocus: true,
+                hint: (t('devise.shared.minimum_password_length', count: @minimum_password_length) if @minimum_password_length),
+                input_html: { autocomplete: "new-password" } %>
+    <%= f.input :password_confirmation,
+                label: t(".confirm_new_password"),
+                required: true,
+                input_html: { autocomplete: "new-password" } %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit, t(".change_my_password") %>
+  </div>
+<% end %>
+
+<%= render "devise/shared/links" %>

data/app/views/{renalware/devise → devise}/passwords/new.html.erb

@@ -1,4 +1,4 @@
-<%= within_admin_layout(title: "Forgot your password?") do %>
+<%= within_admin_layout(title: t(".forgot_your_password")) do %>
   <%= simple_form_for(resource,
                       as: resource_name,
                       url: password_path(resource_name),
@@ -12,7 +12,7 @@
       </div>
     </div>
 
-    <%= f.button :submit, "Send me reset password instructions" %>
+    <%= f.button :submit, t("devise.passwords.new.send_me_reset_password_instructions", cascade: true)  %>
   <% end %>
   <%= render "devise/shared/links" %>
 <% end %>

data/app/views/devise/passwords/new.html.erb.new

@@ -0,0 +1,18 @@
+<h2><%= t(".forgot_your_password") %></h2>
+
+<%= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
+  <%= f.error_notification %>
+
+  <div class="form-inputs">
+    <%= f.input :email,
+                required: true,
+                autofocus: true,
+                input_html: { autocomplete: "email" } %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit, t(".send_me_reset_password_instructions") %>
+  </div>
+<% end %>
+
+<%= render "devise/shared/links" %>

data/app/views/devise/registrations/edit.html.erb.pt

@@ -0,0 +1,35 @@
+<h2><%= t(".title", resource: resource.model_name.human) %></h2>
+
+<%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
+  <%= f.error_notification %>
+
+  <div class="form-inputs">
+    <%= f.input :email, required: true, autofocus: true %>
+
+    <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
+      <p><%= t(".currently_waiting_confirmation_for_email", email: resource.unconfirmed_email) %></p>
+    <% end %>
+
+    <%= f.input :password,
+                hint: t(".leave_blank_if_you_don_t_want_to_change_it"),
+                required: false,
+                input_html: { autocomplete: "new-password" } %>
+    <%= f.input :password_confirmation,
+                required: false,
+                input_html: { autocomplete: "new-password" } %>
+    <%= f.input :current_password,
+                hint: t(".we_need_your_current_password_to_confirm_your_changes"),
+                required: true,
+                input_html: { autocomplete: "current-password" } %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit, t(".update") %>
+  </div>
+<% end %>
+
+<h3><%= t(".cancel_my_account") %></h3>
+
+<p><%= t(".unhappy") %> <%= link_to t(".cancel_my_account"), registration_path(resource_name), data: { confirm: t(".are_you_sure") }, method: :delete %></p>
+
+<%= link_to t("devise.shared.links.back"), :back %>

data/app/views/{renalware/devise → devise}/registrations/edit.html.slim

@@ -1,4 +1,4 @@
-= within_admin_layout(title: "Update Profile")
+= within_admin_layout(title: "")
 
   .document
     h4 #{resource}'s Profile
@@ -6,7 +6,7 @@
     = form_for(resource,
       as: resource_name,
       url: registration_path(resource_name),
-      html: { method: :put }) do |f|
+      html: { class: "fn-form", method: :put }) do |f|
 
       = custom_devise_error_messages!
 
@@ -17,11 +17,11 @@
         = f.email_field :email, autofocus: true
 
       - if devise_mapping.confirmable? && resource.pending_reconfirmation?
-        div Currently waiting confirmation for: #{resource.unconfirmed_email}
+        div= t("devise.registrations.edit.currently_waiting_confirmation_for_email", email: resource.unconfirmed_email)
 
       .field.large-8.small-6
         = f.label :password
-        <i>(leave blank if you don't want to change it)</i>
+        i = t("devise.registrations.edit.leave_blank_if_you_don_t_want_to_change_it")
         = f.password_field :password, autocomplete: "off"
 
       .field.large-8.small-6
@@ -30,7 +30,7 @@
 
       .field.large-8.small-6
         = f.label :current_password
-        <i>(we need your current password to confirm your changes)</i>
+        i= t("devise.registrations.edit.we_need_your_current_password_to_confirm_your_changes")
         = f.password_field :current_password, autocomplete: "off"
 
       .field.large-8.small-6
@@ -42,7 +42,14 @@
         <i>(appears in letters, e.g. "Dr Jane Smith, MRCP")</i>
         = f.text_field :signature
 
+      / For now, disallow Portuguese as an option. While there are some Portuguese translations
+      / in the app, added as a proof-of-concept, these have not been sanity-checked!
+      / ["Portuguese", "pt"]
+      / .field.large-8.small-6
+      /   = f.label :language
+      /   = f.collection_select(:language, [["English", "en-GB"]], :last, :first, prompt: true)
+
       .actions
-        = f.submit "Update", class: "button save"
+        = f.submit t("devise.registrations.edit.update"), class: "button save"
 
-      = link_to "Back", :back
+      = link_to t("devise.shared.links.back"), :back

data/app/views/devise/registrations/new.html.erb.pt

@@ -0,0 +1,25 @@
+<h2><%= t(".sign_up") %></h2>
+
+<%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
+  <%= f.error_notification %>
+
+  <div class="form-inputs">
+    <%= f.input :email,
+                required: true,
+                autofocus: true ,
+                input_html: { autocomplete: "email" }%>
+    <%= f.input :password,
+                required: true,
+                hint: (t('devise.shared.minimum_password_length', count: @minimum_password_length) if @minimum_password_length),
+                input_html: { autocomplete: "new-password" } %>
+    <%= f.input :password_confirmation,
+                required: true,
+                input_html: { autocomplete: "new-password" } %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit, t(".sign_up") %>
+  </div>
+<% end %>
+
+<%= render "devise/shared/links" %>

data/app/views/{renalware/devise → devise}/registrations/new.html.slim

@@ -1,4 +1,4 @@
- = within_admin_layout(title: "Register") do
+ = within_admin_layout(title: t("devise.registrations.new.sign_up")) do
   = simple_form_for(resource,
                     as: resource_name,
                     url: registration_path(resource_name),
@@ -13,7 +13,7 @@
     = f.input :password,
               as: :password,
               input_html: { autocomplete: "off" },
-              hint: "#{@minimum_password_length} characters minimum",
+              hint: (t('devise.shared.minimum_password_length', count: @minimum_password_length) if @minimum_password_length),
               wrapper: :horizontal_small
     = f.input :password_confirmation,
               as: :password,
@@ -30,6 +30,6 @@
 
       = f.input :asked_for_write_access, label: "Write access required"
 
-    = f.submit "Sign up", class: "button save"
+    = f.submit t("devise.registrations.new.sign_up"), class: "button save"
 
   = render "devise/shared/links"

data/app/views/{renalware/devise → devise}/sessions/new.html.slim

@@ -1,11 +1,11 @@
  .main-content
   .row.small-8.large-12
-    h3= "Log in to #{Renalware.config.site_name}"
-
+    br
     = render "renalware/system/messages/list"
     = render "warning"
 
   .row.small-6.large-3
+    h3= t(".sign_in")
     = simple_form_for(resource,
                       as: resource_name,
                       url: session_path(resource_name),

data/app/views/devise/shared/_links.html.erb

@@ -0,0 +1,26 @@
+<%# From https://github.com/tigrish/devise-i18n %>
+<%- if controller_name != 'sessions' %>
+  <%= link_to t(".sign_in"), new_session_path(resource_name) %><br />
+<% end %>
+
+<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+  <%= link_to t(".sign_up"), new_registration_path(resource_name) %><br />
+<% end %>
+
+<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
+  <%= link_to t(".forgot_your_password"), new_password_path(resource_name) %><br />
+<% end %>
+
+<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+  <%= link_to t('.didn_t_receive_confirmation_instructions'), new_confirmation_path(resource_name) %><br />
+<% end %>
+
+<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+  <%= link_to t('.didn_t_receive_unlock_instructions'), new_unlock_path(resource_name) %><br />
+<% end %>
+
+<%- if devise_mapping.omniauthable? %>
+  <%- resource_class.omniauth_providers.each do |provider| %>
+    <%= link_to t('.sign_in_with_provider', provider: OmniAuth::Utils.camelize(provider)), omniauth_authorize_path(resource_name, provider) %><br />
+  <% end %>
+<% end %>

data/app/views/devise/unlocks/new.html.erb

@@ -0,0 +1,19 @@
+<h2><%= t(".resend_unlock_instructions") %></h2>
+
+<%= simple_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
+  <%= f.error_notification %>
+  <%= f.full_error :unlock_token %>
+
+  <div class="form-inputs">
+    <%= f.input :email,
+                required: true,
+                autofocus: true,
+                input_html: { autocomplete: "email" } %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit, t(".resend_unlock_instructions") %>
+  </div>
+<% end %>
+
+<%= render "devise/shared/links" %>

data/app/views/renalware/accesses/assessments/_form.html.slim

@@ -5,7 +5,7 @@ ruby:
   .medium-6.columns
     = f.button :submit
     '  or
-    = link_to "cancel", back_path
+    = link_to t("btn.cancel"), back_path
 
 .form-content
   = f.simple_fields_for :document, f.object.document do |fd|
@@ -40,4 +40,4 @@ ruby:
     .large-12.columns
       = f.button :submit
       '  or
-      = link_to "cancel", back_path
+      = link_to t("btn.cancel"), back_path

data/app/views/renalware/accesses/assessments/_list.html.slim

@@ -19,8 +19,8 @@ article.access-assessments
       - assessments.each do |assessment|
         tr
           td.actions
-            = link_to "View", patient_accesses_assessment_path(patient, assessment)
-            = link_to "Edit", edit_patient_accesses_assessment_path(patient, assessment)
+            = link_to t("btn.view"), patient_accesses_assessment_path(patient, assessment)
+            = link_to t("btn.edit"), edit_patient_accesses_assessment_path(patient, assessment)
           td= assessment.performed_on
           td= assessment.type
           td= assessment.side

data/app/views/renalware/accesses/assessments/show.html.slim

@@ -1,5 +1,5 @@
 = content_for(:actions) do
-  = link_to "Edit",
+  = link_to t("btn.edit"),
           edit_patient_accesses_assessment_path(patient, assessment),
           class: "button"
 

data/app/views/renalware/accesses/dashboards/_page_actions.html.slim

@@ -2,7 +2,7 @@ button.button.dropdown(href="#"
                        data-dropdown="access-options"
                        aria-controls="access-options"
                        aria-expanded="false")
-  | Add
+  = t("btn.add_")
 ul.f-dropdown#access-options(data-dropdown-content aria-hidden="true")
   li= link_to("Access Profile", new_patient_accesses_profile_path(patient))
   li= link_to("Access Plan", new_patient_accesses_plan_path(patient))

data/app/views/renalware/accesses/plans/_list.html.slim

@@ -12,7 +12,7 @@ table.align-top
   tbody
     - plans.each do |plan|
       tr
-        td= link_to("View", [patient, plan])
+        td= link_to(t("btn.view"), [patient, plan])
         td= l(plan.created_at&.to_date)
         td= l(plan.terminated_at&.to_date)
         td= plan.plan_type.to_s

data/app/views/renalware/accesses/plans/_summary.html.slim

@@ -4,10 +4,10 @@ article.access-plans
   header
     h2 Current Access Plan
     ul
-      li= link_to "Edit",
+      li= link_to t("btn.edit"),
                   edit_patient_accesses_plan_path(patient, current_plan),
                   class: "button"
-      li= link_to "View",
+      li= link_to t("btn.view"),
                   patient_accesses_plan_path(patient, current_plan),
                   class: "button secondary"
   .current-access-plan

data/app/views/renalware/accesses/plans/new.html.slim

@@ -17,6 +17,6 @@
                       collection: Renalware::User.ordered,
                       wrapper: :horizontal_medium
 
-      = f.submit "Save", class: "button"
+      = f.submit t("btn.save"), class: "button"
       '  or
-      = link_to "cancel", patient_accesses_dashboard_path(patient)
+      = link_to t("btn.cancel"), patient_accesses_dashboard_path(patient)

data/app/views/renalware/accesses/procedures/_form.html.slim

@@ -5,7 +5,7 @@ ruby:
   .medium-6.columns
     = f.button :submit
     '  or
-    = link_to "cancel", back_path
+    = link_to t("btn.cancel"), back_path
 
 .form-content
   = render layout: "renalware/shared/fieldset",
@@ -42,4 +42,4 @@ ruby:
   .large-12.columns
     = f.button :submit
     '  or
-    = link_to "cancel", back_path
+    = link_to t("btn.cancel"), back_path

data/app/views/renalware/accesses/procedures/_list.html.slim

@@ -20,8 +20,8 @@ article.access-procedures
         tr
           td.toggler = toggler("#procedure-quick-preview-#{procedure.id}")
           td.actions
-            = link_to "View", patient_accesses_procedure_path(patient, procedure)
-            = link_to "Edit", edit_patient_accesses_procedure_path(patient, procedure)
+            = link_to t("btn.view"), patient_accesses_procedure_path(patient, procedure)
+            = link_to t("btn.edit"), edit_patient_accesses_procedure_path(patient, procedure)
           td= procedure.performed_on
           td= procedure.type&.long_name
           td= procedure.side

data/app/views/renalware/accesses/procedures/show.html.slim

@@ -1,5 +1,5 @@
 = content_for(:actions) do
-  = link_to "Edit",
+  = link_to t("btn.edit"),
            edit_patient_accesses_procedure_path(patient, procedure),
            class: "button"
 

data/app/views/renalware/accesses/profiles/_current_profile.html.slim

@@ -4,10 +4,10 @@ article
   header
     h2 Current Access Profile
     ul
-      li= link_to "Edit",
+      li= link_to t("btn.edit"),
                   edit_patient_accesses_profile_path(patient, current_profile),
                   class: "button"
-      li= link_to "View",
+      li= link_to t("btn.view"),
                   patient_accesses_profile_path(patient, current_profile),
                   class: "button secondary"