Issue #101: i18n_menu_block_view_alter should not override custom block titles

Author: indigoxela

i18n_menu/i18n_menu.module

@@ -75,7 +75,7 @@ function i18n_menu_menu_alter(&$items) {
  *
  * @see theme_menu_admin_overview()
  */
-function i18n_menu_preprocess_menu_admin_overview(&$variables) {
+function i18n_menu_preprocess_menu_admin_overview(array &$variables) {
   $base_context = "menu:menu:{$variables['name']}:";
   $variables['title'] = i18n_string($base_context . 'title', $variables['title']);
   $variables['description'] = i18n_string($base_context . 'description', $variables['description']);
@@ -89,23 +89,6 @@ function i18n_menu_menu_overview_title($menu) {
   return i18n_string($context, $menu['title']);
 }
 
-/**
- * Implements hook_block_view().
- */
-function i18n_menu_block_view_alter(&$data, $block) {
-  if (($block->module == 'menu' || $block->module == 'system') && (i18n_menu_mode($block->delta) & I18N_MODE_MULTIPLE)) {
-    $menus = menu_get_menus();
-    if (isset($menus[$block->delta])) {
-      if (!empty($data['title'])) {
-        $data['title'] = i18n_string_plain(
-          array('menu', 'menu', $block->delta, 'title'),
-          $menus[$block->delta]
-        );
-      }
-    }
-  }
-}
-
 /**
  * Implements hook_i18n_translate_path().
  */
@@ -592,7 +575,7 @@ function _i18n_menu_link_check_alter($link) {
  * @return bool
  *   Returns TRUE if link is localizable.
  */
-function _i18n_menu_link_is_localizable($link, $check_strings = FALSE) {
+function _i18n_menu_link_is_localizable(array $link, $check_strings = FALSE) {
   return !empty($link['customized']) && !i18n_object_langcode($link, FALSE, 'langcode') && i18n_menu_mode($link['menu_name'], I18N_MODE_LOCALIZE) &&
   (!$check_strings || _i18n_menu_link_localizable_properties($link));
 }
@@ -789,6 +772,23 @@ function i18n_menu_form_menu_overview_form_alter(&$form, &$form_state) {
   }
 }
 
+/**
+ * Implements hook_form_FORM_ID_alter().
+ *
+ * FORM_ID = i18n_string_translate_page_overview_form.
+ * Add help text to menu translation overview pages, e.g.
+ * "admin/structure/menu/manage/main-menu/translate".
+ */
+function i18n_menu_form_i18n_string_translate_page_overview_form_alter(&$form, &$form_state) {
+  $form['help'] = array(
+    '#type' => 'help',
+    '#markup' => t('Provides a translation for the menu title to be used in administrative contexts. If a menu title is being displayed for a block in a layout, translate it on the <a href="!url">User interface translation</a> page.', array(
+      '!url' => url('admin/config/regional/translate'),
+    )),
+    '#weight' => -1,
+  );
+}
+
 /**
  * Check normal path.
  *