Use new conglomerated translation files.

Signed-off-by: Loui Chang <louipc.ist@gmail.com>

web/html/account.php

@@ -4,12 +4,10 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
 
 include('aur.inc');         # access AUR common functions
 include_once('acctfuncs.inc');   # access Account specific functions
+
 set_lang();                 # this sets up the visitor's language
 check_sid();                # see if they're still logged in
 
-include_lang('pkgfuncs_po.inc'); # Add to handle the i18n of My Packages
-include_lang('account_po.inc');  # use some form of this for i18n support
-
 html_header(__('Accounts'));
 
 # Main page processing here

web/html/addvote.php

@@ -3,7 +3,6 @@
 set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
 
 include("aur.inc");
-include_lang('tu_po.inc');
 set_lang();
 check_sid();
 html_header();

web/html/index.php

@@ -7,8 +7,6 @@ set_lang();
 check_sid();
 
 include('stats.inc');
-include_lang('index_po.inc');
-include_lang('pkgfuncs_po.inc');
 
 html_header( __("Home") );
 

web/html/packages.php

@@ -5,7 +5,6 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
 include("aur.inc");         # access AUR common functions
 set_lang();                 # this sets up the visitor's language
 include('pkgfuncs.inc');    # package specific functions
-include_lang('search_po.inc');   # use some form of this for i18n support
 check_sid();                # see if they're still logged in
 
 # Set the title to the current query if required

web/html/pkgedit.php

@@ -4,7 +4,6 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
 
 include("aur.inc");         # access AUR common functions
 include("pkgfuncs.inc");    # use some form of this for i18n support
-include_lang("pkgedit_po.inc");  # i18n translations for this script
 set_lang();                 # this sets up the visitor's language
 check_sid();                # see if they're still logged in
 html_header();              # print out the HTML header

web/html/pkgsubmit.php

@@ -9,7 +9,6 @@ require('Find.php');
 include("aur.inc");         # access AUR common functions
 include("pkgfuncs.inc");    # package functions
 
-include_lang('submit_po.inc');   # use some form of this for i18n support
 set_lang();                 # this sets up the visitor's language
 check_sid();                # see if they're still logged in
 

web/html/tu.php

@@ -3,7 +3,6 @@
 set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
 
 include("aur.inc");
-include_lang('tu_po.inc');
 set_lang();
 check_sid();
 html_header();

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
 #

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 $_t;
-	global $_COOKIE;
 	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;
 }
 

web/lib/pkgfuncs.inc

@@ -1,5 +1,4 @@
 <?php
-include_lang('pkgfuncs_po.inc');
 include_once("config.inc");
 
 # define variables used during pkgsearch

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)) {

web/template/template.phps

@@ -5,7 +5,6 @@
 set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
 
 include("aur.inc");         # access AUR common functions
-include_lang('template_po.inc'); # use some form of this for i18n support
 set_lang();                 # this sets up the visitor's language
 check_sid();                # see if they're still logged in
 html_header();              # print out the HTML header