Refactor delete message translation #992

baoqchau · 2017-03-15T18:45:56Z

Fixes #543.

Changes proposed in this pull request:

Added 3 standard delete message in translation file.
Replace "delete" message in multiple template files with new standard message.

cc @HospitalRun/core-maintainers

…te messages are called

jkleinsc · 2017-03-16T13:42:26Z

app/admin/custom-forms/index/route.js

@@ -25,7 +25,7 @@ export default AbstractIndexRoute.extend(ModalHelper, UserSession, {
  actions: {
    deleteItem(item) {
      let i18n = this.get('i18n');
-      let message = i18n.t('admin.customForms.messages.deleteForm');
+      let message = i18n.t('messages.delete_singular', { name: 'form' });


This code is passing a non localized string when it should be passing in a localized string or it should use the name of the item being deleted.

jkleinsc · 2017-03-16T13:42:34Z

app/admin/lookup/controller.js

@@ -348,7 +348,7 @@ export default Ember.Controller.extend(BillingCategories, EKMixin,
      confirmDeleteValue(value) {
        let i18n = this.get('i18n');
        let title = i18n.t('admin.lookup.titles.deleteLookupValue');
-        let message = i18n.t('admin.lookup.messages.deleteLookupValue', { value });
+        let message = i18n.t('messages.delete_singular', { name: value.concat(' value') });


This code is passing a non localized string when it should be passing in a localized string or it should use the name of the item being deleted.

jkleinsc · 2017-03-16T13:42:41Z

app/appointments/delete/template.hbs

@@ -5,6 +5,6 @@
    updateButtonText=updateButtonText }}
  <div class="alert alert-danger">
    <span class="glyphicon glyphicon-warning-sign"></span>
-    {{t 'appointments.messages.deleteAppointmentMessage'}}
+    {{t 'messages.delete_singular' name='appointment'}}


This code is passing a non localized string when it should be passing in a localized string or it should use the name of the item being deleted.

jkleinsc

@baoqchau thanks for the PR! It looks like most of the changes you have made are passing a non localized string to i18n.t (eg passing in the word 'form'). You need to either change those to use a localized string (eg localized version of 'form' or pass in the name of the item you are deleting.

 delete: 'Are you sure you wish to delete {{name}}?'

Should be used when passing in a name
and when using

    delete_singular: 'Are you sure you wish to delete this{{name}}?'
    delete_plural: 'Are you sure you wish to delete {{name}}?'

You need to pass in a localized value for name.

jkleinsc · 2017-03-16T13:42:47Z

app/imaging/delete/template.hbs

@@ -5,6 +5,6 @@
    updateButtonText=updateButtonText }}
  <div class="alert alert-danger">
    <span class="glyphicon glyphicon-warning-sign"></span>
-    {{t 'imaging.messages.delete'}}
+    {{t 'messages.delete_singular' name='imaging request' }}


This code is passing a non localized string when it should be passing in a localized string or it should use the name of the item being deleted.

jkleinsc · 2017-03-16T13:43:26Z

app/inc-category/delete/template.hbs

@@ -5,6 +5,6 @@
    updateButtonText=updateButtonText }}
  <div class="alert alert-danger">
    <span class="glyphicon glyphicon-warning-sign"></span>
-    {{t 'incident.messages.deleteCategory' name=model.incidentCategoryName}}
+    {{t 'messages.delete' name=model.incidentCategoryName}}


This example is using an item name and is done correctly

jkleinsc · 2017-03-16T13:43:33Z

app/inc-category/edit/controller.js

@@ -36,7 +36,7 @@ export default AbstractEditController.extend({

    showDeleteItem(item) {
      let i18n = get(this, 'i18n');
-      let message = i18n.t('incident.messages.deleteItem');
+      let message = i18n.t('messages.delete_singular', { name: 'item' });


This code is passing a non localized string when it should be passing in a localized string or it should use the name of the item being deleted.

jkleinsc · 2017-03-16T13:43:38Z

app/incident/delete/template.hbs

@@ -4,6 +4,6 @@
    updateButtonAction=updateButtonAction
    updateButtonText=updateButtonText}}
  <div class="alert alert-danger">
-    <span class="glyphicon glyphicon-warning-sign"></span> {{t 'incident.messages.deleteIncident' name=name}}
+    <span class="glyphicon glyphicon-warning-sign"></span> {{t 'messages.delete_singular' name='incident'}}


This code is passing a non localized string when it should be passing in a localized string or it should use the name of the item being deleted.

jkleinsc · 2017-03-16T13:43:45Z

app/incident/edit/controller.js

@@ -205,7 +205,7 @@ export default AbstractEditController.extend(IncidentStatuses, FriendlyId, Patie

    showDeleteAttachment(attachment) {
      let i18n = get(this, 'i18n');
-      let message = i18n.t('incident.messages.deleteAttachment');
+      let message = i18n.t('messages.delete_singular', { name: 'attachment' });


This code is passing a non localized string when it should be passing in a localized string or it should use the name of the item being deleted.

jkleinsc · 2017-03-16T13:44:46Z

app/procedures/edit/controller.js

@@ -83,7 +83,7 @@ export default AbstractEditController.extend(ChargeActions, PatientSubmodule, {
        closeModalOnConfirm: false,
        confirmAction: 'deleteCharge',
        title: this.get('i18n').t('procedures.titles.deleteMedicationUsed'),
-        message: this.get('i18n').t('procedures.messages.deleteMedication'),
+        message: this.get('i18n').t('messages.delete_singular', { name: 'medication' }),


This code is passing a non localized string when it should be passing in a localized string or it should use the name of the item being deleted.

jkleinsc · 2017-03-16T13:44:52Z

app/users/delete/template.hbs

@@ -5,6 +5,6 @@
    updateButtonText=updateButtonText }}
  <div class="alert alert-danger">
    <span class="glyphicon glyphicon-warning-sign"></span>
-    {{t 'messages.areYouSureDelete' user=model.name}}
+    {{t 'messages.delete' name=(concat "the user " model.name)}}


This code is passing a non localized string when it should be passing in a localized string or it should use the name of the item being deleted.

jkleinsc · 2017-03-16T13:44:57Z

app/visits/delete/template.hbs

@@ -5,7 +5,7 @@
    updateButtonText=updateButtonText }}
  <div class="alert alert-danger">
    <span class="glyphicon glyphicon-warning-sign"></span>
-    {{t 'visits.messages.delete'}}
+    {{t 'messages.delete_singular' name='visit'}}


This code is passing a non localized string when it should be passing in a localized string or it should use the name of the item being deleted.

jkleinsc · 2017-03-16T13:45:02Z

app/visits/procedures/delete/template.hbs

@@ -5,6 +5,6 @@
    updateButtonText=updateButtonText }}
  <div class="alert alert-danger">
    <span class="glyphicon glyphicon-warning-sign"></span>
