4 files changed, 9 insertions, 7 deletions
diff --git a/web/lib/acctfuncs.inc b/web/lib/acctfuncs.inc
index e8e03cd..1c15af0 100644
--- a/web/lib/acctfuncs.inc
+++ b/web/lib/acctfuncs.inc
@@ -1,5 +1,4 @@
 <?php
-include_lang('acctfuncs_po.inc');
 
 # Display the standard Account form, pass in default values if any
 #
diff --git a/web/lib/aur.inc b/web/lib/aur.inc
index ab52636..d8402fd 100644
--- a/web/lib/aur.inc
+++ b/web/lib/aur.inc
@@ -7,8 +7,6 @@ header('Pragma: no-cache');
 
 include_once('translator.inc');
 set_lang();
-include_lang('aur_po.inc');
-include_lang('common_po.inc');
 
 include_once("config.inc");
 include_once("version.inc");
@@ -254,8 +252,7 @@ function db_query($query="", $db_handle="") {
 # set up the visitor's language
 #
 function set_lang() {
-	global $_REQUEST;
-	global $_COOKIE;
+	global $_t;
 	global $LANG;
 	global $SUPPORTED_LANGS;
 
@@ -295,6 +292,11 @@ function set_lang() {
 	if ($update_cookie) {
 		setcookie("AURLANG", $LANG, 0, "/");
 	}
+
+	if ($LANG != DEFAULT_LANG ) {
+		include_once("$LANG.po");
+	}
+
 	return;
 }
 
diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc
index b6e93c5..3257c77 100644
--- a/web/lib/pkgfuncs.inc
+++ b/web/lib/pkgfuncs.inc
@@ -1,5 +1,4 @@
 <?php
-include_lang('pkgfuncs_po.inc');
 include_once("config.inc");
 
 # define variables used during pkgsearch
diff --git a/web/lib/translator.inc b/web/lib/translator.inc
index 25f2524..24ede1a 100644
--- a/web/lib/translator.inc
+++ b/web/lib/translator.inc
@@ -27,6 +27,8 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR
 
 include_once('config.inc');
 
+global $_t;
+
 function include_lang($trans) {
 	global $LANG;
 
@@ -51,7 +53,7 @@ function __() {
 	if (empty($LANG) || $LANG == DEFAULT_LANG)
 		$translated = $tag;
 	else
-		$translated = $_t[$LANG][$tag];
+		$translated = $_t[$tag];
 
 	# If there is no translation, just print the given string.
 	if (empty($translated)) {