Index: sites/all/modules/i18n/contrib/i18npathauto.info
===================================================================
RCS file: sites/all/modules/i18n/contrib/i18npathauto.info
diff -N sites/all/modules/i18n/contrib/i18npathauto.info
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sites/all/modules/i18n/contrib/i18npathauto.info	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,4 @@
+name = i18n - pathauto
+description = Supports language token for the pathauto module
+dependencies = i18n pathauto
+package = Multilanguage - i18n
Index: sites/all/modules/i18n/contrib/i18npathauto.module
===================================================================
RCS file: sites/all/modules/i18n/contrib/i18npathauto.module
diff -N sites/all/modules/i18n/contrib/i18npathauto.module
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sites/all/modules/i18n/contrib/i18npathauto.module	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,34 @@
+<?php
+// $Id$
+
+/**
+ * Implementation of hook_token_values() for Pathauto specific tokens
+ */
+function i18npathauto_token_values($type, $object = NULL) {
+  $values = array();
+  if (module_exists('i18n')) {
+    switch ($type) {
+      case 'node':
+      case 'taxonomy':
+        $values['lang'] = i18n_node_get_lang($object->nid, i18n_get_lang());
+        break;
+    }
+  }
+  return $values;
+}
+
+/**
+ * Implementation of hook_token_list() for Pathauto specific tokens
+ */
+function i18npathauto_token_list($type = 'all') {
+  $tokens = array();
+  if (module_exists('i18n')) {
+    if ($type == 'node' || $type == 'all') {
+      $tokens['node']['lang'] = t("Language code of the document.");
+    }
+    if ($type == 'taxonomy' || $type == 'all') {
+      $tokens['taxonomy']['lang'] = t("Language code of the document.");
+    }
+  }
+  return $tokens;
+}