From 008b9e69f83c32190d73503a7e682f9ab49dd1d7 Mon Sep 17 00:00:00 2001 From: webchick Date: Wed, 30 Jan 2013 13:41:03 -0800 Subject: [PATCH] Issue #1807776 follow-up by plach: Minor fixes for Support both simple and editorial workflows for translating entities. --- core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php | 2 +- core/modules/translation_entity/translation_entity.module | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php index 1eb16b0e78e6..4fb76a5f963a 100644 --- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php +++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php @@ -462,7 +462,7 @@ abstract class WebTestBase extends TestBase { * @param array $permissions * Array of permission names to assign to user. Note that the user always * has the default permissions derived from the "authenticated users" role. - * @param $name + * @param string $name * The user name. * * @return object|false diff --git a/core/modules/translation_entity/translation_entity.module b/core/modules/translation_entity/translation_entity.module index cdaf9d29a269..0167180752a9 100644 --- a/core/modules/translation_entity/translation_entity.module +++ b/core/modules/translation_entity/translation_entity.module @@ -559,9 +559,9 @@ function translation_entity_permission() { case 'bundle': foreach (entity_get_bundles($entity_type) as $bundle => $bundle_info) { if (translation_entity_enabled($entity_type, $bundle)) { - $t_args['%bundle_label'] = isset($info['bundles'][$bundle]['label']) ? $info['bundles'][$bundle]['label'] : $bundle; + $t_args['%bundle_label'] = isset($bundle_info['label']) ? $bundle_info['label'] : $bundle; $permission["translate $bundle $entity_type"] = array( - 'title' => t('Translate %bundle_label @entity_label', $t_args), + 'title' => t('Translate %bundle_label @entity_label', $t_args), ); } }