Introduce function include_lang for translations.

This includes only the requested language for each page and
makes top level language include files obsolete.

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

8 files changed, 25 insertions, 25 deletions

diff --git a/web/html/account.php b/web/html/account.php
index 5efc401..d0273dd 100644
--- a/web/html/account.php
+++ b/web/html/account.php
@@ -1,15 +1,16 @@
 <?php
 
-set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang');
+set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
 
-include("aur.inc");         # access AUR common functions
-include_once("acctfuncs.inc");   # access Account specific functions
-include("pkgfuncs_po.inc"); # Add to handle the i18n of My Packages
-include("account_po.inc");  # use some form of this for i18n support
+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
-html_header(__("Accounts"));              # print out the HTML header
 
+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
 #
diff --git a/web/html/addvote.php b/web/html/addvote.php
index 6b30e49..a31a1ff 100644
--- a/web/html/addvote.php
+++ b/web/html/addvote.php
@@ -1,9 +1,9 @@
 <?php
 
-set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang');
+set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
 
-include("tu_po.inc");
 include("aur.inc");
+include_lang('tu_po.inc');
 set_lang();
 check_sid();
 html_header();
diff --git a/web/html/index.php b/web/html/index.php
index d664086..e2c840a 100644
--- a/web/html/index.php
+++ b/web/html/index.php
@@ -1,15 +1,15 @@
 <?php
 
-set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang');
+set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
 
-include('index_po.inc');
-include("pkgfuncs_po.inc");
 include("aur.inc");
-include('stats.inc');
-
 set_lang();
 check_sid();
 
+include('stats.inc');
+include_lang('index_po.inc');
+include_lang('pkgfuncs_po.inc');
+
 html_header( __("Home") );
 
 $dbh = db_connect();
diff --git a/web/html/logout.php b/web/html/logout.php
index 41dedc3..88a1e26 100644
--- a/web/html/logout.php
+++ b/web/html/logout.php
@@ -1,11 +1,10 @@
 <?php
 
-set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang');
+set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
 
 include("aur.inc");         # access AUR common functions
 include_once("acctfuncs.inc");         # access AUR common functions
-include("logout_po.inc");   # use some form of this for i18n support
-set_lang();                 # this sets up the visitor's language
+
 
 # if they've got a cookie, log them out - need to do this before
 # sending any HTML output.
diff --git a/web/html/packages.php b/web/html/packages.php
index 2452991..90ab72c 100644
--- a/web/html/packages.php
+++ b/web/html/packages.php
@@ -1,11 +1,11 @@
 <?php
 
-set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang');
+set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
 
 include("aur.inc");         # access AUR common functions
-include("pkgfuncs.inc");    # package specific functions
-include("search_po.inc");   # use some form of this for i18n support
 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
diff --git a/web/html/pkgedit.php b/web/html/pkgedit.php
index 974f14b..ff82663 100644
--- a/web/html/pkgedit.php
+++ b/web/html/pkgedit.php
@@ -1,10 +1,10 @@
 <?php
 
-set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang');
+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("pkgedit_po.inc");  # i18n translations for this script
+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
diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php
index 0e4f448..a3949ed 100644
--- a/web/html/pkgsubmit.php
+++ b/web/html/pkgsubmit.php
@@ -1,15 +1,15 @@
 <?php
 
-set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang');
+set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
 include("config.inc");
 
 require('Archive/Tar.php');
 require('Find.php');
 
 include("aur.inc");         # access AUR common functions
-include("submit_po.inc");   # use some form of this for i18n support
 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
 
diff --git a/web/html/tu.php b/web/html/tu.php
index 0b8b5c7..2d1eaf3 100644
--- a/web/html/tu.php
+++ b/web/html/tu.php
@@ -1,9 +1,9 @@
 <?php
 
-set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang');
+set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
 
-include("tu_po.inc");
 include("aur.inc");
+include_lang('tu_po.inc');
 set_lang();
 check_sid();
 html_header();