[ekg2-commit] ekg2: scripts.c (HEAD) themes.c (HEAD) [darkjames]

[CVS commit]

Module name:	ekg2
Changes by:	darkjames	2007-05-03 23:00:54

Modified files:
	scripts.c themes.c

Log message:
nicer.

Index: scripts.c
===================================================================
RCS file: /home/cvs/ekg2/ekg/scripts.c,v
diff -d -u -r1.44 -r1.45
--- scripts.c	3 May 2007 16:16:33 -0000	1.44
+++ scripts.c	3 May 2007 21:00:53 -0000	1.45
@@ -417,9 +417,9 @@
 		
 		if (ret < 1) {
 			if (ret == -1)
-				print("generic_error", "@script_load error");
+				print("script_incorrect", scr->name, scr->path, slang->name);
 			else if (ret == 0)
-				print("generic_error", "@script_load script has no handler or error in getting handlers.");
+				print("script_incorrect2", scr->name, scr->path, slang->name); /* "script has no handler or error in getting handlers." */
 			xfree(path);
 			xfree(name);
 			script_unload(scr);

Index: themes.c
===================================================================
RCS file: /home/cvs/ekg2/ekg/themes.c,v
diff -d -u -r1.179 -r1.180
--- themes.c	3 May 2007 15:36:04 -0000	1.179
+++ themes.c	3 May 2007 21:00:53 -0000	1.180
@@ -1914,15 +1914,18 @@
 	format_add("script_autorun_fail", 	_("%! Script %W%1%n failed %R%2%n autorun dir %r(%3)"), 1);
 	format_add("script_autorun_unkn", 	_("%! Error adding/removing script %W%1%n from autorundir %r(%3)"), 1);
 	format_add("script_loaded",		_("%) Script %W%1%n %g(%2)%n %Gloaded %b(%3)"), 1);
+	format_add("script_incorrect",		_("%! Script %W%1%n %g(%2)%n %rNOT LOADED%n %R[incorrect %3 script or you've got syntax errors]"), 1);
+	format_add("script_incorrect2",		_("%! Script %W%1%n %g(%2)%n %rNOT LOADED%n %R[script has no handler or error in getting handlers]"), 1);
 	format_add("script_removed",		_("%) Script %W%1%n %g(%2)%n %Rremoved %b(%3)"), 1);
 	format_add("script_need_name",		_("%! No filename given\n"), 1);
 	format_add("script_not_found",		_("%! Can't find script %W%1"), 1);
 	format_add("script_wrong_location",	_("%! Script have to be in %g%1%n (don't add path)"), 1);
+	format_add("script_error", 		_("%! %rScript error: %|%1"), 1);
+
 	format_add("script_autorun_list", "%) Script %1 -> %2\n", 1);
 	format_add("script_eval_error", _("%! Error running code\n"), 1);
 	format_add("script_list", _("%> %1 (%2, %3)\n"), 1);
 	format_add("script_list_empty", _("%! No scripts loaded\n"), 1);
-	format_add("script_error", _("%! Error %T%1%n\n"), 1);
 	format_add("script_generic", "%> [script,%2] (%1) %3\n", 1);
 	format_add("script_varlist", _("%> %1 = %2 (%3)\n"), 1);
 	format_add("script_varlist_empty", _("%! No script vars!\n"), 1);