[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gallery-checkins
Subject:    [Gallery-checkins] CVS: gallery/setup config_data.inc,1.163,1.164 functions.inc,1.150,1.151
From:       Joan McGalliard <jefmcg () users ! sourceforge ! net>
Date:       2003-11-29 10:30:20
[Download RAW message or body]

Update of /cvsroot/gallery/gallery/setup
In directory sc8-pr-cvs1:/tmp/cvs-serv24952/setup

Modified Files:
	config_data.inc functions.inc 
Log Message:
2003-11-29  Joan McGalliard  <gallery@joanhenge.plus.com> 1.4.2-cvs-b43

	* Fixed bug were reset clicks did not work in albums.php.

	* Commenter name format is configurable.

	* Fixed bug were top navbox was missing a line (or had it double 
	  thickness) in view_photo.php when there was no adminbox. 

	* Removed setup/.htaccess from manifest.


Index: config_data.inc
===================================================================
RCS file: /cvsroot/gallery/gallery/setup/config_data.inc,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- config_data.inc	27 Nov 2003 21:08:23 -0000	1.163
+++ config_data.inc	29 Nov 2003 10:30:05 -0000	1.164
@@ -645,11 +645,19 @@
 			),
 	"comments_anonymous" => array(
 		       	"prompt" => _("Anonymous comments from known users?"),
-		       	"desc" => sprintf(_("When logged in, comments will automatically use \
fullname and username, unless this is set to %s."),  +		       	"desc" => \
sprintf(_("When logged in, comments will automatically use format described below, \
unless this is set to %s."),   "<b>"._("yes")."</b>") .
 				newIn("1.4.1"),
 			"choices" => array("yes" => _("yes"), "no" => _("no")),
 		       	"value" => "no",
+			),
+
+	"comments_display_name" => array(
+			"prompt" => _("Format for commenter names"),
+			"desc" => _("Commenter names of logged in users can be dislayed in a variety of \
different ways") . +				newIn("1.4.2"),
+			"choices" => displayNameOptions(), 
+			"value" => "!!FULLNAME!! (!!USERNAME!!)",
 			),
 	"separator8" => array (
 		"type" => "separator",

Index: functions.inc
===================================================================
RCS file: /cvsroot/gallery/gallery/setup/functions.inc,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- functions.inc	25 Nov 2003 11:45:02 -0000	1.150
+++ functions.inc	29 Nov 2003 10:30:12 -0000	1.151
@@ -1315,4 +1315,26 @@
 ));
 return $result;
 }
+
+function displayNameOptions() {
+	return array (
+		"!!FULLNAME!! (!!USERNAME!!)" =>
+			sprintf("%s (%s)", _("Full Name"), _("Username")),
+		"!!USERNAME!! (!!FULLNAME!!)" =>
+			sprintf("%s (%s)", _("Username"), _("Full Name")),
+		"!!FULLNAME!!" =>
+			_("Full Name"),
+		"!!USERNAME!!" =>
+			_("Username"),
+		"!!MAILTO_FULLNAME!!" =>
+			_("Full name that you can click on to send email (mailto:)"),
+		"!!MAILTO_USERNAME!!" =>
+			_("Username that you can click on to send email (mailto:)"),
+		"!!FULLNAME!! (!!EMAIL!!)" =>
+			sprintf("%s (%s)", _("Full Name"), _("email address")),
+		"!!USERNAME!! (!!EMAIL!!)" =>
+			sprintf("%s (%s)", _("Username"), _("email address")),
+		     );
+}
+
 ?>



-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
__[ g a l l e r y - c h e c k i n s ]_________________________

[ list info/archive --> http://gallery.sf.net/lists.php ]
[ gallery info/FAQ/download --> http://gallery.sf.net ]


[prev in list] [next in list] [prev in thread] [next in thread]