1 files changed, 88 insertions, 13 deletions

diff --git a/web/lib/translator.inc.php b/web/lib/translator.inc.php
index 44c87bda..f269b937 100644
--- a/web/lib/translator.inc.php
+++ b/web/lib/translator.inc.php
@@ -5,12 +5,11 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR
 
 # usage:
 #   use the __() function for returning translated strings of
-#   text.  The string can contain escape codes %h for HTML
-#   and %s for regular text.
+#   text.  The string can contain escape codes "%s".
 #
 # examples:
 #	print __("%s has %s apples.", "Bill", "5");
-#	print __("This is a %hmajor%h problem!", "<b>", "</b>");
+#	print __("This is a %smajor%s problem!", "<b>", "</b>");
 
 include_once('config.inc.php');
 include_once('gettext.php');
@@ -18,6 +17,34 @@ include_once('streams.php');
 
 global $streamer, $l10n;
 
+# Languages we have translations for
+$SUPPORTED_LANGS = array(
+	"ca" => "Català",
+	"cs" => "česky",
+	"da" => "Dansk",
+	"de" => "Deutsch",
+	"en" => "English",
+	"el" => "Ελληνικά",
+	"es" => "Español",
+	"fi" => "Finnish",
+	"fr" => "Français",
+	"he" => "עברית",
+	"hr" => "Hrvatski",
+	"hu" => "Magyar",
+	"it" => "Italiano",
+	"nb" => "Norsk",
+	"nl" => "Dutch",
+	"pl" => "Polski",
+	"pt_BR" => "Português (Brasil)",
+	"pt_PT" => "Português (Portugal)",
+	"ro" => "Română",
+	"ru" => "Русский",
+	"sr" => "Srpski",
+	"tr" => "Türkçe",
+	"uk" => "Українська",
+	"zh_CN" => "简体中文"
+);
+
 function __() {
 	global $LANG;
 	global $l10n;
@@ -26,25 +53,73 @@ function __() {
 	$args = func_get_args();
 
 	# First argument is always string to be translated
-	$tag = $args[0];
+	$tag = array_shift($args);
 
 	# Translate using gettext_reader initialized before.
 	$translated = $l10n->translate($tag);
 	$translated = htmlspecialchars($translated, ENT_QUOTES);
 
-	$num_args = sizeof($args);
-
 	# Subsequent arguments are strings to be formatted
-	#
-	# TODO: make this more robust.
-	# '%%' should translate to a literal '%'
+	if (count($args) > 0) {
+		$translated = vsprintf($translated, $args);
+	}
+
+	return $translated;
+}
+
+# set up the visitor's language
+#
+function set_lang($dbh=NULL) {
+	global $LANG;
+	global $SUPPORTED_LANGS;
+	global $PERSISTENT_COOKIE_TIMEOUT;
+	global $streamer, $l10n;
+
+	$update_cookie = 0;
+	if (isset($_REQUEST['setlang'])) {
+		# visitor is requesting a language change
+		#
+		$LANG = $_REQUEST['setlang'];
+		$update_cookie = 1;
 
-	if ( $num_args > 1 ) {
-		for ($i = 1; $i < $num_args; $i++) {
-			$translated = preg_replace("/\%[sh]/", $args[$i], $translated, 1);
+	} elseif (isset($_COOKIE['AURLANG'])) {
+		# If a cookie is set, use that
+		#
+		$LANG = $_COOKIE['AURLANG'];
+
+	} elseif (isset($_COOKIE["AURSID"])) {
+		# No language but a session; use default lang preference
+		#
+		if(!$dbh) {
+			$dbh = db_connect();
+		}
+		$q = "SELECT LangPreference FROM Users, Sessions ";
+		$q.= "WHERE Users.ID = Sessions.UsersID ";
+		$q.= "AND Sessions.SessionID = '";
+		$q.= mysql_real_escape_string($_COOKIE["AURSID"])."'";
+		$result = db_query($q, $dbh);
+
+		if ($result) {
+			$row = mysql_fetch_array($result);
+			$LANG = $row[0];
 		}
+		$update_cookie = 1;
 	}
 
-	return $translated;
+	# Set $LANG to default if nothing is valid.
+	if (!array_key_exists($LANG, $SUPPORTED_LANGS)) {
+		$LANG = DEFAULT_LANG;
+	}
+
+	if ($update_cookie) {
+		$cookie_time = time() + $PERSISTENT_COOKIE_TIMEOUT;
+		setcookie("AURLANG", $LANG, $cookie_time, "/");
+	}
+
+	$streamer = new FileReader('../locale/' . $LANG .
+		'/LC_MESSAGES/aur.mo');
+	$l10n = new gettext_reader($streamer, true);
+
+	return;
 }