summaryrefslogtreecommitdiff
path: root/www/index.php
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2012-07-23 17:40:24 +0200
committerMichael Tänzer <neo@nhng.de>2012-07-23 17:40:24 +0200
commite0f7339704f2e6045774301b0359be3502f4b486 (patch)
treeb8560ed68f42b15585611bba78627740140a80d7 /www/index.php
parent30ac5366838978bd685da21208974c83883cd9d6 (diff)
parentfd4fbe21e9ef63c555469b595f7748fadfb977f4 (diff)
downloadcacert-devel-e0f7339704f2e6045774301b0359be3502f4b486.tar.gz
cacert-devel-e0f7339704f2e6045774301b0359be3502f4b486.tar.xz
cacert-devel-e0f7339704f2e6045774301b0359be3502f4b486.zip
Merge branch 'release' into bug-964
Diffstat (limited to 'www/index.php')
-rw-r--r--www/index.php19
1 files changed, 7 insertions, 12 deletions
diff --git a/www/index.php b/www/index.php
index 5f7fc14..41b6d7a 100644
--- a/www/index.php
+++ b/www/index.php
@@ -14,8 +14,9 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/ ?>
-<?
+*/
+
+require_once('../includes/lib/l10n.php');
$id = 0; if(array_key_exists("id",$_REQUEST)) $id=intval($_REQUEST['id']);
$oldid = 0; if(array_key_exists("oldid",$_REQUEST)) $oldid=intval($_REQUEST['oldid']);
@@ -310,18 +311,12 @@
if($_SESSION['profile']['language'] == "")
{
- $query = "update `users` set `language`='".$_SESSION['_config']['language']."'
+ $query = "update `users` set `language`='".L10n::get_translation()."'
where `id`='".$_SESSION['profile']['id']."'";
mysql_query($query);
} else {
- $_SESSION['_config']['language'] = $_SESSION['profile']['language'];
-
- putenv("LANG=".$_SESSION['_config']['language']);
- setlocale(LC_ALL, $_SESSION['_config']['language']);
-
- $domain = 'messages';
- bindtextdomain("$domain", $_SESSION['_config']['filepath']."/locale");
- textdomain("$domain");
+ L10n::set_translation($_SESSION['profile']['language']);
+ L10n::init_gettext();
}
$query = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['profile']['id']."' group by `to`";
$res = mysql_query($query);
@@ -551,7 +546,7 @@
mysql_query($query);
$body = _("Thanks for signing up with CAcert.org, below is the link you need to open to verify your account. Once your account is verified you will be able to start issuing certificates till your hearts' content!")."\n\n";
- $body .= "http://".$_SESSION['_config']['normalhostname']."/verify.php?type=email&emailid=$emailid&hash=$hash\n\n"; //."&"."lang=".$_SESSION['_config']['language']."\n\n";
+ $body .= "http://".$_SESSION['_config']['normalhostname']."/verify.php?type=email&emailid=$emailid&hash=$hash\n\n";
$body .= _("Best regards")."\n"._("CAcert.org Support!");
sendmail($_SESSION['signup']['email'], "[CAcert.org] "._("Mail Probe"), $body, "support@cacert.org", "", "", "CAcert Support");