From 628a769a00647a8c9a32b15dbdd20e2bfe46e8f2 Mon Sep 17 00:00:00 2001 From: Aleisha Date: Tue, 26 Jan 2016 04:45:51 +0000 Subject: [PATCH] Bug 15665: Better wording of error messages when importing MARC frameworks UPDATE: Making error messages the same To test: 1) Go to Admin -> MARC frameworks 2) Click Import next to any framework. You won't actually be overwriting or importing anything as this is only a string fix, so it can be an existing framework 3) Click the Import button without attaching any file. Confirm it says "Please select a spreadsheet (.csv, .ods, .xml) file." and that this makes sense to you 4) Attempt to attach a file that is not a .csv, .ods or .xml file. You should instantly get an error message saying "Please select a CSV (.csv), ODS (.ods) or XML (.xml) file." Confirm this shows up and makes sense to you Signed-off-by: Hector Castro Rewording Ok. Works as described Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com --- .../intranet-tmpl/prog/en/modules/admin/biblio_framework.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt index 2232825dbe..5345022400 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -51,7 +51,7 @@ var filename = $(this).val(); if ( ! /(?:\.csv|\.ods|\.xml)$/.test(filename)) { $(this).css("background-color","yellow"); - alert(_("Please select an ods or xml file")); + alert(_("Please select a CSV (.csv), ODS (.ods) or XML (.xml) spreadsheet file.")); $(this).val(""); $(this).css("background-color","white"); } @@ -80,7 +80,7 @@ return false; } obj.css("background-color","yellow"); - alert(_("Please select an spreadsheet (csv, ods, xml) file")); + alert(_("Please select a CSV (.csv), ODS (.ods) or XML (.xml) spreadsheet file.")); obj.val(""); obj.css("background-color","white"); return false; -- 2.39.5