-    {{t "procedures.messages.delete"}}
+    {{t "messages.delete_singular" name='procedure'}}


This code is passing a non localized string when it should be passing in a localized string or it should use the name of the item being deleted.

jkleinsc · 2017-03-16T13:45:09Z

app/visits/vitals/delete/template.hbs

@@ -5,6 +5,6 @@
    updateButtonText=updateButtonText }}
  <div class="alert alert-danger">
    <span class="glyphicon glyphicon-warning-sign"></span>
-    {{t "vitals.messages.delete"}}
+    {{t "messages.delete_plural" name='vitals'}}


This code is passing a non localized string when it should be passing in a localized string or it should use the name of the item being deleted.

…der models translation file.

baoqchau · 2017-03-16T18:13:46Z

@jkleinsc Is this better? I put all the terms under the "models" in the translation file.

jkleinsc · 2017-03-17T14:42:39Z

@baoqchau Those terms should be under the models section, but they need to follow the structure documented in #547. For example instead of:

models: {
  ....
  localizedStrings: {
    appointment: 'appointment'
    ....
  }
}

it should instead be:

models: {
    appointment: {
    labels: {
      ...
    },
    names: {
      singular: 'appointment'
    }
}

jkleinsc

@baoqchau looks good except for a couple of small changes I commented on. Once those are made, we should be able to merge this in.

jkleinsc · 2017-03-20T14:33:30Z

app/patients/delete/template.hbs

@@ -5,6 +5,6 @@
    updateButtonText=updateButtonText }}
  <div class="alert alert-danger">
    <span class="glyphicon glyphicon-warning-sign"></span>
