Followup to #1155156 by G�bor Hojtsy: redirect the user back to the translation page...

diff --git a/i18n_block/i18n_block.module b/i18n_block/i18n_block.module
index a5f3592..9a01905 100644 (file)
--- a/i18n_block/i18n_block.module
+++ b/i18n_block/i18n_block.module
@@ -73,7 +73,7 @@ function i18n_block_translate_tab_page($module, $delta, $language = NULL) {
     '#item_title_key' => array('blocks', $block->module, $block->delta, 'title'),
     '#item_title_default' => $block->title,
     '#edit' => 'admin/structure/block/manage/' . $block->module . '/' . $block->delta . '/configure',
-    '#translate' => 'admin/structure/block/manage/' . $block->module . '/' . $block->delta . '/translate/',
+    '#translate' => 'admin/structure/block/manage/' . $block->module . '/' . $block->delta . '/translate',
     '#items' => array(),
   );
   if (!empty($block->title) && $block->title != '<none>') {

diff --git a/i18n_contact/i18n_contact.module b/i18n_contact/i18n_contact.module
index 8ac4c8e..a9ff6f6 100644 (file)
--- a/i18n_contact/i18n_contact.module
+++ b/i18n_contact/i18n_contact.module
@@ -56,7 +56,7 @@ function i18n_contact_translate_tab_page($contact, $language = NULL) {
     '#item_title_key' => array('contact', 'category', $contact['cid'], 'category'),
     '#item_title_default' => $contact['category'],
     '#edit' => 'admin/structure/contact/edit/' . $contact['cid'],
-    '#translate' => 'admin/structure/contact/edit/' . $contact['cid'] . '/translate/',
+    '#translate' => 'admin/structure/contact/edit/' . $contact['cid'] . '/translate',
     '#items' => array(),
   );
   $form_meta['#items'][] = array(

diff --git a/i18n_string/i18n_string.pages.inc b/i18n_string/i18n_string.pages.inc
index 2503f4e..4d3538c 100644 (file)
--- a/i18n_string/i18n_string.pages.inc
+++ b/i18n_string/i18n_string.pages.inc
@@ -61,7 +61,7 @@ function i18n_string_translate_page_overview($form_meta) {
         $language->name,
         $item_title,
         $translated ? t('translated') : t('not translated'),
-        l(t('translate'), $form_meta['#translate'] . $langcode),
+        l(t('translate'), $form_meta['#translate'] . '/' . $langcode),
       );
     }
   }
@@ -128,6 +128,9 @@ function i18n_string_translate_page_form($form, &$form_state, $form_meta, $langc
   $form['#validate'] = array(
     'i18n_string_translate_page_form_validate'
   );
+  $form['#redirect'] = array(
+     $form_meta['#translate'],
+  );
   return $form;
 }
 
@@ -153,6 +156,7 @@ function i18n_string_translate_page_form_submit($form, &$form_state) {
     i18n_string_textgroup($textgroup)->update_translation($context, $form_state['values']['langcode'], $value);
   }
   drupal_set_message(t('Translations saved.'));
+  $form_state['redirect'] = $form['#redirect'];
 }
 
 /**