Issue #1154364: Automated tab for contact translation.

diff --git a/i18n_contact/i18n_contact.i18n.inc b/i18n_contact/i18n_contact.i18n.inc
index 86988b8..707a47c 100644 (file)
--- a/i18n_contact/i18n_contact.i18n.inc
+++ b/i18n_contact/i18n_contact.i18n.inc
@@ -28,6 +28,7 @@ function i18n_contact_i18n_object_info() {
       '%contact' => 'cid',
     ),
     'edit path' => 'admin/structure/contact/edit/%contact',
+    'translate path' => 'admin/structure/contact/edit/%contact/translate',
     'string translation' => array(
       'textgroup' => 'contact',
       'type' => 'category',
@@ -35,7 +36,7 @@ function i18n_contact_i18n_object_info() {
         'category' => t('Category'),
         'reply' => t('Auto-reply'),
       ),
-      'translate path' => 'admin/structure/contact/edit/%contact/translate',
+      'translate path' => 'admin/structure/contact/edit/%contact/translate/%language',
     )
   );
   return $info;

diff --git a/i18n_contact/i18n_contact.module b/i18n_contact/i18n_contact.module
index 709c11b..9428b4e 100644 (file)
--- a/i18n_contact/i18n_contact.module
+++ b/i18n_contact/i18n_contact.module
@@ -18,34 +18,10 @@ function i18n_contact_menu() {
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'weight' => -100,
   );
-  $items['admin/structure/contact/edit/%contact/translate'] = array(
-    'title' => 'Translate',
-    'access callback' => 'i18n_contact_translate_tab_access',
-    'page callback' => 'i18n_string_object_translate_page',
-    'page arguments' => array('contact', 4),
-    'type' => MENU_LOCAL_TASK,
-    'weight' => 10,
-  );
-  $items['admin/structure/contact/edit/%contact/translate/%language'] = array(
-    'title' => 'Translate',
-    'access callback' => 'i18n_contact_translate_tab_access',
-    'page callback' => 'i18n_string_object_translate_page',
-    'page arguments' => array('contact', 4, 6),
-    'type' => MENU_CALLBACK,
-  );
   return $items;
 }
 
 /**
- * Menu access callback function.
- *
- * Contact translators required to have both contact and locale admin.
- */
-function i18n_contact_translate_tab_access() {
-  return user_access('translate interface') && user_access('administer contact forms');
-}
-
-/**
  * Implements hook_form_FORM_ID_alter().
  */
 function i18n_contact_form_contact_category_delete_form_alter(&$form, &$form_state) {