? .DS_Store
? .cache
? .cvsignore
? .git
? .project
? .settings
? locale-registry-283201-1.patch
? test
? modules/.DS_Store
? modules/simpletest/.DS_Store
? sites/all/modules
? sites/default/files
? sites/default/settings.php
? sites/default/test
Index: modules/locale/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v
retrieving revision 1.224
diff -u -p -r1.224 locale.module
--- modules/locale/locale.module	1 Oct 2008 13:17:17 -0000	1.224
+++ modules/locale/locale.module	2 Oct 2008 06:28:25 -0000
@@ -87,8 +87,8 @@ function locale_menu() {
   $items['admin/settings/language'] = array(
     'title' => 'Languages',
     'description' => 'Configure languages for content and the user interface.',
-    'page callback' => 'locale_inc_callback',
-    'page arguments' => array('drupal_get_form', 'locale_languages_overview_form'),
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('locale_languages_overview_form'),
     'access arguments' => array('administer languages'),
   );
   $items['admin/settings/language/overview'] = array(
@@ -98,31 +98,30 @@ function locale_menu() {
   );
   $items['admin/settings/language/add'] = array(
     'title' => 'Add language',
-    'page callback' => 'locale_inc_callback',
-    'page arguments' => array('locale_languages_add_screen'), // two forms concatenated
+    'page callback' => 'locale_languages_add_screen', // two forms concatenated
     'access arguments' => array('administer languages'),
     'weight' => 5,
     'type' => MENU_LOCAL_TASK,
   );
   $items['admin/settings/language/configure'] = array(
     'title' => 'Configure',
-    'page callback' => 'locale_inc_callback',
-    'page arguments' => array('drupal_get_form', 'locale_languages_configure_form'),
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('locale_languages_configure_form'),
     'access arguments' => array('administer languages'),
     'weight' => 10,
     'type' => MENU_LOCAL_TASK,
   );
   $items['admin/settings/language/edit/%'] = array(
     'title' => 'Edit language',
-    'page callback' => 'locale_inc_callback',
-    'page arguments' => array('drupal_get_form', 'locale_languages_edit_form', 4),
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('locale_languages_edit_form', 4),
     'access arguments' => array('administer languages'),
     'type' => MENU_CALLBACK,
   );
   $items['admin/settings/language/delete/%'] = array(
     'title' => 'Confirm',
-    'page callback' => 'locale_inc_callback',
-    'page arguments' => array('drupal_get_form', 'locale_languages_delete_form', 4),
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('locale_languages_delete_form', 4),
     'access arguments' => array('administer languages'),
     'type' => MENU_CALLBACK,
   );
@@ -131,8 +130,7 @@ function locale_menu() {
   $items['admin/build/translate'] = array(
     'title' => 'Translate interface',
     'description' => 'Translate the built in interface and optionally other text.',
-    'page callback' => 'locale_inc_callback',
-    'page arguments' => array('locale_translate_overview_screen'), // not a form, just a table
+    'page callback' => 'locale_translate_overview_screen', // not a form, just a table
     'access arguments' => array('translate interface'),
   );
   $items['admin/build/translate/overview'] = array(
@@ -144,37 +142,35 @@ function locale_menu() {
     'title' => 'Search',
     'weight' => 10,
     'type' => MENU_LOCAL_TASK,
-    'page callback' => 'locale_inc_callback',
-    'page arguments' => array('locale_translate_seek_screen'), // search results and form concatenated
+    'page callback' => 'locale_translate_seek_screen', // search results and form concatenated
     'access arguments' => array('translate interface'),
   );
   $items['admin/build/translate/import'] = array(
     'title' => 'Import',
-    'page callback' => 'locale_inc_callback',
-    'page arguments' => array('drupal_get_form', 'locale_translate_import_form'),
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('locale_translate_import_form'),
     'access arguments' => array('translate interface'),
     'weight' => 20,
     'type' => MENU_LOCAL_TASK,
   );
   $items['admin/build/translate/export'] = array(
     'title' => 'Export',
-    'page callback' => 'locale_inc_callback',
-    'page arguments' => array('locale_translate_export_screen'), // possibly multiple forms concatenated
+    'page callback' => 'locale_translate_export_screen',  // possibly multiple forms concatenated
     'access arguments' => array('translate interface'),
     'weight' => 30,
     'type' => MENU_LOCAL_TASK,
   );
   $items['admin/build/translate/edit/%'] = array(
     'title' => 'Edit string',
-    'page callback' => 'locale_inc_callback',
-    'page arguments' => array('drupal_get_form', 'locale_translate_edit_form', 4),
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('locale_translate_edit_form', 4),
     'access arguments' => array('translate interface'),
     'type' => MENU_CALLBACK,
   );
   $items['admin/build/translate/delete/%'] = array(
     'title' => 'Delete string',
-    'page callback' => 'locale_inc_callback',
-    'page arguments' => array('locale_translate_delete_page', 4),
+    'page callback' => 'locale_translate_delete_page',
+    'page arguments' => array(4),
     'access arguments' => array('translate interface'),
     'type' => MENU_CALLBACK,
   );