From 8d03971834c105112909753af12bbc066709165f Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 19 May 2007 05:46:29 +0100 Subject: [PATCH] do not reference gettext modules if ENABLE_TRANSLATIONS is disabled --- backend.php | 5 ++++- functions.php | 41 ++++++++++++++++++++++++++--------------- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/backend.php b/backend.php index 9b28f650e..3b5c071c4 100644 --- a/backend.php +++ b/backend.php @@ -20,7 +20,10 @@ require_once "functions.php"; no_cache_incantation(); - startup_gettext(); + + if (ENABLE_TRANSLATIONS == true) { + startup_gettext(); + } $script_started = getmicrotime(); diff --git a/functions.php b/functions.php index 62f0cdd02..568c13995 100644 --- a/functions.php +++ b/functions.php @@ -6,25 +6,36 @@ define('DEFAULT_ERROR_LEVEL', E_ERROR | E_WARNING | E_PARSE); } */ - require_once "accept-to-gettext.php"; - require_once "gettext/gettext.inc"; - - require_once 'config.php'; - - function startup_gettext() { - - # Get locale from Accept-Language header - $lang = al2gt(array("en_US", "ru_RU"), "text/html"); - - if ($lang) { - _setlocale(LC_MESSAGES, $lang); - _bindtextdomain("messages", "locale"); - _textdomain("messages"); - _bind_textdomain_codeset("messages", "UTF-8"); + if (ENABLE_TRANSLATIONS == true) { + require_once "accept-to-gettext.php"; + require_once "gettext/gettext.inc"; + } else { + function __($msg) { + return $msg; + } + function startup_gettext() { + // no-op + return true; } } + require_once 'config.php'; + if (ENABLE_TRANSLATIONS == true) { + + function startup_gettext() { + + # Get locale from Accept-Language header + $lang = al2gt(array("en_US", "ru_RU"), "text/html"); + + if ($lang) { + _setlocale(LC_MESSAGES, $lang); + _bindtextdomain("messages", "locale"); + _textdomain("messages"); + _bind_textdomain_codeset("messages", "UTF-8"); + } + } + startup_gettext(); }