Merge lp:~quam-plures-core/quam-plures/qp-disp-titles into lp:quam-plures

[Lee Turner]

Added ability to customise titles for all disp pages.

[EdB (edb)]

Will grab this now and try to test tonight but I'm worn out from this "working" thing. And I gotta patch my other branch but that should be no problem.

[EdB (edb)]

Tested without issue. Changed a message form title, then figured out I needed a custom html_header to change the <title> tag, and both - of course - worked. Will merge this in fairly soon :)

review: Approve

=== modified file 'inc/_core/_template.funcs.php'
--- inc/_core/_template.funcs.php	2010-02-01 00:55:37 +0000
+++ inc/_core/_template.funcs.php	2010-03-30 19:20:36 +0000
@@ -213,20 +213,27 @@
  * 	'glue' => ' - ',
  * 	'format' => 'htmlbody',
  * 	'arcdir_text' => T_('Archive directory'),
- * 	'catdir_text' => T_('Category directory'),
+ *  'catdir_text' => T_('Category Directory'),
+ *  'mediaidx_text' => T_('Photo Index'),
+ *  'msgform_text' => T_('Send an Email Message'),
+ *  'profile_text' => T_('User Profile'),
+ *  'user_text' => T_('User'),
+ *  'subs_text' => T_('Subscriptions'),
+ *  'comments_text' => T_('Latest Comments'),
+ *  'feedback-popup_text' => T_('Feedback'),
  * ), $params );
  * </code>
  *
  * Displays title depending on value of $disp: 
  * - "Archive Directory" (arcdir_text param) title if $disp is 'arcdir'
  * - "Category Directory" (catdir_text param) title if $disp is 'catdir'
- * - "Latest comments (on)" title if $disp is 'comments'
- * - "Feedback on" title if $disp is 'feedback-popup'
- * - "User profile" title if $disp is 'profile'
- * - "Subscriptions" title if $disp is 'subs'
- * - "Send an email message" title if $disp is 'msgform'
+ * - "Latest comments (on)" (comments_text param) title if $disp is 'comments'
+ * - "Feedback on" (feedback-popup_text param) title if $disp is 'feedback-popup'
+ * - "User profile" (user_text param) title if $disp is 'user'
+ * - "Subscriptions" (subs_text param) title if $disp is 'subs'
+ * - "Send an email message" (msgform_text param) title if $disp is 'msgform'
+ * - "User" (user_text param) title if $disp is 'user'
  * - "PREVIEW" title if we are previewing an item
- * - "User" title if $disp is 'user'
  *
  * 'auto_pilot' => 'seo_title': Use the SEO title autopilot. (Default: "none")
  *
@@ -254,9 +261,16 @@
 			'title_page_after'    => '#',
 			'glue'                => ' - ',
 			'format'              => 'htmlbody',
-			'arcdir_text'         => T_('Archive directory'),
-			'catdir_text'         => T_('Category directory'),
-		), $params );
+			'arcdir_text'         => T_('Archive Directory'),
+			'catdir_text'         => T_('Category Directory'),
+			'mediaidx_text'       => T_('Photo Index'),
+			'msgform_text'        => T_('Send an Email Message'),
+			'profile_text'        => T_('User Profile'),
+			'user_text'           => T_('User'),
+			'subs_text'           => T_('Subscriptions'),
+			'comments_text'       => T_('Latest Comments'),
+			'feedback-popup_text' => T_('Feedback'),
+		), $params );		
 
 	if( $params['auto_pilot'] == 'seo_title' )
 	{	// We want to use the SEO title autopilot. Do overrides:
@@ -283,17 +297,22 @@
 			// We are requesting the archive directory:
 			$r[] = $params['catdir_text'];
 			break;
+			
+		case 'mediaidx':
+			// We are requesting the media index:
+			$r[] = $params['mediaidx_text'];
+			break;
 
 		case 'comments':
 			// We are requesting the latest comments:
 			global $Item;
 			if( isset( $Item ) )
 			{
-				$r[] = sprintf( /* TRANS: %s is an item title */ T_('Latest comments on %s'), $Item->get('title') );
+				$r[] = sprintf( /* TRANS: %s is an item title */ $params['comments_text'] . T_(' on %s'), $Item->get('title') );
 			}
 			else
 			{
-				$r[] = T_('Latest comments');
+				$r[] = $params['comments_text'];
 			}
 			break;
 
@@ -301,22 +320,22 @@
 			// We are requesting the comments on a specific post:
 			// Should be in first position
 			$Item = & $MainList->get_by_idx( 0 );
-			$r[] = sprintf( /* TRANS: %s is an item title */ T_('Feedback on %s'), $Item->get('title') );
+			$r[] = sprintf( /* TRANS: %s is an item title */ $params['feedback-popup_text'] . T_(' on %s'), $Item->get('title') );
 			break;
 
 		case 'profile':
 			// We are requesting the user profile:
-			$r[] = T_('User profile');
+			$r[] = $params['profile_text'];
 			break;
 
 		case 'subs':
 			// We are requesting the subscriptions screen:
-			$r[] = T_('Subscriptions');
+			$r[] = $params['subs_text'];
 			break;
 
 		case 'msgform':
 			// We are requesting the message form:
-			$r[] = T_('Send an email message');
+			$r[] = $params['msgform_text'];
 			break;
 
 		case 'single':
@@ -342,7 +361,7 @@
 
 		case 'user':
 			// We are requesting the message form:
-			$r[] = T_('User');
+			$r[] = $params['user_text'];
 			break;
 
 		default: