diff --git a/core/modules/content_translation/content_translation.module b/core/modules/content_translation/content_translation.module index 0d476cb..3301f9f 100644 --- a/core/modules/content_translation/content_translation.module +++ b/core/modules/content_translation/content_translation.module @@ -169,7 +169,7 @@ function content_translation_menu() { $path = _content_translation_link_to_router_path($entity_type, $info['links']['canonical']); $entity_position = count(explode('/', $path)) - 1; $keys = array_flip(array('load_arguments')); - $menu_info = array_intersect_key($info['translation']['content_translation'], $keys) + array('file' => 'content_translation.pages.inc'); + $menu_info = array_intersect_key($info['translation']['content_translation'], $keys); $item = array(); // Plugin annotations cannot contain spaces, thus we need to restore them @@ -181,8 +181,6 @@ function content_translation_menu() { // Add translation callback. // @todo Add the access callback instead of replacing it as soon as the // routing system supports multiple callbacks. - $language_position = $entity_position + 3; - $args = array($entity_position, $language_position, $language_position + 1); $items["$path/translations/add/%language/%language"] = array( 'title' => 'Add', 'route_name' => "content_translation.translation_add_$entity_type", @@ -190,7 +188,6 @@ function content_translation_menu() { ); // Edit translation callback. - $args = array($entity_position, $language_position); $items["$path/translations/edit/%language"] = array( 'title' => 'Edit', 'route_name' => "content_translation.translation_edit_$entity_type", @@ -201,7 +198,7 @@ function content_translation_menu() { $items["$path/translations/delete/%language"] = array( 'title' => 'Delete', 'route_name' => "content_translation.delete_$entity_type", - ) + $item; + ); } } @@ -334,42 +331,6 @@ function content_translation_view_access(EntityInterface $entity, $langcode, Acc } /** - * Access callback for the translation addition page. - * - * @param \Drupal\Core\Entity\EntityInterface $entity - * The entity being translated. - * @param \Drupal\Core\Language\Language $source - * (optional) The language of the values being translated. Defaults to the - * entity language. - * @param \Drupal\Core\Language\Language $target - * (optional) The language of the translated values. Defaults to the current - * content language. - */ -function content_translation_add_access(EntityInterface $entity, Language $source = NULL, Language $target = NULL) { - $source = !empty($source) ? $source : $entity->language(); - $target = !empty($target) ? $target : language(Language::TYPE_CONTENT); - $translations = $entity->getTranslationLanguages(); - $languages = language_list(); - return $source->id != $target->id && isset($languages[$source->id]) && isset($languages[$target->id]) && !isset($translations[$target->id]) && content_translation_access($entity, 'create'); -} - -/** - * Access callback for the translation edit page. - * - * @param \Drupal\Core\Entity\EntityInterface $entity - * The entity being translated. - * @param \Drupal\Core\Language\Language $language - * (optional) The language of the translated values. Defaults to the current - * content language. - */ -function content_translation_edit_access(EntityInterface $entity, Language $language = NULL) { - $language = !empty($language) ? $language : language(Language::TYPE_CONTENT); - $translations = $entity->getTranslationLanguages(); - $languages = language_list(); - return isset($languages[$language->id]) && $language->id != $entity->getUntranslated()->language()->id && isset($translations[$language->id]) && content_translation_access($entity, 'update'); -} - -/** * Access callback for the translation delete page. * * @param \Drupal\Core\Entity\EntityInterface $entity @@ -444,7 +405,7 @@ function content_translation_get_config_key($entity_type, $bundle, $setting) { * @param string $setting * The name of the setting. * - * @returns mixed + * @return mixed * The stored value for the given setting. */ function content_translation_get_config($entity_type, $bundle, $setting) { @@ -478,7 +439,7 @@ function content_translation_set_config($entity_type, $bundle, $setting, $value) * (optional) The bundle of the entity. If no bundle is provided, all the * available bundles are checked. * - * @returns + * @return bool * TRUE if the specified bundle is translatable. If no bundle is provided * returns TRUE if at least one of the entity bundles is translatable. * @@ -1027,3 +988,41 @@ function content_translation_save_settings($settings) { entity_info_cache_clear(); menu_router_rebuild(); } + +/** + * Returns the localized links for the given path. + * + * @param string $path + * The path for which language switch links should be provided. + * + * @return array + * A renderable array of language switch links. + */ +function _content_translation_get_switch_links($path) { + $links = language_negotiation_get_switch_links(Language::TYPE_CONTENT, $path); + if (empty($links)) { + // If content language is set up to fall back to the interface language, + // then there will be no switch links for Language::TYPE_CONTENT, ergo we + // also need to use interface switch links. + $links = language_negotiation_get_switch_links(Language::TYPE_INTERFACE, $path); + } + return $links; +} + +/** + * Populates target values with the source values. + * + * @param \Drupal\Core\Entity\EntityInterface $entity + * The entity 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 content_translation_prepare_translation(EntityInterface $entity, Language $source, Language $target) { + if ($entity instanceof ContentEntityInterface) { + $source_translation = $entity->getTranslation($source->id); + $entity->addTranslation($target->id, $source_translation->getPropertyValues()); + } +} + diff --git a/core/modules/content_translation/content_translation.pages.inc b/core/modules/content_translation/content_translation.pages.inc index 2e5fa6b..8fe70fe 100644 --- a/core/modules/content_translation/content_translation.pages.inc +++ b/core/modules/content_translation/content_translation.pages.inc @@ -150,26 +150,6 @@ function content_translation_overview(EntityInterface $entity) { } /** - * Returns the localized links for the given path. - * - * @param string $path - * The path for which language switch links should be provided. - * - * @returns - * A renderable array of language switch links. - */ -function _content_translation_get_switch_links($path) { - $links = language_negotiation_get_switch_links(Language::TYPE_CONTENT, $path); - if (empty($links)) { - // If content language is set up to fall back to the interface language, - // then there will be no switch links for Language::TYPE_CONTENT, ergo we - // also need to use interface switch links. - $links = language_negotiation_get_switch_links(Language::TYPE_INTERFACE, $path); - } - return $links; -} - -/** * Page callback for the translation addition page. * * @param EntityInterface $entity diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Access/ContentTranslationManageAccessCheck.php b/core/modules/content_translation/lib/Drupal/content_translation/Access/ContentTranslationManageAccessCheck.php index 16cc31a..88099a5 100644 --- a/core/modules/content_translation/lib/Drupal/content_translation/Access/ContentTranslationManageAccessCheck.php +++ b/core/modules/content_translation/lib/Drupal/content_translation/Access/ContentTranslationManageAccessCheck.php @@ -60,8 +60,8 @@ public function access(Route $route, Request $request, AccountInterface $account switch ($operation) { case 'create': - $source = language_load($request->attributes->get('source')); - $target = language_load($request->attributes->get('target')); + $source = $request->attributes->get('source'); + $target = $request->attributes->get('target'); $source = !empty($source) ? $source : $entity->language(); $target = !empty($target) ? $target : language(Language::TYPE_CONTENT); return ($source->id != $target->id @@ -73,7 +73,7 @@ public function access(Route $route, Request $request, AccountInterface $account case 'update': case 'delete': - $language = language_load($request->attributes->get('language')); + $language = $request->attributes->get('language'); $language = !empty($language) ? $language : language(Language::TYPE_CONTENT); return isset($languages[$language->id]) && $language->id != $entity->getUntranslated()->language()->id diff --git a/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php b/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php index 6d14c1b..6bf6a51 100644 --- a/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php +++ b/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php @@ -199,8 +199,11 @@ public function entityFormAlter(array &$form, array &$form_state, EntityInterfac // A new translation is not available in the translation metadata, hence // it should count as one more. $published = $new_translation; - foreach ($entity->translation as $translation) { - $published += $translation['status']; + // When creating a brand new translation, $entity->translation is not set. + if (!($new_translation)) { + foreach ($entity->translation as $translation) { + $published += $translation['status']; + } } $enabled = $published > 1; } diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Controller/ContentTranslationController.php b/core/modules/content_translation/lib/Drupal/content_translation/Controller/ContentTranslationController.php index 0550bde..5390fbe 100644 --- a/core/modules/content_translation/lib/Drupal/content_translation/Controller/ContentTranslationController.php +++ b/core/modules/content_translation/lib/Drupal/content_translation/Controller/ContentTranslationController.php @@ -7,41 +7,282 @@ namespace Drupal\content_translation\Controller; +use Drupal\Core\Controller\ControllerBase; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; +use Drupal\Core\Entity\EntityInterface; +use Drupal\field\FieldInfo; +use Drupal\Core\Language\Language; +use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\Request; /** * Base class for entity translation controllers. */ -class ContentTranslationController { +class ContentTranslationController extends ControllerBase implements ContainerInjectionInterface { /** - * @todo Remove content_translation_overview(). + * The field info service. + * + * @var \Drupal\field\FieldInfo + */ + protected $fieldInfo; + + /** + * Constructs a ContentTranslationController object. + * + * @param \Drupal\Field\FieldInfo + * The field info service. + */ + public function __construct(FieldInfo $field_info) { + $this->fieldInfo = $field_info; + } + + /** + * {inheritdoc} + */ + public static function create(ContainerInterface $container) { + return new static( + $container->get('field.info') + ); + } + + /** + * Translations overview page builder. + * + * @param \Symfony\Component\HttpFoundation\Request $request + * The request object from which to extract the entity type. + * + * @return array + * Array of page elements to render. */ public function overview(Request $request) { - $entity = $request->attributes->get($request->attributes->get('_entity_type')); - module_load_include('pages.inc', 'content_translation'); - return content_translation_overview($entity); + $entity_type = $request->attributes->get('_entity_type'); + $entity = $request->attributes->get($entity_type); + $account = $this->currentUser(); + $controller_class = $this->entityManager()->getControllerClass($entity_type, 'translation'); + $controller = new $controller_class($entity_type, $entity->entityInfo()); + + $languages = language_list(); + $original = $entity->getUntranslated()->language()->id; + $translations = $entity->getTranslationLanguages(); + $field_ui = $this->moduleHandler()->moduleExists('field_ui') && $account->hasPermission('administer ' . $entity_type . ' fields'); + + $uri = $entity->uri(); + $path = isset($uri['path']) ? $uri['path'] : NULL; + + $translation_uri = $entity->uri('drupal:content-translation-overview'); + $base_path = isset($translation_uri['path']) ? $translation_uri['path'] : NULL; + + $edit_uri = $entity->uri('edit-form'); + $edit_path = isset($edit_uri['path']) ? $edit_uri['path'] : NULL; + + $header = array( + $this->t('Language'), + $this->t('Translation'), + $this->t('Source language'), + $this->t('Status'), + $this->t('Operations'), + ); + $rows = array(); + + if ($this->languageManager()->isMultilingual()) { + // If we have a view path defined for the current entity get the switch + // links based on it. + if ($path) { + $links = _content_translation_get_switch_links($path); + } + + // Determine whether the current entity is translatable. + $translatable = FALSE; + foreach ($this->fieldInfo->getBundleInstances($entity_type, $entity->bundle()) as $instance) { + if ($instance->isTranslatable()) { + $translatable = TRUE; + break; + } + } + + foreach ($languages as $language) { + $language_name = $language->name; + $langcode = $language->id; + $add_path = $base_path . '/add/' . $original . '/' . $langcode; + $translate_path = $base_path . '/edit/' . $langcode; + $delete_path = $base_path . '/delete/' . $langcode; + + if ($base_path) { + $add_links = _content_translation_get_switch_links($add_path); + $edit_links = _content_translation_get_switch_links($edit_path); + $translate_links = _content_translation_get_switch_links($translate_path); + $delete_links = _content_translation_get_switch_links($delete_path); + } + + $operations = array( + 'data' => array( + '#type' => 'operations', + '#links' => array(), + ), + ); + $links = &$operations['data']['#links']; + + if (isset($translations[$langcode])) { + // Existing translation in the translation set: display status. + $source = isset($entity->translation[$langcode]['source']) ? $entity->translation[$langcode]['source'] : ''; + $is_original = $langcode == $original; + $translation = $translations[$langcode]; + $label = $entity->label($langcode); + $link = isset($links->links[$langcode]['href']) ? $links->links[$langcode] : array( + 'href' => $path, + 'language' => $language, + ); + $row_title = l($label, $link['href'], $link); + + if (empty($link['href'])) { + $row_title = $is_original ? $label : $this->t('n/a'); + } + + // If the user is allowed to edit the entity we point the edit link to + // the entity form, otherwise if we are not dealing with the original + // language we point the link to the translation form. + if ($edit_path && $entity->access('update')) { + $links['edit'] = isset($edit_links->links[$langcode]['href']) ? $edit_links->links[$langcode] : array( + 'href' => $edit_path, + 'language' => $language, + ); + } + elseif (!$is_original && $controller->getTranslationAccess($entity, 'update')) { + $links['edit'] = isset($translate_links->links[$langcode]['href']) ? $translate_links->links[$langcode] : array( + 'href' => $translate_path, + 'language' => $language, + ); + } + + if (isset($links['edit'])) { + $links['edit']['title'] = $this->t('Edit'); + } + $translation = $entity->translation[$langcode]; + $status = !empty($translation['status']) ? $this->t('Published') : $this->t('Not published'); + // @todo Add a theming function here. + $status = '' . $status . '' . (!empty($translation['outdated']) ? ' ' . $this->t('outdated') . '' : ''); + + if ($is_original) { + $language_name = $this->t('@language_name (Original language)', array('@language_name' => $language_name)); + $source_name = $this->t('n/a'); + } + else { + $source_name = isset($languages[$source]) ? $languages[$source]->name : $this->t('n/a'); + if ($controller->getTranslationAccess($entity, 'delete')) { + $links['delete'] = isset($delete_links->links[$langcode]['href']) ? $delete_links->links[$langcode] : array( + 'href' => $delete_links, + 'language' => $language, + ); + $links['delete']['title'] = $this->t('Delete'); + } + } + } + else { + // No such translation in the set yet: help user to create it. + $row_title = $source_name = $this->t('n/a'); + $source = $entity->language()->id; + + if ($source != $langcode && $controller->getTranslationAccess($entity, 'create')) { + if ($translatable) { + $links['add'] = isset($add_links->links[$langcode]['href']) ? $add_links->links[$langcode] : array( + 'href' => $add_path, + 'language' => $language, + ); + $links['add']['title'] = $this->t('Add'); + } + elseif ($field_ui) { + $entity_path = $this->entityManager()->getAdminPath($entity_type, $entity->bundle()); + // Link directly to the fields tab to make it easier to find the + // setting to enable translation on fields. + $path = $entity_path . '/fields'; + $links['nofields'] = array( + 'title' => $this->t('No translatable fields'), + 'href' => $path, + 'language' => $language, + ); + } + } + + $status = $this->t('Not translated'); + } + + $rows[] = array( + $language_name, + $row_title, + $source_name, + $status, + $operations, + ); + } + } + + $build['#title'] = $this->t('Translations of %label', array('%label' => $entity->label())); + + // Add metadata to the build render array to let other modules know about + // which entity this is. + $build['#entity'] = $entity; + + $build['content_translation_overview'] = array( + '#theme' => 'table', + '#header' => $header, + '#rows' => $rows, + ); + + return $build; } /** - * @todo Remove content_translation_add_page(). + * Translation addition page builder. + * + * @param \Drupal\language\Plugin\Condition\Language $source + * (optional) The language of the values being translated. Defaults to the + * entity language. + * @param \Drupal\language\Plugin\Condition\Language $target + * (optional) The language of the translated values. Defaults to the current + * content language. + * @param \Symfony\Component\HttpFoundation\Request $request + * The request object from which to extract the entity type. + * + * @return array + * A processed form array ready to be rendered. */ - public function add(Request $request, $source, $target) { - $entity = $request->attributes->get($request->attributes->get('_entity_type')); - module_load_include('pages.inc', 'content_translation'); - $source = language_load($source); - $target = language_load($target); - return content_translation_add_page($entity, $source, $target); + public function add(Language $source, Language $target, Request $request) { + $entity_type = $request->attributes->get('_entity_type'); + $entity = $request->attributes->get($entity_type); + + $source = !empty($source) ? $source : $entity->language(); + $target = !empty($target) ? $target : language(Language::TYPE_CONTENT); + + // @todo Exploit the upcoming hook_entity_prepare() when available. + content_translation_prepare_translation($entity, $source, $target); + $info = $entity->entityInfo(); + $operation = isset($info['default_operation']) ? $info['default_operation'] : 'default'; + $form_state['langcode'] = $target->id; + $form_state['content_translation']['source'] = $source; + $form_state['content_translation']['target'] = $target; + $form_state['content_translation']['translation_form'] = !$entity->access('update'); + return $this->entityManager()->getForm($entity, $operation, $form_state); } /** - * @todo Remove content_translation_edit_page(). + * Page callback for the edit translation page. + * + * @param \Drupal\Core\Entity\EntityInterface $entity + * The entity being translated. + * @param \Drupal\language\Plugin\Condition\Language $language + * (optional) The language of the translated values. Defaults to the current + * content language. + * + * @return array + * A processed form array ready to be rendered. */ - public function edit(Request $request, $language) { - $entity = $request->attributes->get($request->attributes->get('_entity_type')); - module_load_include('pages.inc', 'content_translation'); - $language = language_load($language); - return content_translation_edit_page($entity, $language); + public function edit(EntityInterface $entity, Language $language) { + $info = $entity->entityInfo(); + $operation = isset($info['default_operation']) ? $info['default_operation'] : 'default'; + $form_state['langcode'] = $language->id; + $form_state['content_translation']['translation_form'] = TRUE; + return $this->entityManager()->getForm($entity, $operation, $form_state); } } diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Routing/ContentTranslationRouteSubscriber.php b/core/modules/content_translation/lib/Drupal/content_translation/Routing/ContentTranslationRouteSubscriber.php index 2390090..7a8f9be 100644 --- a/core/modules/content_translation/lib/Drupal/content_translation/Routing/ContentTranslationRouteSubscriber.php +++ b/core/modules/content_translation/lib/Drupal/content_translation/Routing/ContentTranslationRouteSubscriber.php @@ -89,6 +89,12 @@ protected function alterRoutes(RouteCollection $collection, $provider) { 'entity' => array( 'type' => 'entity:' . $entity_type, ), + 'source' => array( + 'type' => 'language', + ), + 'target' => array( + 'type' => 'language', + ), ), ) ); @@ -112,6 +118,9 @@ protected function alterRoutes(RouteCollection $collection, $provider) { 'entity' => array( 'type' => 'entity:' . $entity_type, ), + 'language' => array( + 'type' => 'language', + ), ), ) ); @@ -134,6 +143,9 @@ protected function alterRoutes(RouteCollection $collection, $provider) { 'entity' => array( 'type' => 'entity:' . $entity_type, ), + 'language' => array( + 'type' => 'language', + ), ), '_access_mode' => 'ANY', ) diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationWorkflowsTest.php b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationWorkflowsTest.php index 0b3da77..dc2d519 100644 --- a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationWorkflowsTest.php +++ b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationWorkflowsTest.php @@ -179,7 +179,7 @@ protected function assertWorkflows(UserInterface $user, $expected_status) { else { $this->drupalGet($edit_translation_path, $options); } - $this->assertResponse($expected_status['edit_translation'], format_string('The @user_label has the expected translation creation access.', $args)); + $this->assertResponse($expected_status['edit_translation'], format_string('The @user_label has the expected translation edit access.', $args)); } /** diff --git a/core/modules/language/language.services.yml b/core/modules/language/language.services.yml index d6599b3..aa2f52a 100644 --- a/core/modules/language/language.services.yml +++ b/core/modules/language/language.services.yml @@ -5,3 +5,8 @@ services: tags: - { name: path_processor_inbound, priority: 300 } - { name: path_processor_outbound, priority: 100 } + + language_converter: + class: Drupal\language\LanguageConverter + tags: + - { name: paramconverter } diff --git a/core/modules/language/lib/Drupal/language/LanguageConverter.php b/core/modules/language/lib/Drupal/language/LanguageConverter.php new file mode 100644 index 0000000..375cfaf --- /dev/null +++ b/core/modules/language/lib/Drupal/language/LanguageConverter.php @@ -0,0 +1,41 @@ +