diff --git c/core/lib/Drupal/Core/Entity/EntityManager.php w/core/lib/Drupal/Core/Entity/EntityManager.php
index 67e5690..7f5155a 100644
--- c/core/lib/Drupal/Core/Entity/EntityManager.php
+++ w/core/lib/Drupal/Core/Entity/EntityManager.php
@@ -347,7 +347,7 @@ public function getAccessController($entity_type) {
* @return mixed.
* A controller instance.
*/
- protected function getController($entity_type, $controller_type) {
+ public function getController($entity_type, $controller_type) {
if (!isset($this->controllers[$controller_type][$entity_type])) {
$class = $this->getControllerClass($entity_type, $controller_type);
if (in_array('Drupal\Core\Entity\EntityControllerInterface', class_implements($class))) {
diff --git c/core/modules/content_translation/content_translation.module w/core/modules/content_translation/content_translation.module
index a6cf31c..4243233 100644
--- c/core/modules/content_translation/content_translation.module
+++ w/core/modules/content_translation/content_translation.module
@@ -138,7 +138,7 @@ function content_translation_menu() {
$path = $info['menu_base_path'];
$entity_position = count(explode('/', $path)) - 1;
$keys = array_flip(array('theme_callback', 'theme_arguments', 'access_callback', 'access_arguments', '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
@@ -151,6 +151,7 @@ function content_translation_menu() {
'title' => 'Translate',
'route_name' => "content_translation.translation_overview_$entity_type",
'type' => MENU_LOCAL_TASK,
+ 'route_name' => "content_translation.translation_overview.$entity_type",
'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE,
'weight' => 2,
) + $item;
@@ -164,8 +165,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",
@@ -173,7 +172,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",
@@ -286,42 +284,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
@@ -1011,3 +973,54 @@ 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.
+ *
+ * @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;
+}
+
+/**
+ * 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 content_translation_prepare_translation(EntityInterface $entity, Language $source, Language $target) {
+ // @todo Unify field and property handling.
+ $entity = $entity->getNGEntity();
+ if ($entity instanceof EntityNG) {
+ $source_translation = $entity->getTranslation($source->id);
+ $entity->addTranslation($target->id, $source_translation->getPropertyValues());
+ }
+ else {
+ $instances = field_info_instances($entity->entityType(), $entity->bundle());
+ foreach ($instances as $field_name => $instance) {
+ $field = field_info_field($field_name);
+ if (!empty($field['translatable'])) {
+ $value = $entity->get($field_name);
+ $value[$target->id] = isset($value[$source->id]) ? $value[$source->id] : array();
+ $entity->set($field_name, $value);
+ }
+ }
+ }
+}
+
diff --git c/core/modules/content_translation/content_translation.pages.inc w/core/modules/content_translation/content_translation.pages.inc
deleted file mode 100644
index be151b9..0000000
--- c/core/modules/content_translation/content_translation.pages.inc
+++ /dev/null
@@ -1,287 +0,0 @@
-entityType());
- $entity_manager = \Drupal::entityManager();
- $languages = language_list();
- $original = $entity->getUntranslated()->language()->id;
- $translations = $entity->getTranslationLanguages();
- $field_ui = module_exists('field_ui') && user_access('administer ' . $entity->entityType() . ' fields');
-
- $path = $controller->getViewPath($entity);
- $base_path = $controller->getBasePath($entity);
- $edit_path = $controller->getEditPath($entity);
-
- $header = array(t('Language'), t('Translation'), t('Source language'), t('Status'), t('Operations'));
- $rows = array();
-
- if (language_multilingual()) {
- // 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 (field_info_instances($entity->entityType(), $entity->bundle()) as $instance) {
- $field = $instance->getField();
- if ($field['translatable']) {
- $translatable = TRUE;
- break;
- }
- }
-
- foreach ($languages as $language) {
- $language_name = $language->name;
- $langcode = $language->id;
- $add_path = $base_path . '/translations/add/' . $original . '/' . $langcode;
- $translate_path = $base_path . '/translations/edit/' . $langcode;
- $delete_path = $base_path . '/translations/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 : 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'] = t('Edit');
- }
-
- $translation = $entity->translation[$langcode];
- $status = !empty($translation['status']) ? t('Published') : t('Not published');
- // @todo Add a theming function here.
- $status = '' . $status . '' . (!empty($translation['outdated']) ? ' ' . t('outdated') . '' : '');
-
- if ($is_original) {
- $language_name = t('@language_name (Original language)', array('@language_name' => $language_name));
- $source_name = t('n/a');
- }
- else {
- $source_name = isset($languages[$source]) ? $languages[$source]->name : 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'] = t('Delete');
- }
- }
- }
- else {
- // No such translation in the set yet: help user to create it.
- $row_title = $source_name = 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'] = t('Add');
- }
- elseif ($field_ui) {
- $entity_path = $entity_manager->getAdminPath($entity->entityType(), $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' => t('No translatable fields'), 'href' => $path, 'language' => $language);
- }
- }
-
- $status = t('Not translated');
- }
-
- $rows[] = array($language_name, $row_title, $source_name, $status, $operations);
- }
- }
-
- drupal_set_title(t('Translations of %label', array('%label' => $entity->label())), PASS_THROUGH);
-
- // 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;
-}
-
-/**
- * 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
- * The entity being translated.
- * @param Language $source
- * (optional) The language of the values being translated. Defaults to the
- * entity language.
- * @param Language $target
- * (optional) The language of the translated values. Defaults to the current
- * content language.
- *
- * @return array
- * A processed form array ready to be rendered.
- *
- * @deprecated Use \Drupal\content_translation\Controller\ContentTranslationController::add()
- */
-function content_translation_add_page(EntityInterface $entity, Language $source = NULL, Language $target = NULL) {
- $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;
- $controller = content_translation_controller($entity->entityType());
- $form_state['content_translation']['translation_form'] = !$entity->access('update');
- return \Drupal::entityManager()->getForm($entity, $operation, $form_state);
-}
-
-/**
- * Page 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.
- *
- * @return array
- * A processed form array ready to be rendered.
- *
- * @deprecated Use \Drupal\content_translation\Controller\ContentTranslationController::edit()
- */
-function content_translation_edit_page(EntityInterface $entity, Language $language = NULL) {
- $language = !empty($language) ? $language : language(Language::TYPE_CONTENT);
- $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 \Drupal::entityManager()->getForm($entity, $operation, $form_state);
-}
-
-/**
- * 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 content_translation_prepare_translation(EntityInterface $entity, Language $source, Language $target) {
- $source_translation = $entity->getTranslation($source->id);
- $entity->addTranslation($target->id, $source_translation->getPropertyValues());
-}
-
-/**
- * Form constructor for the translation deletion confirmation.
- *
- * @deprecated Use \Drupal\content_translation\Form\ContentTranslationForm::deleteTranslation()
- */
-function content_translation_delete_confirm(array $form, array $form_state, EntityInterface $entity, Language $language) {
- $langcode = $language->id;
- $controller = content_translation_controller($entity->entityType());
-
- return confirm_form(
- $form,
- t('Are you sure you want to delete the @language translation of %label?', array('@language' => $language->name, '%label' => $entity->label())),
- $controller->getEditPath($entity),
- t('This action cannot be undone.'),
- t('Delete'),
- t('Cancel')
- );
-}
-
-/**
- * Form submission handler for content_translation_delete_confirm().
- */
-function content_translation_delete_confirm_submit(array $form, array &$form_state) {
- list($entity, $language) = $form_state['build_info']['args'];
- $controller = content_translation_controller($entity->entityType());
-
- // Remove the translated values.
- $controller->removeTranslation($entity, $language->id);
- $entity->save();
-
- // Remove any existing path alias for the removed translation.
- // @todo This should be taken care of by the Path module.
- if (module_exists('path')) {
- $conditions = array('source' => $controller->getViewPath($entity), 'langcode' => $language->id);
- \Drupal::service('path.crud')->delete($conditions);
- }
-
- $form_state['redirect'] = $controller->getBasePath($entity) . '/translations';
-}
diff --git c/core/modules/content_translation/lib/Drupal/content_translation/Controller/ContentTranslationController.php w/core/modules/content_translation/lib/Drupal/content_translation/Controller/ContentTranslationController.php
index ec229e1..f629330 100644
--- c/core/modules/content_translation/lib/Drupal/content_translation/Controller/ContentTranslationController.php
+++ w/core/modules/content_translation/lib/Drupal/content_translation/Controller/ContentTranslationController.php
@@ -7,38 +7,276 @@
namespace Drupal\content_translation\Controller;
+use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\field\FieldInfo;
+use Drupal\Core\Language\Language;
+use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* 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 \Drupal\Core\Entity\EntityInterface $entity
+ * The entity to be translationd.
+ *
+ * @return array
+ * Array of page elements to render.
*/
public function overview(EntityInterface $entity) {
- module_load_include('pages.inc', 'content_translation');
- return content_translation_overview($entity);
+ $account = $this->currentUser();
+ $entity_type = $entity->entityType();
+ $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');
+ $path = $controller->getViewPath($entity);
+ $base_path = $controller->getBasePath($entity);
+ $edit_path = $controller->getEditPath($entity);
+
+ $header = array(
+ $this->t('Language'),
+ $this->t('Translation'),
+ $this->t('Source language'),
+ $this->t('Status'),
+ $this->t('Operations'),
+ );
+ $rows = array();
+
+ if (language_multilingual()) {
+ // 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) {
+ $field = $instance->getField();
+ if ($field['translatable']) {
+ $translatable = TRUE;
+ break;
+ }
+ }
+
+ foreach ($languages as $language) {
+ $language_name = $language->name;
+ $langcode = $language->id;
+ $add_path = $base_path . '/translations/add/' . $original . '/' . $langcode;
+ $translate_path = $base_path . '/translations/edit/' . $langcode;
+ $delete_path = $base_path . '/translations/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\Core\Entity\EntityInterface $entity
+ * The entity being translated.
+ * @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.
+ *
+ * @return array
+ * A processed form array ready to be rendered.
*/
- public function add(EntityInterface $entity, $source, $target) {
- 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(EntityInterface $entity, Language $source, Language $target) {
+ $entity_type = $entity->entityType();
+ $controller_class = $this->entityManager()->getControllerClass($entity_type, 'translation');
+ $controller = new $controller_class($entity_type, 'translation');
+ $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(EntityInterface $entity, $language) {
- 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 c/core/modules/content_translation/lib/Drupal/content_translation/Form/ContentTranslationDeleteForm.php w/core/modules/content_translation/lib/Drupal/content_translation/Form/ContentTranslationDeleteForm.php
new file mode 100644
index 0000000..3006a75
--- /dev/null
+++ w/core/modules/content_translation/lib/Drupal/content_translation/Form/ContentTranslationDeleteForm.php
@@ -0,0 +1,168 @@
+get('entity.manager'),
+ $container->get('module_handler'),
+ $container->get('path.crud')
+ );
+ }
+
+ /**
+ * Creates a new ContentTranslationDeleteForm.
+ *
+ * @param \Drupal\Core\Entity\EntityManager $entity_manager
+ * The entity manager.
+ * @param \Drupal\Core\Path\Path $path
+ * Path CRUD service.
+ */
+ public function __construct(EntityManager $entity_manager, ModuleHandlerInterface $module_handler, Path $path) {
+ $this->entityManager = $entity_manager;
+ $this->moduleHandler = $module_handler;
+ $this->path = $path;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getQuestion() {
+ return $this->t('Are you sure you want to delete the @language translation of %label?', array('@language' => $this->language->name, '%label' => $this->entity->label()));
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getCancelRoute() {
+ $entity_type = $this->entity->entityType();
+ return array(
+ 'route_name' => "content_translation.translation_edit.$entity_type",
+ 'route_parameters' => array(
+ 'entity' => $this->entity->id(),
+ ),
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getFormID() {
+ return 'content_translation_delete_confirm';
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getConfirmText() {
+ return $this->t('Delete');
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getDescription() {
+ return $this->t('This action cannot be undone.');
+ }
+
+ /**
+ * Form constructor.
+ *
+ * @param array $form
+ * An associative array containing the structure of the form.
+ * @param array $form_state
+ * An associative array containing the current state of the form.
+ * @param \Drupal\Core\Entity\EntityInterface $entity
+ * Entity to have language deleted.
+ * @param \Drupal\Core\Language\Language
+ * Language to be deleted from entity.
+ *
+ * @return array
+ * The form structure.
+ */
+ public function buildForm(array $form, array &$form_state, EntityInterface $entity = NULL, Language $language = NULL) {
+ $this->entity = $entity;
+ $this->language = $language;
+ $form_state['entity'] = $entity;
+ $form_state['language'] = $language;
+ return parent::buildForm($form, $form_state);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function submitForm(array &$form, array &$form_state) {
+ $entity = $form_state['entity'];
+ $language = $form_state['language'];
+ $entity_type = $entity->entityType();
+ $controller_class = $this->entityManager->getControllerClass($entity_type, 'translation');
+ $controller = new $controller_class($entity_type, $entity->entityInfo());
+
+ // Remove the translated values.
+ $controller->removeTranslation($this->entity, $language->id);
+ $entity->save();
+
+ // Remove any existing path alias for the removed translation.
+ if ($this->moduleHandler->moduleExists('path')) {
+ $conditions = array('source' => $controller->getViewPath($entity), 'langcode' => $language->id);
+ $this->path->delete($conditions);
+ }
+
+ $form_state['redirect'] = $controller->getBasePath($entity) . '/translations';
+ }
+
+}
diff --git c/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationWorkflowsTest.php w/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationWorkflowsTest.php
index c523900..565e998 100644
--- c/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationWorkflowsTest.php
+++ w/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationWorkflowsTest.php
@@ -175,7 +175,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 c/core/modules/language/language.services.yml w/core/modules/language/language.services.yml
index d6599b3..aa2f52a 100644
--- c/core/modules/language/language.services.yml
+++ w/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 c/core/modules/language/lib/Drupal/language/LanguageConverter.php w/core/modules/language/lib/Drupal/language/LanguageConverter.php
new file mode 100644
index 0000000..375cfaf
--- /dev/null
+++ w/core/modules/language/lib/Drupal/language/LanguageConverter.php
@@ -0,0 +1,41 @@
+