From a8b83ca080e7fcd68bdd7d5653e5e9a7c2b2be15 Mon Sep 17 00:00:00 2001
From: rWatcher <rwatcher@watcherdatabase.tk>
Date: Thu, 21 Jul 2011 13:40:41 -0400
Subject: [PATCH] Move Pages options to content menu, make custom Pages menus
 translatable.

---
 3.0/modules/pages/helpers/pages_event.php | 4 ++--
 3.1/modules/pages/helpers/pages_event.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/3.0/modules/pages/helpers/pages_event.php b/3.0/modules/pages/helpers/pages_event.php
index 9e37aa8b..3cb37d0b 100644
--- a/3.0/modules/pages/helpers/pages_event.php
+++ b/3.0/modules/pages/helpers/pages_event.php
@@ -20,7 +20,7 @@
 class pages_event_Core {
   static function admin_menu($menu, $theme) {
     // Add a settings link to the admin menu.
-    $menu->get("settings_menu")
+    $menu->get("content_menu")
       ->append(Menu::factory("link")
                ->id("pages")
                ->label(t("Pages Settings"))
@@ -36,7 +36,7 @@ class pages_event_Core {
       foreach ($menu_pages as $one_page) {
         $menu->add_after("home", Menu::factory("link")
              ->id("pages-" . $one_page->id)
-             ->label($one_page->title)
+             ->label(t($one_page->title))
              ->url(url::site("pages/show/" . $one_page->name)));
       }
     }
diff --git a/3.1/modules/pages/helpers/pages_event.php b/3.1/modules/pages/helpers/pages_event.php
index 9e37aa8b..3cb37d0b 100644
--- a/3.1/modules/pages/helpers/pages_event.php
+++ b/3.1/modules/pages/helpers/pages_event.php
@@ -20,7 +20,7 @@
 class pages_event_Core {
   static function admin_menu($menu, $theme) {
     // Add a settings link to the admin menu.
-    $menu->get("settings_menu")
+    $menu->get("content_menu")
       ->append(Menu::factory("link")
                ->id("pages")
                ->label(t("Pages Settings"))
@@ -36,7 +36,7 @@ class pages_event_Core {
       foreach ($menu_pages as $one_page) {
         $menu->add_after("home", Menu::factory("link")
              ->id("pages-" . $one_page->id)
-             ->label($one_page->title)
+             ->label(t($one_page->title))
              ->url(url::site("pages/show/" . $one_page->name)));
       }
     }