summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreric <eric>2004-06-19 16:36:22 +0200
committereric <eric>2004-06-19 16:36:22 +0200
commit22e8556691d134c4bf778837d4a0c24e4504b8cf (patch)
tree6cbeaebbcf2ea34ceff74539b48f2fb1d3fb5edc
parent74594e516d699a3a95a4e8112c914b9225853de7 (diff)
downloadaur-22e8556691d134c4bf778837d4a0c24e4504b8cf.tar.gz
aur-22e8556691d134c4bf778837d4a0c24e4504b8cf.tar.xz
finished tweaking language selection
-rw-r--r--web/html/account.php18
-rw-r--r--web/html/index.php2
-rw-r--r--web/html/logout.php18
-rw-r--r--web/html/pkgmgmnt.php18
-rw-r--r--web/html/pkgsearch.php18
-rw-r--r--web/html/pkgsubmit.php17
-rw-r--r--web/html/pkgvote.php18
-rw-r--r--web/html/template.php3
-rw-r--r--web/lang/account_po.inc19
-rw-r--r--web/lang/logout_po.inc19
-rw-r--r--web/lang/mgmnt_po.inc19
-rw-r--r--web/lang/search_po.inc19
-rw-r--r--web/lang/submit_po.inc19
-rw-r--r--web/lang/template_po.inc19
-rw-r--r--web/lang/vote_po.inc19
-rw-r--r--web/lib/aur.inc63
-rw-r--r--web/lib/translator.inc15
17 files changed, 303 insertions, 20 deletions
diff --git a/web/html/account.php b/web/html/account.php
new file mode 100644
index 00000000..6d402cae
--- /dev/null
+++ b/web/html/account.php
@@ -0,0 +1,18 @@
+<?
+include("aur.inc"); # access AUR common functions
+include("account_po.inc"); # use some form of this for i18n support
+set_lang(); # this sets up the visitor's language
+html_header(); # print out the HTML header
+
+
+# Any text you print out to the visitor, use the __() function
+# for i18n support. See 'testpo.php' for more details.
+#
+print __("Under construction...")."<br/>\n";
+
+
+html_footer("\$Id$"); # Use the $Id$ keyword
+ # NOTE: when checking in a new file, use
+ # 'svn propset svn:keywords "Id" filename.php'
+ # to tell svn to expand the "Id" keyword.
+?>
diff --git a/web/html/index.php b/web/html/index.php
index 24afdf04..80389923 100644
--- a/web/html/index.php
+++ b/web/html/index.php
@@ -1,11 +1,13 @@
<?
include("index_po.inc");
include("aur.inc");
+set_lang();
html_header();
#$dbh = db_connect();
print "Connected...<br>\n";
+print "My LANG is: " . $LANG . "<br>\n";
html_footer("\$Id$");
diff --git a/web/html/logout.php b/web/html/logout.php
new file mode 100644
index 00000000..6757784e
--- /dev/null
+++ b/web/html/logout.php
@@ -0,0 +1,18 @@
+<?
+include("aur.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
+html_header(); # print out the HTML header
+
+
+# Any text you print out to the visitor, use the __() function
+# for i18n support. See 'testpo.php' for more details.
+#
+print __("Under construction...")."<br/>\n";
+
+
+html_footer("\$Id$"); # Use the $Id$ keyword
+ # NOTE: when checking in a new file, use
+ # 'svn propset svn:keywords "Id" filename.php'
+ # to tell svn to expand the "Id" keyword.
+?>
diff --git a/web/html/pkgmgmnt.php b/web/html/pkgmgmnt.php
new file mode 100644
index 00000000..0988e51e
--- /dev/null
+++ b/web/html/pkgmgmnt.php
@@ -0,0 +1,18 @@
+<?
+include("aur.inc"); # access AUR common functions
+include("mgmnt_po.inc"); # use some form of this for i18n support
+set_lang(); # this sets up the visitor's language
+html_header(); # print out the HTML header
+
+
+# Any text you print out to the visitor, use the __() function
+# for i18n support. See 'testpo.php' for more details.
+#
+print __("Under construction...")."<br/>\n";
+
+
+html_footer("\$Id$"); # Use the $Id$ keyword
+ # NOTE: when checking in a new file, use
+ # 'svn propset svn:keywords "Id" filename.php'
+ # to tell svn to expand the "Id" keyword.
+?>
diff --git a/web/html/pkgsearch.php b/web/html/pkgsearch.php
new file mode 100644
index 00000000..d23a602e
--- /dev/null
+++ b/web/html/pkgsearch.php
@@ -0,0 +1,18 @@
+<?
+include("aur.inc"); # access AUR common functions
+include("search_po.inc"); # use some form of this for i18n support
+set_lang(); # this sets up the visitor's language
+html_header(); # print out the HTML header
+
+
+# Any text you print out to the visitor, use the __() function
+# for i18n support. See 'testpo.php' for more details.
+#
+print __("Under construction...")."<br/>\n";
+
+
+html_footer("\$Id$"); # Use the $Id$ keyword
+ # NOTE: when checking in a new file, use
+ # 'svn propset svn:keywords "Id" filename.php'
+ # to tell svn to expand the "Id" keyword.
+?>
diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php
new file mode 100644
index 00000000..fc36da5d
--- /dev/null
+++ b/web/html/pkgsubmit.php
@@ -0,0 +1,17 @@
+<?
+include("aur.inc"); # access AUR common functions
+include("submit_po.inc"); # use some form of this for i18n support
+html_header(); # print out the HTML header
+
+
+# Any text you print out to the visitor, use the __() function
+# for i18n support. See 'testpo.php' for more details.
+#
+print __("Under construction...")."<br/>\n";
+
+
+html_footer("\$Id$"); # Use the $Id$ keyword
+ # NOTE: when checking in a new file, use
+ # 'svn propset svn:keywords "Id" filename.php'
+ # to tell svn to expand the "Id" keyword.
+?>
diff --git a/web/html/pkgvote.php b/web/html/pkgvote.php
new file mode 100644
index 00000000..e111937f
--- /dev/null
+++ b/web/html/pkgvote.php
@@ -0,0 +1,18 @@
+<?
+include("aur.inc"); # access AUR common functions
+include("vote_po.inc"); # use some form of this for i18n support
+set_lang(); # this sets up the visitor's language
+html_header(); # print out the HTML header
+
+
+# Any text you print out to the visitor, use the __() function
+# for i18n support. See 'testpo.php' for more details.
+#
+print __("Under construction...")."<br/>\n";
+
+
+html_footer("\$Id$"); # Use the $Id$ keyword
+ # NOTE: when checking in a new file, use
+ # 'svn propset svn:keywords "Id" filename.php'
+ # to tell svn to expand the "Id" keyword.
+?>
diff --git a/web/html/template.php b/web/html/template.php
index 8ada0f1f..a61ba6fc 100644
--- a/web/html/template.php
+++ b/web/html/template.php
@@ -1,6 +1,7 @@
<?
include("aur.inc"); # access AUR common functions
-include("index_po.inc"); # use some form of this for i18n support
+include("template_po.inc"); # use some form of this for i18n support
+set_lang(); # this sets up the visitor's language
html_header(); # print out the HTML header
diff --git a/web/lang/account_po.inc b/web/lang/account_po.inc
new file mode 100644
index 00000000..438f50df
--- /dev/null
+++ b/web/lang/account_po.inc
@@ -0,0 +1,19 @@
+<?
+# INSTRUCTIONS TO TRANSLATORS
+#
+# This file contains the i18n translations for a subset of the
+# Arch Linux User-community Repository (AUR). This is a PHP
+# script, and as such, you MUST pay great attention to the syntax.
+# If your text contains any double-quotes ("), you MUST escape
+# them with the backslash character (\).
+#
+
+include_once("translator.inc");
+global $_t;
+
+$_t["en"]["Under construction..."] = "Under construction...";
+# $_t["es"]["Under construction..."] = "--> Traducción española aquí. <--";
+# $_t["fr"]["Under construction..."] = "--> Traduction française ici. <--";
+# $_t["de"]["Under construction..."] = "--> Deutsche Übersetzung hier. <--";
+
+?> \ No newline at end of file
diff --git a/web/lang/logout_po.inc b/web/lang/logout_po.inc
new file mode 100644
index 00000000..438f50df
--- /dev/null
+++ b/web/lang/logout_po.inc
@@ -0,0 +1,19 @@
+<?
+# INSTRUCTIONS TO TRANSLATORS
+#
+# This file contains the i18n translations for a subset of the
+# Arch Linux User-community Repository (AUR). This is a PHP
+# script, and as such, you MUST pay great attention to the syntax.
+# If your text contains any double-quotes ("), you MUST escape
+# them with the backslash character (\).
+#
+
+include_once("translator.inc");
+global $_t;
+
+$_t["en"]["Under construction..."] = "Under construction...";
+# $_t["es"]["Under construction..."] = "--> Traducción española aquí. <--";
+# $_t["fr"]["Under construction..."] = "--> Traduction française ici. <--";
+# $_t["de"]["Under construction..."] = "--> Deutsche Übersetzung hier. <--";
+
+?> \ No newline at end of file
diff --git a/web/lang/mgmnt_po.inc b/web/lang/mgmnt_po.inc
new file mode 100644
index 00000000..438f50df
--- /dev/null
+++ b/web/lang/mgmnt_po.inc
@@ -0,0 +1,19 @@
+<?
+# INSTRUCTIONS TO TRANSLATORS
+#
+# This file contains the i18n translations for a subset of the
+# Arch Linux User-community Repository (AUR). This is a PHP
+# script, and as such, you MUST pay great attention to the syntax.
+# If your text contains any double-quotes ("), you MUST escape
+# them with the backslash character (\).
+#
+
+include_once("translator.inc");
+global $_t;
+
+$_t["en"]["Under construction..."] = "Under construction...";
+# $_t["es"]["Under construction..."] = "--> Traducción española aquí. <--";
+# $_t["fr"]["Under construction..."] = "--> Traduction française ici. <--";
+# $_t["de"]["Under construction..."] = "--> Deutsche Übersetzung hier. <--";
+
+?> \ No newline at end of file
diff --git a/web/lang/search_po.inc b/web/lang/search_po.inc
new file mode 100644
index 00000000..438f50df
--- /dev/null
+++ b/web/lang/search_po.inc
@@ -0,0 +1,19 @@
+<?
+# INSTRUCTIONS TO TRANSLATORS
+#
+# This file contains the i18n translations for a subset of the
+# Arch Linux User-community Repository (AUR). This is a PHP
+# script, and as such, you MUST pay great attention to the syntax.
+# If your text contains any double-quotes ("), you MUST escape
+# them with the backslash character (\).
+#
+
+include_once("translator.inc");
+global $_t;
+
+$_t["en"]["Under construction..."] = "Under construction...";
+# $_t["es"]["Under construction..."] = "--> Traducción española aquí. <--";
+# $_t["fr"]["Under construction..."] = "--> Traduction française ici. <--";
+# $_t["de"]["Under construction..."] = "--> Deutsche Übersetzung hier. <--";
+
+?> \ No newline at end of file
diff --git a/web/lang/submit_po.inc b/web/lang/submit_po.inc
new file mode 100644
index 00000000..438f50df
--- /dev/null
+++ b/web/lang/submit_po.inc
@@ -0,0 +1,19 @@
+<?
+# INSTRUCTIONS TO TRANSLATORS
+#
+# This file contains the i18n translations for a subset of the
+# Arch Linux User-community Repository (AUR). This is a PHP
+# script, and as such, you MUST pay great attention to the syntax.
+# If your text contains any double-quotes ("), you MUST escape
+# them with the backslash character (\).
+#
+
+include_once("translator.inc");
+global $_t;
+
+$_t["en"]["Under construction..."] = "Under construction...";
+# $_t["es"]["Under construction..."] = "--> Traducción española aquí. <--";
+# $_t["fr"]["Under construction..."] = "--> Traduction française ici. <--";
+# $_t["de"]["Under construction..."] = "--> Deutsche Übersetzung hier. <--";
+
+?> \ No newline at end of file
diff --git a/web/lang/template_po.inc b/web/lang/template_po.inc
new file mode 100644
index 00000000..0b5d1bc9
--- /dev/null
+++ b/web/lang/template_po.inc
@@ -0,0 +1,19 @@
+<?
+# INSTRUCTIONS TO TRANSLATORS
+#
+# This file contains the i18n translations for a subset of the
+# Arch Linux User-community Repository (AUR). This is a PHP
+# script, and as such, you MUST pay great attention to the syntax.
+# If your text contains any double-quotes ("), you MUST escape
+# them with the backslash character (\).
+#
+
+include_once("translator.inc");
+global $_t;
+
+$_t["en"]["Hi, this is worth reading!"] = "Hi, this is worth reading!";
+# $_t["es"]["Hi, this is worth reading!"] = "--> Traducción española aquí. <--";
+# $_t["fr"]["Hi, this is worth reading!"] = "--> Traduction française ici. <--";
+# $_t["de"]["Hi, this is worth reading!"] = "--> Deutsche Übersetzung hier. <--";
+
+?> \ No newline at end of file
diff --git a/web/lang/vote_po.inc b/web/lang/vote_po.inc
new file mode 100644
index 00000000..438f50df
--- /dev/null
+++ b/web/lang/vote_po.inc
@@ -0,0 +1,19 @@
+<?
+# INSTRUCTIONS TO TRANSLATORS
+#
+# This file contains the i18n translations for a subset of the
+# Arch Linux User-community Repository (AUR). This is a PHP
+# script, and as such, you MUST pay great attention to the syntax.
+# If your text contains any double-quotes ("), you MUST escape
+# them with the backslash character (\).
+#
+
+include_once("translator.inc");
+global $_t;
+
+$_t["en"]["Under construction..."] = "Under construction...";
+# $_t["es"]["Under construction..."] = "--> Traducción española aquí. <--";
+# $_t["fr"]["Under construction..."] = "--> Traduction française ici. <--";
+# $_t["de"]["Under construction..."] = "--> Deutsche Übersetzung hier. <--";
+
+?> \ No newline at end of file
diff --git a/web/lib/aur.inc b/web/lib/aur.inc
index 8a4756e4..87309e46 100644
--- a/web/lib/aur.inc
+++ b/web/lib/aur.inc
@@ -3,6 +3,13 @@ include_once("aur_po.inc");
# Define global variables
#
+$PASS_PHRASE = "Dustyissocool";
+$SUPPORTED_LANGS = array(
+ "en" => 1, # English
+ "es" => 1, # Español
+ "de" => 1, # Deutsch
+ "fr" => 1, # Français
+);
# connect to the database
@@ -26,6 +33,43 @@ function db_connect() {
return $handle;
}
+# set up the visitor's language
+#
+function set_lang() {
+ global $_REQUEST;
+ global $_COOKIE;
+ global $LANG;
+ global $SUPPORTED_LANGS;
+
+ $update_cookie = 0;
+ if (isset($_REQUEST['setlang'])) {
+ # visitor is requesting a language change
+ #
+ $LANG = $_REQUEST['setlang'];
+ $update_cookie = 1;
+
+ } elseif (isset($_COOKIE['AURLANG'])) {
+ # If a cookie is set, use that
+ #
+ $LANG = $_COOKIE['AURLANG'];
+
+ } # TODO query the database if the user is logged in
+
+ if (!$LANG || !array_key_exists($LANG, $SUPPORTED_LANGS)) {
+ $LANG = "en"; # default to English
+ }
+
+ if ($update_cookie) {
+ # TODO do we need to set the domain too? I seem to remember some
+ # security concerns about not using domains - but it's not like
+ # we really care if another site can see what language our visitor
+ # was using....
+ #
+ setcookie("AURLANG", $LANG, 0, "/");
+ }
+ return;
+}
+
# common header
#
@@ -49,11 +93,22 @@ function html_header() {
print " <td class='headerFill'>\n";
print " <table width='100%'>\n";
print " <tr>\n";
- print " <td class='headerDisplay'><a href='";
- print $_SERVER['PHP_SELF']."'>";
- print "<img src='/images/AUR-logo-80.png' border='0'></a></td>\n";
+ print " <td class='headerDisplay'><a href='/index.php'>";
+
+ # XXX Can I scale a PNG like this?
+ #
+ print "<img src='/images/AUR-logo-80.png' width='85' height='45' border='0'></a></td>\n";
print " <td class='headerDisplay' valign='top' align='right'>";
- print "<span class='fix'>ArchLinux User-community Repository</span></td>\n";
+ print "<span class='preHeader'>ArchLinux User-community Repository</span><br/>";
+
+ # XXX CSS help - a:link, a:visited, etc are defined, but I don't want to
+ # use the defaults. Is this the way to override them?
+ #
+ print "<a href='/index.php?setlang=en'><span class='sideBarSmallHeader'>English</span></a> ";
+ print "<a href='/index.php?setlang=es'><span class='sideBarSmallHeader'>Español</span></a> ";
+ print "<a href='/index.php?setlang=de'><span class='sideBarSmallHeader'>Deutsch</span></a> ";
+ print "<a href='/index.php?setlang=fr'><span class='sideBarSmallHeader'>Français</span></a>";
+ print " </td>\n";
print " </tr>\n";
print " </table>\n";
print " </tr>\n";
diff --git a/web/lib/translator.inc b/web/lib/translator.inc
index 87fe7815..ca9e4dda 100644
--- a/web/lib/translator.inc
+++ b/web/lib/translator.inc
@@ -25,23 +25,8 @@ include_once("common_po.inc");
function __($tag, $args=array()) {
global $_t;
- global $_REQUEST;
global $LANG;
- $supported_langs = array(
- "en" => 1, # English
- "es" => 1, # Español
- "de" => 1, # Deutsch
- "fr" => 1, # Français
- );
-
- # default to English if the lang hasn't been provided or isn't supported
- #
- $LANG = $_REQUEST['LANG'];
- if (!$LANG || !array_key_exists($LANG, $supported_langs)) {
- $LANG = "en";
- }
-
# create the translation, if it doesn't exist, highlight it
#
$translated = $_t[$LANG][$tag];