diff --git a/core/includes/entity.inc b/core/includes/entity.inc index 5d930b5..6167f90 100644 --- a/core/includes/entity.inc +++ b/core/includes/entity.inc @@ -107,6 +107,13 @@ function entity_info_cache_clear() { /** * Returns the defined bundles for the given entity type. + * + * @param string $entity_type + * The entity type whose bundles should be returned. + * + * @return array + * An array containing the bundle names or the entity type name itself if no + * bundle is defined. */ function entity_get_bundles($entity_type) { $entity_info = entity_get_info($entity_type); diff --git a/core/lib/Drupal/Core/Entity/Entity.php b/core/lib/Drupal/Core/Entity/Entity.php index 9daaae0..65e0369 100644 --- a/core/lib/Drupal/Core/Entity/Entity.php +++ b/core/lib/Drupal/Core/Entity/Entity.php @@ -247,8 +247,9 @@ public function getTranslation($langcode, $strict = TRUE) { /** * Returns the languages the entity is translated to. * - * @todo: Remove once all entity types implement the entity field API. This - * is deprecated by TranslatableInterface::getTranslationLanguages(). + * @todo: Remove once all entity types implement the entity field API. + * This is deprecated by + * Drupal\Core\TypedData\TranslatableInterface::getTranslationLanguages(). */ public function translations() { return $this->getTranslationLanguages(FALSE); diff --git a/core/modules/node/node.module b/core/modules/node/node.module index d523adf..bdcf3cd 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -315,6 +315,7 @@ function node_admin_paths() { 'node/*/revisions/*/revert' => TRUE, 'node/*/revisions/*/delete' => TRUE, 'node/*/translations' => TRUE, + 'node/*/translations/*' => TRUE, 'node/add' => TRUE, 'node/add/*' => TRUE, ); diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityTranslationTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityTranslationTest.php index 44294af..57c4c37 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityTranslationTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityTranslationTest.php @@ -24,7 +24,7 @@ class EntityTranslationTest extends WebTestBase { * * @var array */ - public static $modules = array('entity_test', 'locale', 'node'); + public static $modules = array('entity_test', 'locale'); protected $langcodes; diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module index 7275ab9..f9f4860 100644 --- a/core/modules/taxonomy/taxonomy.module +++ b/core/modules/taxonomy/taxonomy.module @@ -413,6 +413,7 @@ function taxonomy_admin_paths() { 'taxonomy/term/*/edit' => TRUE, 'taxonomy/term/*/delete' => TRUE, 'taxonomy/term/*/translations' => TRUE, + 'taxonomy/term/*/translations/*' => TRUE, ); return $paths; } 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 d6a8181..8dcea24 100644 --- a/core/modules/translation_entity/lib/Drupal/translation_entity/EntityTranslationController.php +++ b/core/modules/translation_entity/lib/Drupal/translation_entity/EntityTranslationController.php @@ -273,7 +273,7 @@ public function entityFormSourceChange($form, &$form_state) { $path = $this->getBasePath($entity) . '/translations/add/' . $source . '/' . $form_controller->getFormLangcode($form_state); $form_state['redirect'] = array('path' => $path); $languages = language_list(); - drupal_set_message(t('Source language set to: %language', array('%language' => t($languages[$source]->name)))); + drupal_set_message(t('Source language set to: %language', array('%language' => $languages[$source]->name))); } /** @@ -283,8 +283,7 @@ function entityFormDelete($form, &$form_state) { $form_controller = translation_entity_form_controller($form_state); $entity = $form_controller->getEntity($form_state); if (count($entity->getTranslationLanguages()) > 1) { - $info = $entity->entityInfo(); - drupal_set_message(t('This will delete all the @entity_type translations.', array('@entity_type' => drupal_strtolower($info['label']))), 'warning'); + drupal_set_message(t('This will delete all the translations of %label.', array('%label' => $entity->label())), 'warning'); } } 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 6c7ebc9..e01e3c4 100644 --- a/core/modules/translation_entity/lib/Drupal/translation_entity/EntityTranslationControllerInterface.php +++ b/core/modules/translation_entity/lib/Drupal/translation_entity/EntityTranslationControllerInterface.php @@ -20,7 +20,7 @@ /** * Returns the base path for the current entity. * - * @param EntityInterface $entity + * @param Drupal\Core\Entity\EntityInterface $entity * The entity to the path should refer to. */ public function getBasePath(EntityInterface $entity); @@ -28,7 +28,7 @@ public function getBasePath(EntityInterface $entity); /** * Returns the path of the entity edit form. * - * @param EntityInterface $entity + * @param Drupal\Core\Entity\EntityInterface $entity * The entity to the path should refer to. */ public function getEditPath(EntityInterface $entity); @@ -36,7 +36,7 @@ public function getEditPath(EntityInterface $entity); /** * Returns the path of the entity view page. * - * @param EntityInterface $entity + * @param Drupal\Core\Entity\EntityInterface $entity * The entity to the path should refer to. */ public function getViewPath(EntityInterface $entity); @@ -46,8 +46,12 @@ public function getViewPath(EntityInterface $entity); * * @param Drupal\Core\Entity\EntityInterface $entity * The entity access should be checked for. - * @param $op - * The operation to be performed. + * @param string $op + * The operation to be performed. Possible values are: + * - "view" + * - "update" + * - "delete" + * - "create" * * @return * TRUE if the user is allowed to perform the given operation, FALSE @@ -57,6 +61,14 @@ public function getAccess(EntityInterface $entity, $op); /** * Checks if a user is allowed to edit the given translation. + * + * @param Drupal\Core\Entity\EntityInterface $entity + * The entity whose translation has to be accessed. + * @param string $langcode + * The language code identifying the translation to be accessed. + * + * @return boolean + * TRUE if the operation may be performed, FALSE otherwise. */ public function getTranslationAccess(EntityInterface $entity, $langcode); @@ -73,7 +85,7 @@ public function getSourceLangcode(array $form_state); * * @param Drupal\Core\Entity\EntityInterface $entity * The entity whose values should be removed. - * @param $langcode + * @param string $langcode * The language code identifying the translation being deleted. */ public function removeTranslation(EntityInterface $entity, $langcode); @@ -91,6 +103,13 @@ public function retranslate(EntityInterface $entity, $langcode = NULL); /** * Performs the needed alterations to the entity form. + * + * @param array $form + * The entity form to be altered to provide the translation workflow. + * @param array $form_state + * The form state array. + * @param Drupal\Core\Entity\EntityInterface $entity + * The entity being created or edited. */ public function entityFormAlter(array &$form, array &$form_state, EntityInterface $entity); } diff --git a/core/modules/translation_entity/tests/modules/translation_entity_test/translation_entity_test.info b/core/modules/translation_entity/tests/modules/translation_entity_test/translation_entity_test.info deleted file mode 100644 index 25026b2..0000000 --- a/core/modules/translation_entity/tests/modules/translation_entity_test/translation_entity_test.info +++ /dev/null @@ -1,8 +0,0 @@ -name = Entity Translation test module -description = Implements hooks to test the Entity Translaion functionality. -package = Testing -version = VERSION -core = 8.x -dependencies[] = entity_test -dependencies[] = translation_entity -hidden = TRUE diff --git a/core/modules/translation_entity/tests/modules/translation_entity_test/translation_entity_test.module b/core/modules/translation_entity/tests/modules/translation_entity_test/translation_entity_test.module deleted file mode 100644 index 240954b..0000000 --- a/core/modules/translation_entity/tests/modules/translation_entity_test/translation_entity_test.module +++ /dev/null @@ -1,6 +0,0 @@ - $field_name, '!translatable' => $translatable ? t('untranslatable') : t('translatable')); - drupal_set_message(t('The field %field_name is already !translatable. No change was performed.', $t_args), 'warning'); + $t_args = array('%field_name'); + $msg = $translatable ? + t('The field %field_name is already translatable. No change was performed.', $t_args): + t('The field %field_name is already untranslatable. No change was performed.', $t_args); + drupal_set_message($msg, 'warning'); return; } diff --git a/core/modules/translation_entity/translation_entity.module b/core/modules/translation_entity/translation_entity.module index fa8b476..ad979e3 100644 --- a/core/modules/translation_entity/translation_entity.module +++ b/core/modules/translation_entity/translation_entity.module @@ -214,8 +214,8 @@ function translation_entity_enabled($entity_type, $bundle = NULL, $skip_handler /** * Entity translation controller factory. * - * @param $entity - * The entity being translated. + * @param string $entity_type + * The type of the entity being translated. * * @return Drupal\translation_entity\EntityTranslationControllerInterface * An instance of the entity translation controller interface. @@ -244,9 +244,9 @@ function translation_entity_form_controller(array $form_state) { /** * Checks whether an entity translation is accessible. * - * @param $entity + * @param Drupal\Core\Entity\EntityInterface $entity * The entity to be accessed. - * @param $langcode + * @param string $langcode * The language of the translation to be accessed. * * @return diff --git a/core/modules/translation_entity/translation_entity.pages.inc b/core/modules/translation_entity/translation_entity.pages.inc index c688a81..6c0904e 100644 --- a/core/modules/translation_entity/translation_entity.pages.inc +++ b/core/modules/translation_entity/translation_entity.pages.inc @@ -67,11 +67,11 @@ function translation_entity_overview(EntityInterface $entity) { $translation = $entity->getTranslation($langcode, FALSE); $status = !isset($translation->status) || $translation->status ? t('Published') : t('Not published'); // @todo Add a theming function here. - $status .= !empty($entity->retranslate[$langcode]) ? ' - ' . t('outdated') . '' : ''; + $status = '' . $status . '' . (!empty($entity->retranslate[$langcode]) ? ' ' . t('outdated') . '' : ''); if ($is_original) { $language_name = t('@language_name', array('@language_name' => $language_name)); - $source_name = t('(original language)'); + $source_name = t('(original)'); } else { $source_name = isset($languages[$source]) ? $languages[$source]->name : t('n/a'); @@ -151,11 +151,17 @@ function translation_entity_add_page(EntityInterface $entity, Language $source = /** * Populates target values with the source values. + * + * @param Drupal\Core\Entity\EntityInterface $entity + * The entitiy being translated. + * @param Drupal\Core\Language\Language $source + * The language to be used as source. + * @param Drupal\Core\Language\Language $target + * The language to be used as target. */ function translation_entity_prepare_translation(EntityInterface $entity, Language $source, Language $target) { - // @todo Unify field and propesrty handling. + // @todo Unify field and property handling. $instances = field_info_instances($entity->entityType(), $entity->bundle()); - if ($entity instanceof EntityNG) { $source_translation = $entity->getTranslation($source->langcode); $target_translation = $entity->getTranslation($target->langcode); diff --git a/core/modules/user/user.module b/core/modules/user/user.module index cfa1cc6..60b3e84 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -1458,6 +1458,7 @@ function user_admin_paths() { 'user/*/edit' => TRUE, 'user/*/edit/*' => TRUE, 'user/*/translations' => TRUE, + 'user/*/translations/*' => TRUE, ); return $paths; }