[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6478] merge 6475:6477 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6478] merge 6475:6477 from trunk |
|
Date: |
Tue, 12 Oct 2010 21:47:13 +0000 |
Revision: 6478
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6478
Author: sigurdne
Date: 2010-10-12 21:47:13 +0000 (Tue, 12 Oct 2010)
Log Message:
-----------
merge 6475:6477 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/phpgwapi/inc/class.translation.inc.php
branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
branches/Version-1_0-branch/rental/templates/base/party.php
Added Paths:
-----------
branches/Version-1_0-branch/phpgwapi/templates/base/images/flag_en.gif
branches/Version-1_0-branch/phpgwapi/templates/base/images/flag_no.gif
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474
+ /trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.translation.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.translation.inc.php
2010-10-12 21:44:15 UTC (rev 6477)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.translation.inc.php
2010-10-12 21:47:13 UTC (rev 6478)
@@ -277,11 +277,12 @@
$userlang = 'en';
}
+/*
if (
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] )
{
$userlang =
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'];
}
-
+*/
$sql = "SELECT message_id,content FROM phpgw_lang WHERE
lang = '{$userlang}' AND app_name = '{$app}'";
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
while ( $GLOBALS['phpgw']->db->next_record() )
Modified: branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
2010-10-12 21:44:15 UTC (rev 6477)
+++ branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
2010-10-12 21:47:13 UTC (rev 6478)
@@ -215,6 +215,11 @@
$GLOBALS['phpgw']->translation->set_userlang($GLOBALS['phpgw_info']['user']['preferences']['common']['lang'],
$reset = true);
}
+ if ($selected_lang = phpgw::get_var('lang', 'string',
'GET', ''))
+ {
+
$GLOBALS['phpgw']->translation->set_userlang($selected_lang, $reset = true);
+ }
+
$lang = array
(
'domain' => lang('domain'),
Copied: branches/Version-1_0-branch/phpgwapi/templates/base/images/flag_en.gif
(from rev 6477, trunk/phpgwapi/templates/base/images/flag_en.gif)
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/templates/base/images/flag_no.gif
(from rev 6477, trunk/phpgwapi/templates/base/images/flag_no.gif)
===================================================================
(Binary files differ)
Modified: branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
2010-10-12 21:44:15 UTC (rev 6477)
+++ branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
2010-10-12 21:47:13 UTC (rev 6478)
@@ -4,12 +4,12 @@
<!-- BEGIN login_form -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <meta name="author" content="phpGroupWare http://www.phpgroupware.no";>
- <meta name="description" content="{website_title} login screen, working
environment powered by phpGroupWare">
- <meta name="keywords" content="{website_title} login screen,
phpgroupware, groupware, groupware suite">
+ <meta name="author" content="{system} http://www.phpgroupware.no";>
+ <meta name="description" content="{system} login screen, working
environment powered by phpGroupWare">
+ <meta name="keywords" content="{{system} login screen, phpgroupware,
groupware, groupware suite">
<meta name="robots" content="noindex,nofollow">
- <title>{website_title} - {lang_login}</title>
+ <title>{system} - {lang_login}</title>
<link rel="stylesheet" href="phpgwapi/templates/base/css/system.css"
type="text/css">
<link rel="stylesheet" href="{login_css}" type="text/css">
@@ -45,6 +45,11 @@
</div>
<div id="content-box">
+ <div class="rawimages">
+ <span><a href="login.php?lang=no"><img
src="phpgwapi/templates/base/images/flag_no.gif" alt="Norsk (Norway)"
title="Norsk (Norway)" ></a></span>
+ <span><a href="login.php?lang=en"><img
src="phpgwapi/templates/base/images/flag_en.gif" alt="English (United Kingdom)"
title="English (United Kingdom)" ></a></span>
+ </div>
+
<div class="padding">
<div id="element-box" class="login">
<div class="t">
Modified: branches/Version-1_0-branch/rental/templates/base/party.php
===================================================================
--- branches/Version-1_0-branch/rental/templates/base/party.php 2010-10-12
21:44:15 UTC (rev 6477)
+++ branches/Version-1_0-branch/rental/templates/base/party.php 2010-10-12
21:47:13 UTC (rev 6478)
@@ -383,7 +383,6 @@
?>
</dd> -->
<?php
- echo "<!--
fd:".$use_fellesdata." -->";
if($use_fellesdata)
{
include
PHPGW_SERVER_ROOT . "/rental/inc/plugins/fellesdata/party.edit.php";
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6478] merge 6475:6477 from trunk,
Sigurd Nes <=