diff options
| -rw-r--r-- | web/lib/aur.inc | 9 | ||||
| -rw-r--r-- | web/lib/translator.inc | 4 |
2 files changed, 3 insertions, 10 deletions
diff --git a/web/lib/aur.inc b/web/lib/aur.inc index 821288d0..e0521abc 100644 --- a/web/lib/aur.inc +++ b/web/lib/aur.inc @@ -275,9 +275,8 @@ function set_lang() { $q.= "AND Sessions.SessionID = '"; $q.= mysql_real_escape_string($_COOKIE["AURSID"])."'"; $result = db_query($q, $dbh); - if (!$result) { - $LANG = "en"; - } else { + + if ($result) { $row = mysql_fetch_array($result); $LANG = $row[0]; } @@ -293,10 +292,8 @@ function set_lang() { setcookie("AURLANG", $LANG, 0, "/"); } - if ($LANG != DEFAULT_LANG ) { + if ($LANG != "en" ) { include_once("$LANG.po"); - } else { - include_once(DEFAULT_LANG.".po"); } return; diff --git a/web/lib/translator.inc b/web/lib/translator.inc index 650f796f..6bb93588 100644 --- a/web/lib/translator.inc +++ b/web/lib/translator.inc @@ -35,10 +35,6 @@ function __() { # First argument is always string to be translated $tag = $args[0]; - if (empty($LANG) || $LANG == DEFAULT_LANG){ - $translated = $tag; - } - # If there is no translation, just print the given string. if (empty($_t[$tag])) { $translated = $tag; |