From: <cha...@us...> - 2008-08-13 12:12:30
|
Revision: 2246 http://gnomesword.svn.sourceforge.net/gnomesword/?rev=2246&view=rev Author: charcoal Date: 2008-08-13 12:12:40 +0000 (Wed, 13 Aug 2008) Log Message: ----------- adjustment re: #2036800 for _ in module name Modified Paths: -------------- branches/development/gnomesword/ChangeLog branches/development/gnomesword/src/gnome2/commentary.c branches/development/gnomesword/src/main/prayerlists.cc Modified: branches/development/gnomesword/ChangeLog =================================================================== --- branches/development/gnomesword/ChangeLog 2008-08-10 18:49:08 UTC (rev 2245) +++ branches/development/gnomesword/ChangeLog 2008-08-13 12:12:40 UTC (rev 2246) @@ -1,3 +1,7 @@ +2008-08-13 karl <cha...@us...> + + * adjust but not fix for #2036800 journal name only accepts English. + 2008-08-09 terry <tb...@us...> * quick fix for bug: #2040344 module manager needs to lock left panel Modified: branches/development/gnomesword/src/gnome2/commentary.c =================================================================== --- branches/development/gnomesword/src/gnome2/commentary.c 2008-08-10 18:49:08 UTC (rev 2245) +++ branches/development/gnomesword/src/gnome2/commentary.c 2008-08-13 12:12:40 UTC (rev 2246) @@ -486,14 +486,16 @@ goto out1; for (s = info->text1; *s; ++s) { - if (!isalnum(*s)) { - gui_generic_warning("Names must be letters+digits only."); + if (!isalnum(*s) && (*s != '_')) { + gui_generic_warning + (_("Module names must contain [A-Za-z0-9_] only.")); goto out1; } } if (main_is_module(info->text1)) { - gui_generic_warning("Duplicate name"); + gui_generic_warning + (_("GnomeSword already knows a module by that name.")); goto out1; } Modified: branches/development/gnomesword/src/main/prayerlists.cc =================================================================== --- branches/development/gnomesword/src/main/prayerlists.cc 2008-08-10 18:49:08 UTC (rev 2245) +++ branches/development/gnomesword/src/main/prayerlists.cc 2008-08-13 12:12:40 UTC (rev 2246) @@ -246,9 +246,9 @@ } for (char *s = info->text1; *s; ++s) { - if (!isalnum(*s)) { + if (!isalnum(*s) && (*s != '_')) { gui_generic_warning - (_("Module names must be letters+digits only.")); + (_("Module names must contain [A-Za-z0-9_] only.")); goto out; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |