From a5fa503ddd84ef59598fc0efa256bb12fa042f4a Mon Sep 17 00:00:00 2001 From: Jonathan Niles Date: Sat, 19 Nov 2016 09:57:34 +0100 Subject: [PATCH] fix(trial balance): incorrect button text This commit fixes the incorrect button text on the trial balance reported in #908. The text reads "View Details" instead of "View Errors", since it shows the details of each account hit instead of the details of errors associated with the accounts. Closes #908. --- client/src/i18n/en.json | 7 ++++--- client/src/i18n/fr.json | 3 ++- .../src/partials/journal/modals/trialBalanceMain.body.js | 2 +- .../src/partials/journal/templates/details-link.cell.html | 5 +++++ client/src/partials/journal/templates/error-link.cell.html | 5 ----- 5 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 client/src/partials/journal/templates/details-link.cell.html delete mode 100644 client/src/partials/journal/templates/error-link.cell.html diff --git a/client/src/i18n/en.json b/client/src/i18n/en.json index 77ab37c7ea..467aeb5210 100644 --- a/client/src/i18n/en.json +++ b/client/src/i18n/en.json @@ -325,12 +325,13 @@ "UPDATE_PASSWORD" : "Update Password", "UPDATE" : "Update", "VALIDATE" : "Validate", - "VIEW_ERRORS" : "View Errors" + "VIEW_ERRORS" : "View Errors", + "VIEW_DETAILS" : "View Details" }, "DIALOGS": { - "CONFIRM_ACTION" : "Do you confirm this action ?", + "CONFIRM_ACTION" : "Do you confirm this action?", "CONFIRM_DELETE" : "You are about to delete a record. This action is permanent and cannot be undone. Click \"Confirm\" to accept or \"Cancel\" to halt this action.", - "CANNOT_UNDONE_ACTION" : "This action CANNOT BE REVERSED, this action will be permanent. You must be sure that you want to do this action", + "CANNOT_UNDONE_ACTION" : "This action CANNOT BE REVERSED, the action will be permanent. You must be sure that you want to do this action.", "NO_CORRESPONDANCY" : "No correspondancy found for ", "PLEASE_TYPE_TEXT" : "Please type {{value}} to confirm", "PLEASE_READ" : "Unexpected bad things will happen if you don't read this!", diff --git a/client/src/i18n/fr.json b/client/src/i18n/fr.json index 7183809d37..21208d0491 100644 --- a/client/src/i18n/fr.json +++ b/client/src/i18n/fr.json @@ -327,7 +327,8 @@ "UPDATE_PASSWORD" : "Modifier mot de passe", "UPDATE" : "Mettre à jour", "VALIDATE" : "Valider", - "VIEW_ERRORS" : "Voir erreurs" + "VIEW_ERRORS" : "Voir Erreurs", + "VIEW_DETAILS" : "Voir les Détails" }, "DIALOGS": { "CONFIRM_ACTION" : "Confirmez vous cette action ?", diff --git a/client/src/partials/journal/modals/trialBalanceMain.body.js b/client/src/partials/journal/modals/trialBalanceMain.body.js index b01d7508e1..6fc50ea674 100644 --- a/client/src/partials/journal/modals/trialBalanceMain.body.js +++ b/client/src/partials/journal/modals/trialBalanceMain.body.js @@ -39,7 +39,7 @@ function TrialBalanceMainBodyController(Session, trialBalanceService, Grouping, headerCellFilter: 'translate', visible: true, enableCellEdit: false, - cellTemplate: '/partials/journal/templates/error-link.cell.html', + cellTemplate: '/partials/journal/templates/details-link.cell.html', allowCellFocus: false } ]; diff --git a/client/src/partials/journal/templates/details-link.cell.html b/client/src/partials/journal/templates/details-link.cell.html new file mode 100644 index 0000000000..10b9fdc2ed --- /dev/null +++ b/client/src/partials/journal/templates/details-link.cell.html @@ -0,0 +1,5 @@ +
+ + {{ "FORM.BUTTONS.VIEW_DETAILS" | translate }} + +
diff --git a/client/src/partials/journal/templates/error-link.cell.html b/client/src/partials/journal/templates/error-link.cell.html deleted file mode 100644 index 12473add42..0000000000 --- a/client/src/partials/journal/templates/error-link.cell.html +++ /dev/null @@ -1,5 +0,0 @@ -
- - {{ "FORM.BUTTONS.VIEW_ERRORS" | translate }} - -