From 8eab9ed4625a0ee657841fd9e894065acdf6e69c Mon Sep 17 00:00:00 2001
From: Athurg Gooth <athurg@gooth.cn>
Date: Fri, 8 Jan 2010 17:23:09 -0500
Subject: Make DEFAULT_LANG mean the default language for displayed messages.

Signed-off-by: Loui Chang <louipc.ist@gmail.com>
---
 web/lib/aur.inc          |  2 ++
 web/lib/config.inc.proto |  6 +++---
 web/lib/translator.inc   | 16 ++++++++--------
 3 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'web')

diff --git a/web/lib/aur.inc b/web/lib/aur.inc
index f9401927..821288d0 100644
--- a/web/lib/aur.inc
+++ b/web/lib/aur.inc
@@ -295,6 +295,8 @@ function set_lang() {
 
 	if ($LANG != DEFAULT_LANG ) {
 		include_once("$LANG.po");
+	} else {
+		include_once(DEFAULT_LANG.".po");
 	}
 
 	return;
diff --git a/web/lib/config.inc.proto b/web/lib/config.inc.proto
index c7a1f3c0..349a3ff7 100644
--- a/web/lib/config.inc.proto
+++ b/web/lib/config.inc.proto
@@ -1,6 +1,7 @@
 <?php
+
 # NOTE: modify these variables if your MySQL setup is different
-#
+
 define( "AUR_db_host", "localhost:/var/run/mysqld/mysqld.sock" );
 define( "AUR_db_name", "AUR" );
 define( "AUR_db_user", "aur" );
@@ -16,8 +17,7 @@ define( "USERNAME_MAX_LEN", 16 );
 define( "PASSWD_MIN_LEN", 4 );
 define( "PASSWD_MAX_LEN", 128 );
 
-# Language that messages are initially written in.
-# This should never change.
+# Default language for displayed messages in the web interface.
 define("DEFAULT_LANG", "en");
 
 # Languages we have translations for
diff --git a/web/lib/translator.inc b/web/lib/translator.inc
index 8c905515..6d963f50 100644
--- a/web/lib/translator.inc
+++ b/web/lib/translator.inc
@@ -49,16 +49,16 @@ function __() {
 	# First argument is always string to be translated
 	$tag = $args[0];
 
-	if (empty($LANG) || $LANG == DEFAULT_LANG)
+	if (empty($LANG) || $LANG == DEFAULT_LANG){
 		$translated = $tag;
+	}
+
+	# If there is no translation, just print the given string.
+	if (empty($_t[$tag])) {
+		$translated = $tag;
+	}
 	else {
-		# If there is no translation, just print the given string.
-		if (empty($_t[$tag])) {
-			$translated = $tag;
-		}
-		else {
-			$translated = $_t[$tag];
-		}
+		$translated = $_t[$tag];
 	}
 
 	$translated = htmlspecialchars($translated, ENT_QUOTES);
-- 
cgit v1.2.3-24-g4f1b