--- d:\dist\dev\drupal\modules6\i18n-6.x-1.1\i18n\i18ntaxonomy\i18ntaxonomy.module	Fri Jun 12 19:10:26 2009
+++ i18ntaxonomy.module	Fri Sep 18 19:07:37 2009
@@ -258,14 +258,14 @@ function i18ntaxonomy_taxonomy($op, $typ
       if (isset($edit['i18nmode'])) {
         i18ntaxonomy_vocabulary($vid, $edit['i18nmode']);
 
-        $language = isset($edit['language']) ? $edit['language'] : '';
-        db_query("UPDATE {vocabulary} SET language='%s' WHERE vid = %d", $language, $edit['vid']);
-        if ($language && $op == 'update') {
-          db_query("UPDATE {term_data} SET language='%s' WHERE vid = %d", $edit['language'], $edit['vid']);
+        $edit_lang = isset($edit['language']) ? $edit['language'] : '';
+        db_query("UPDATE {vocabulary} SET language='%s' WHERE vid = %d", $edit_lang, $edit['vid']);
+        if ($edit_lang && $op == 'update') {
+          db_query("UPDATE {term_data} SET language='%s' WHERE vid = %d", $edit_lang, $edit['vid']);
           drupal_set_message(t('Reset language for all terms.'));
         }
         // Always add vocabulary translation if !$language.
-        if (!$language) {
+        if (!$edit_lang) {
           tt("taxonomy:vocabulary:$vid:name", $edit['name'], NULL, TRUE);
         }
       }