#780318 by plach: Fixed path prefixes are always active on multilingual sites.

1 files changed, 1 insertions, 26 deletions

diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index 1e29966d2..6233f7c0e 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -12,32 +12,6 @@
  *   Gettext portable object files are supported.
  */
 
-/**
- * The language is determined using a URL language indicator:
- * path prefix or domain according to the configuration.
- */
-define('LOCALE_LANGUAGE_NEGOTIATION_URL', 'locale-url');
-
-/**
- * The language is set based on the browser language settings.
- */
-define('LOCALE_LANGUAGE_NEGOTIATION_BROWSER', 'locale-browser');
-
-/**
- * The language is determined using the current interface language.
- */
-define('LOCALE_LANGUAGE_NEGOTIATION_INTERFACE', 'locale-interface');
-
-/**
- * The language is set based on the user language settings.
- */
-define('LOCALE_LANGUAGE_NEGOTIATION_USER', 'locale-user');
-
-/**
- * The language is set based on the request/session parameters.
- */
-define('LOCALE_LANGUAGE_NEGOTIATION_SESSION', 'locale-session');
-
 // ---------------------------------------------------------------------------------
 // Hook implementations
 
@@ -533,6 +507,7 @@ function locale_entity_info_alter(&$entity_info) {
  *   specified.
  */
 function locale_language_types_info() {
+  require_once DRUPAL_ROOT . '/includes/locale.inc';
   return array(
     LANGUAGE_TYPE_INTERFACE => array(
       'name' => t('User interface text'),