Merge branch '3.2.x' into 3.3.x

Author: marc1706

controller/manage/queue/queue.php

@@ -123,7 +123,7 @@ public function list_queues()
 		{
 			$this->template->assign_block_vars('categories', array(
 				'U_VIEW_CATEGORY'	=> $this->get_queue_url($queue_type),
-				'CATEGORY_NAME'		=> $this->types->get($queue_type)->lang,
+				'CATEGORY_NAME'		=> $this->types->get($queue_type)->lang['langs'],
 				'CATEGORY_CONTRIBS' => $counts[$queue_type],
 			));
 		}

controller/manage/queue_discussion.php

@@ -75,7 +75,7 @@ public function list_types()
 			$type = $this->get_type_from_id($id);
 			$this->template->assign_block_vars('categories', array(
 				'U_VIEW_CATEGORY'	=> $this->get_type_url($type),
-				'CATEGORY_NAME'		=> $type->lang,
+				'CATEGORY_NAME'		=> $type->lang['langs'],
 				'CATEGORY_CONTRIBS' => $counts[$id],
 			));
 		}
@@ -115,7 +115,7 @@ public function display_type($queue_type)
 
 		// Add to Breadcrumbs
 		$this->display->generate_breadcrumbs(array(
-			$type->lang	=> $this->get_type_url($type),
+			$type->lang['lang']	=> $this->get_type_url($type),
 		));
 
 		\topics_overlord::display_forums_complete('queue_discussion', false, array('topic_category' => $type->id));

controller/ucp/subscriptions.php

@@ -560,7 +560,7 @@ protected function get_queue_tpl_row($row)
 
 		return array(
 			'SUBSCRIPTION_ID'		=> $queue_id,
-			'SUBSCRIPTION_TARGET'	=> $type->lang,
+			'SUBSCRIPTION_TARGET'	=> $type->lang['lang'],
 			'SUBSCRIPTION_TIME'		=> $this->user->format_date($row['watch_mark_time']),
 			'SUBSCRIPTION_TITLE'	=> $this->user->lang['SUBSCRIPTION_QUEUE'],
 			'SUBSCRIPTION_TYPE'		=> $row['watch_object_type'],

language/en/types/translation.php

@@ -51,6 +51,7 @@
 	'TRANSLATION_VALIDATION_TESTS'				=> 'Please review the results of the automatic translation validation before proceeding.',
 
 	'TRANSLATION'								=> 'Language Pack',
+	'TRANSLATIONS'								=> 'Language Packs',
 	'TRANSLATION_CONTRIB_CLEANED'				=> 'Cleaned',
 	'TRANSLATION_CONTRIB_DISABLED'				=> 'Hidden + Disabled',
 	'TRANSLATION_CONTRIB_HIDDEN'				=> 'Hidden',