Index: modules/locale/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v
retrieving revision 1.259
diff -u -p -r1.259 locale.module
--- modules/locale/locale.module	22 Sep 2009 07:50:16 -0000	1.259
+++ modules/locale/locale.module	6 Oct 2009 03:07:51 -0000
@@ -302,7 +302,7 @@ function locale_form_alter(&$form, &$for
       locale_language_selector_form($form, $form_state, $form['#user']);
     }
   }
-  if (isset($form['#id']) && $form['#id'] == 'node-form') {
+  if (!empty($form['#node_edit_form'])) {
     if (isset($form['#node']->type) && variable_get('language_content_type_' . $form['#node']->type, 0)) {
       $form['language'] = array(
         '#type' => 'select',
Index: modules/node/node.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.css,v
retrieving revision 1.8
diff -u -p -r1.8 node.css
--- modules/node/node.css	4 Aug 2009 03:27:11 -0000	1.8
+++ modules/node/node.css	6 Oct 2009 02:07:46 -0000
@@ -29,9 +29,6 @@ td.revision-current {
   display: inline;
   width: auto;
 }
-.node-form .standard {
-  clear: both;
-}
 .node-form textarea {
   display: block;
   width: 95%;
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1139
diff -u -p -r1.1139 node.module
--- modules/node/node.module	5 Oct 2009 01:18:25 -0000	1.1139
+++ modules/node/node.module	6 Oct 2009 02:07:46 -0000
@@ -147,10 +147,6 @@ function node_theme() {
       'arguments' => array('content' => NULL),
       'file' => 'node.pages.inc',
     ),
-    'node_form' => array(
-      'arguments' => array('form' => NULL),
-      'file' => 'node.pages.inc',
-    ),
     'node_preview' => array(
       'arguments' => array('node' => NULL),
       'file' => 'node.pages.inc',
Index: modules/node/node.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.pages.inc,v
retrieving revision 1.84
diff -u -p -r1.84 node.pages.inc
--- modules/node/node.pages.inc	3 Oct 2009 17:45:26 -0000	1.84
+++ modules/node/node.pages.inc	6 Oct 2009 02:07:46 -0000
@@ -127,9 +127,12 @@ function node_form($form, &$form_state, 
     $node->in_preview = TRUE;
   }
 
-  // Set the id and identify this as a node edit form.
-  $form['#id'] = 'node-form';
+  // Identify this as a node edit form.
   $form['#node_edit_form'] = TRUE;
+  $form['#attributes']['class'][] = 'node-form';
+  if (!empty($node->type)) {
+    $form['#attributes']['class'][] = 'node-' . $node->type . '-form';
+  }
 
   // Basic node information.
   // These elements are just values so they are not even sent to the client.
@@ -314,23 +317,6 @@ function node_form_build_preview($form, 
 }
 
 /**
- * Present a node submission form.
- *
- * @ingroup themeable
- */
-function theme_node_form($form) {
-  $output = "\n<div class=\"node-form\">\n";
-
-  $output .= "  <div class=\"standard\">\n";
-  $output .= drupal_render_children($form);
-  $output .= "  </div>\n";
-
-  $output .= "</div>\n";
-
-  return $output;
-}
-
-/**
  * Generate a node preview.
  */
 function node_preview($node) {
Index: modules/translation/translation.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/translation/translation.module,v
retrieving revision 1.60
diff -u -p -r1.60 translation.module
--- modules/translation/translation.module	10 Sep 2009 06:32:54 -0000	1.60
+++ modules/translation/translation.module	6 Oct 2009 03:08:08 -0000
@@ -112,7 +112,7 @@ function translation_form_node_type_form
  *   is about to be created.
  */
 function translation_form_alter(&$form, &$form_state, $form_id) {
-  if (isset($form['#id']) && $form['#id'] == 'node-form' && translation_supported_type($form['#node']->type)) {
+  if (!empty($form['#node_edit_form']) && translation_supported_type($form['#node']->type)) {
     $node = $form['#node'];
     if (!empty($node->translation_source)) {
       // We are creating a translation. Add values and lock language field.