-    {{t 'patients.messages.deletePatient' firstName=model.firstName lastName=model.lastName}}
+    {{t 'messages.delete' name=(concat model.firstName " " model.lastName)}}


This should user model.shortDisplayName instead of concatenating first and lastName

jkleinsc · 2017-03-20T14:35:54Z

app/users/delete/template.hbs

@@ -5,6 +5,6 @@
    updateButtonText=updateButtonText }}
  <div class="alert alert-danger">
    <span class="glyphicon glyphicon-warning-sign"></span>
-    {{t 'messages.areYouSureDelete' user=model.name}}
+    {{t 'messages.delete' name=(concat (t 'models.user.names.singular') " " model.name)}}


Don't use concat here because the order could be different in different languages. For user I think it would be fine to have the message be:
Are you sure you wish to delete
so you can drop the

(concat (t 'models.user.names.singular') " "

billybonks · 2017-03-21T03:15:30Z

oh man this is awesome thank you @baoqchau

baoqchau closed this Mar 15, 2017

baoqchau reopened this Mar 15, 2017

baoqchau closed this Mar 16, 2017

baoqchau force-pushed the refactor-delete-message-translation branch from 228a748 to 24665f1 Compare March 16, 2017 02:38

refactor delete message in translation model. make changes where dele…

3b9f5a2

…te messages are called

baoqchau reopened this Mar 16, 2017

jkleinsc reviewed Mar 16, 2017

View reviewed changes

jkleinsc suggested changes Mar 16, 2017

View reviewed changes

replace non-localized with localized strings. add localizedStrings un…

47bdefc

…der models translation file.

refactor translation file to match model setup

916bbbb

jkleinsc suggested changes Mar 20, 2017

View reviewed changes

fix minor change in delete message

a5b3b37

jkleinsc approved these changes Mar 20, 2017

View reviewed changes

jkleinsc merged commit be4cca9 into HospitalRun:master Mar 20, 2017

jkleinsc mentioned this pull request Apr 24, 2017

address #543 #752

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor delete message translation #992

Refactor delete message translation #992

baoqchau commented Mar 15, 2017

jkleinsc Mar 16, 2017

jkleinsc Mar 16, 2017

jkleinsc Mar 16, 2017

jkleinsc left a comment

jkleinsc Mar 16, 2017

jkleinsc Mar 16, 2017

jkleinsc Mar 16, 2017

jkleinsc Mar 16, 2017

jkleinsc Mar 16, 2017

jkleinsc Mar 16, 2017

jkleinsc Mar 16, 2017

jkleinsc Mar 16, 2017

jkleinsc Mar 16, 2017

jkleinsc Mar 16, 2017

baoqchau commented Mar 16, 2017

jkleinsc commented Mar 17, 2017

jkleinsc left a comment

jkleinsc Mar 20, 2017

jkleinsc Mar 20, 2017

billybonks commented Mar 21, 2017

Refactor delete message translation #992

Refactor delete message translation #992

Conversation

baoqchau commented Mar 15, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jkleinsc left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

baoqchau commented Mar 16, 2017

jkleinsc commented Mar 17, 2017

jkleinsc left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

billybonks commented Mar 21, 2017