diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module index e2c3cc9..ccbd5fd 100644 --- a/core/modules/comment/comment.module +++ b/core/modules/comment/comment.module @@ -413,7 +413,7 @@ function comment_permission() { if (module_exists('translation_entity') && translation_entity_enabled('comment')) { $permissions['translate comments'] = array( 'title' => t('Translate comments'), - 'description' => t('Role requires pemission create translations, edit translations or delete translations.'), + 'description' => t('Role will also require at least one of the following permissions: create translations, edit translations or delete translations.'), ); } diff --git a/core/modules/node/node.module b/core/modules/node/node.module index dbca9d0..86caa32 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -2759,7 +2759,7 @@ function node_list_permissions($type) { if (module_exists('translation_entity') && translation_entity_enabled('node', $type->type)) { $perms["translate any $type->type content"] = array( 'title' => t('%type_name: Translate any content', array('%type_name' => $type->name)), - 'description' => t('Role requires pemission create translations, edit translations or delete translations.'), + 'description' => t('Role will also require at least one of the following permissions: create translations, edit translations or delete translations.'), ); } diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module index f64af35..9601d3b 100644 --- a/core/modules/taxonomy/taxonomy.module +++ b/core/modules/taxonomy/taxonomy.module @@ -101,11 +101,11 @@ function taxonomy_permission() { 'title' => t('Delete terms from %vocabulary', array('%vocabulary' => $vocabulary->name)), ), ); - if (module_exists('translation_entity') && translation_entity_enabled('taxonomy_term', $vocabulary->name)) { + if (module_exists('translation_entity') && translation_entity_enabled('taxonomy_term', $vocabulary->id())) { $permissions += array( - 'translate terms in ' . $vocabulary->vid => array( - 'title' => t('Translate terms from %vocabulary', array('%vocabulary' => $vocabulary->name)), - 'description' => t('Role requires pemission create translations, edit translations or delete translations.'), + 'translate terms in ' . $vocabulary->id() => array( + 'title' => t('Translate terms from %vocabulary', array('%vocabulary' => $vocabulary->name)), + 'description' => t('Role will also require at least one of the following permissions: create translations, edit translations or delete translations.'), ), ); } diff --git a/core/modules/translation_entity/lib/Drupal/translation_entity/EntityTranslationController.php b/core/modules/translation_entity/lib/Drupal/translation_entity/EntityTranslationController.php index b48e958..7e4d718 100644 --- a/core/modules/translation_entity/lib/Drupal/translation_entity/EntityTranslationController.php +++ b/core/modules/translation_entity/lib/Drupal/translation_entity/EntityTranslationController.php @@ -284,7 +284,7 @@ public function entityFormSharedElements($element, $form_state, $form) { // Elements are considered to be non multilingual by default. if (empty($element[$key]['#multilingual'])) { // If we are displaying a multilingual entity form we need to provide - // transltability clues, otherwise the shared form elements should be + // translatability clues, otherwise the shared form elements should be // hidden. if (empty($form_state['translation_entity']['translation_form'])) { $this->addTranslatabilityClue($element[$key]); diff --git a/core/modules/translation_entity/lib/Drupal/translation_entity/EntityTranslationControllerInterface.php b/core/modules/translation_entity/lib/Drupal/translation_entity/EntityTranslationControllerInterface.php index 05e719d..a42a019 100644 --- a/core/modules/translation_entity/lib/Drupal/translation_entity/EntityTranslationControllerInterface.php +++ b/core/modules/translation_entity/lib/Drupal/translation_entity/EntityTranslationControllerInterface.php @@ -139,10 +139,9 @@ public function getAccess(EntityInterface $entity, $op); * The entity whose translation has to be accessed. * @param $op * The operation to be performed on the translation. Possible values are: - * - "view" + * - "create" * - "update" * - "delete" - * - "create" * * @return boolean * TRUE if the operation may be performed, FALSE otherwise. diff --git a/core/modules/translation_entity/lib/Drupal/translation_entity/EntityTranslationControllerNG.php b/core/modules/translation_entity/lib/Drupal/translation_entity/EntityTranslationControllerNG.php index 2dafab1..e2f48ee 100644 --- a/core/modules/translation_entity/lib/Drupal/translation_entity/EntityTranslationControllerNG.php +++ b/core/modules/translation_entity/lib/Drupal/translation_entity/EntityTranslationControllerNG.php @@ -15,14 +15,14 @@ class EntityTranslationControllerNG extends EntityTranslationController { /** - * Overrides Drupal\translation_entity.EntityTranslationController::getAccess(). + * Overrides \Drupal\translation_entity\EntityTranslationController::getAccess(). */ public function getAccess(EntityInterface $entity, $op) { return entity_access_controller($entity->entityType())->{$op . 'Access'}($entity); } /** - * Overrides EntityTranslationControllerInterface::removeTranslation(). + * Overrides \Drupal\translation_entity\EntityTranslationControllerInterface::removeTranslation(). */ public function removeTranslation(EntityInterface $entity, $langcode) { $translation = $entity->getTranslation($langcode); diff --git a/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationTestBase.php b/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationTestBase.php index 0ffb308..e2962f6 100644 --- a/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationTestBase.php +++ b/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationTestBase.php @@ -57,6 +57,7 @@ * @var \Drupal\user\Plugin\Core\Entity\User */ protected $administrator; + /** * The name of the field used to test translation. * diff --git a/core/modules/translation_entity/translation_entity.module b/core/modules/translation_entity/translation_entity.module index e9fd6c8..d3e5885 100644 --- a/core/modules/translation_entity/translation_entity.module +++ b/core/modules/translation_entity/translation_entity.module @@ -531,23 +531,20 @@ function translation_entity_access(EntityInterface $entity, $op) { function translation_entity_permission() { return array( 'administer entity translation' => array( - 'title' => t('Administer entity translation'), + 'title' => t('Administer translation settings'), 'description' => t('Configure translatability of entities and fields.'), ), - 'view entity translations' => array( - 'title' => t('Access translations'), - ), 'create entity translations' => array( 'title' => t('Create translations'), - 'description' => t('Role may require additional translate permissions for the entity type in question.'), + 'description' => t('Role may require additional translate permissions for specific entity types.'), ), 'update entity translations' => array( 'title' => t('Edit translations'), - 'description' => t('Role may require additional translate permissions for the entity type in question.'), + 'description' => t('Role may require additional translate permissions for specific entity types.'), ), 'delete entity translations' => array( 'title' => t('Delete translations'), - 'description' => t('Role may require additional translate permissions for the entity type in question.'), + 'description' => t('Role may require additional translate permissions for specific entity types.'), ), ); }