diff options
| author | Loui Chang <louipc.ist@gmail.com> | 2009-01-19 22:29:45 +0100 |
|---|---|---|
| committer | Loui Chang <louipc.ist@gmail.com> | 2009-01-19 22:29:45 +0100 |
| commit | 2ee327634831ec36df5fd74ccc35dfcedfdbe07b (patch) | |
| tree | f6783fb393a8becdbbc04f380863269097ebe4d3 /web/lib | |
| parent | 2194da8c9db7d2424b8992eedc6c98657a705e0f (diff) | |
| download | aur-2ee327634831ec36df5fd74ccc35dfcedfdbe07b.tar.gz aur-2ee327634831ec36df5fd74ccc35dfcedfdbe07b.tar.xz | |
Use new conglomerated translation files.
Signed-off-by: Loui Chang <louipc.ist@gmail.com>
Diffstat (limited to 'web/lib')
| -rw-r--r-- | web/lib/acctfuncs.inc | 1 | ||||
| -rw-r--r-- | web/lib/aur.inc | 10 | ||||
| -rw-r--r-- | web/lib/pkgfuncs.inc | 1 | ||||
| -rw-r--r-- | web/lib/translator.inc | 4 |
4 files changed, 9 insertions, 7 deletions
diff --git a/web/lib/acctfuncs.inc b/web/lib/acctfuncs.inc index e8e03cd0..1c15af0c 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 ab52636a..d8402fd6 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 b6e93c5f..3257c776 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 25f25245..24ede1a5 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)) { |