CVS commit information for TikiWiki CMS/Groupware

Jonny Bradley | 1 Sep 2011 01:51

Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[36738] trunk/lang/fr/language.php


Angalis not enough these days i guess ;(

jb :)

On 31 Aug 2011, at 17:22, chealer@... wrote:

> Revision: 36738
>          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=36738&view=rev
> Author:   chealer
> Date:     2011-08-31 16:22:54 +0000 (Wed, 31 Aug 2011)
> Log Message:
> -----------
> [TRA] "Anglais britannique" seems better to me than "Britannique" for "English British"
> 
> Modified Paths:
> --------------
>    trunk/lang/fr/language.php
> 
> Modified: trunk/lang/fr/language.php
> ===================================================================
> --- trunk/lang/fr/language.php	2011-08-31 16:18:15 UTC (rev 36737)
> +++ trunk/lang/fr/language.php	2011-08-31 16:22:54 UTC (rev 36738)
>  <at>  <at>  -5519,7 +5519,7  <at>  <at> 
> "Danish" => "Danois",
> "German" => "Allemand",
> "English" => "Anglais",
> -"English British" => "Britannique",
> +"English British" => "Anglais britannique",
> "Spanish" => "Espagnol",

(Continue reading)

headers

chealer | 1 Sep 2011 01:51

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[36751] trunk

Revision: 36751
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=36751&view=rev
Author:   chealer
Date:     2011-08-31 23:51:11 +0000 (Wed, 31 Aug 2011)
Log Message:
-----------
[FIX] Smarty preference function: show global value for overriden preferences
Revert r23285, r27486 and some more workarounds with a default
Nelson: feel free to check the wiki home page still behaves as it should

Revision Links:
--------------
    http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=23285&view=rev
    http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=27486&view=rev

Modified Paths:
--------------
    trunk/lib/smarty_tiki/function.preference.php
    trunk/templates/admin/include_i18n.tpl
    trunk/templates/admin/include_look.tpl
    trunk/templates/admin/include_wiki.tpl

Modified: trunk/lib/smarty_tiki/function.preference.php
===================================================================
--- trunk/lib/smarty_tiki/function.preference.php	2011-08-31 22:49:53 UTC (rev 36750)
+++ trunk/lib/smarty_tiki/function.preference.php	2011-08-31 23:51:11 UTC (rev 36751)
 <at>  <at>  -6,7 +6,7  <at>  <at> 
 // $Id$

 function smarty_function_preference( $params, $smarty ) {

(Continue reading)

headers

chealer | 1 Sep 2011 02:01

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[36752] trunk/lib/setup/language.php

Revision: 36752
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=36752&view=rev
Author:   chealer
Date:     2011-09-01 00:01:18 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
[FIX] Detect browser language not working when global language is not English (Closes: #2519, r16846
regression). Thanks Xavier de Pedro

Revision Links:
--------------
    http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=16846&view=rev

Modified Paths:
--------------
    trunk/lib/setup/language.php

Modified: trunk/lib/setup/language.php
===================================================================
--- trunk/lib/setup/language.php	2011-08-31 23:51:11 UTC (rev 36751)
+++ trunk/lib/setup/language.php	2011-09-01 00:01:18 UTC (rev 36752)
 <at>  <at>  -8,7 +8,7  <at>  <at> 
 //this script may only be included - so its better to die if called directly.
 $access->check_script($_SERVER["SCRIPT_NAME"],basename(__FILE__));

-if ($prefs['feature_multilingual'] != 'y') { // change_language is enabled by default, but depends on
feature_multilingual. Hackish...
+if ($prefs['feature_multilingual'] != 'y') { // change_language depends on feature_multilingual.
 	$prefs['change_language'] = 'n';
 }

(Continue reading)

headers

chealer | 1 Sep 2011 02:06

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[36753] branches/7.x/lib/setup/language.php

Revision: 36753
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=36753&view=rev
Author:   chealer
Date:     2011-09-01 00:06:52 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
[bp/r36752][FIX] Detect browser language not working when global language is not English

Revision Links:
--------------
    http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=36752&view=rev

Modified Paths:
--------------
    branches/7.x/lib/setup/language.php

Modified: branches/7.x/lib/setup/language.php
===================================================================
--- branches/7.x/lib/setup/language.php	2011-09-01 00:01:18 UTC (rev 36752)
+++ branches/7.x/lib/setup/language.php	2011-09-01 00:06:52 UTC (rev 36753)
 <at>  <at>  -27,7 +27,7  <at>  <at> 
 	} else {
 		$_SESSION['language'] = $prefs['language'];
 	}
-} elseif ( $prefs['feature_multilingual'] == 'y' && $prefs['change_language'] == 'y' &&
$prefs['feature_detect_language'] == 'y' and !isset($u_info['prefs']['language'])and
!isset($_SESSION['s_prefs']['language'])) {
+} elseif ( $prefs['feature_multilingual'] == 'y' && $prefs['change_language'] == 'y' &&
$prefs['feature_detect_language'] == 'y' and !isset($u_info['prefs']['language'])) {
 	$browser_language = detect_browser_language();

(Continue reading)

headers

chealer | 1 Sep 2011 02:11

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[36754] branches/proposals/6.x/lib/setup/language.php

Revision: 36754
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=36754&view=rev
Author:   chealer
Date:     2011-09-01 00:11:01 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
[bp/r36753][FIX] Detect browser language not working when global language is not English

Revision Links:
--------------
    http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=36753&view=rev

Modified Paths:
--------------
    branches/proposals/6.x/lib/setup/language.php

Modified: branches/proposals/6.x/lib/setup/language.php
===================================================================
--- branches/proposals/6.x/lib/setup/language.php	2011-09-01 00:06:52 UTC (rev 36753)
+++ branches/proposals/6.x/lib/setup/language.php	2011-09-01 00:11:01 UTC (rev 36754)
 <at>  <at>  -27,7 +27,7  <at>  <at> 
 	} else {
 		$_SESSION['language'] = $prefs['language'];
 	}
-} elseif ( $prefs['feature_multilingual'] == 'y' && $prefs['change_language'] == 'y' &&
$prefs['feature_detect_language'] == 'y' and !isset($u_info['prefs']['language'])and
!isset($_SESSION['s_prefs']['language'])) {
+} elseif ( $prefs['feature_multilingual'] == 'y' && $prefs['change_language'] == 'y' &&
$prefs['feature_detect_language'] == 'y' and !isset($u_info['prefs']['language'])) {
 	$browser_language = detect_browser_language();

(Continue reading)

headers

chealer | 1 Sep 2011 04:54

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[36755] trunk/templates/modules

Revision: 36755
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=36755&view=rev
Author:   chealer
Date:     2011-09-01 02:54:50 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
[FIX] module names

Modified Paths:
--------------
    trunk/templates/modules/mod-groups_emulation.tpl
    trunk/templates/modules/mod-search_wiki_page.tpl

Modified: trunk/templates/modules/mod-groups_emulation.tpl
===================================================================
--- trunk/templates/modules/mod-groups_emulation.tpl	2011-09-01 00:11:01 UTC (rev 36754)
+++ trunk/templates/modules/mod-groups_emulation.tpl	2011-09-01 02:54:50 UTC (rev 36755)
 <at>  <at>  -1,5 +1,5  <at>  <at> 
 {strip}
-{tikimodule error=$module_params.error title=$tpl_module_title name="switch_lang"
flip=$module_params.flip decorations=$module_params.decorations nobox=$module_params.nobox notitle=$module_params.notitle}
+{tikimodule error=$module_params.error title=$tpl_module_title name="groups_emulation"
flip=$module_params.flip decorations=$module_params.decorations nobox=$module_params.nobox notitle=$module_params.notitle}
 	{if isset($allGroups)}
 		<fieldset>
 			<legend>{tr}All Groups{/tr}</legend>

Modified: trunk/templates/modules/mod-search_wiki_page.tpl
===================================================================
--- trunk/templates/modules/mod-search_wiki_page.tpl	2011-09-01 00:11:01 UTC (rev 36754)

(Continue reading)

headers

chealer | 1 Sep 2011 04:59

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[36756] trunk/tiki-switch_lang.php

Revision: 36756
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=36756&view=rev
Author:   chealer
Date:     2011-09-01 02:59:44 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
[REF] switch_lang: from parameter is apparently no longer used

Modified Paths:
--------------
    trunk/tiki-switch_lang.php

Modified: trunk/tiki-switch_lang.php
===================================================================
--- trunk/tiki-switch_lang.php	2011-09-01 02:54:50 UTC (rev 36755)
+++ trunk/tiki-switch_lang.php	2011-09-01 02:59:44 UTC (rev 36756)
 <at>  <at>  -9,8 +9,7  <at>  <at> 

 $access->check_feature('change_language');

-if (isset($_GET['from'])) $orig_url = $_GET['from'];
-elseif (isset($_SERVER['HTTP_REFERER'])) $orig_url = $_SERVER['HTTP_REFERER'];
+if (isset($_SERVER['HTTP_REFERER'])) $orig_url = $_SERVER['HTTP_REFERER'];
 else $orig_url = $prefs['tikiIndex'];

 if ($prefs['feature_sefurl'] == 'y' && !strstr($orig_url, '.php')) { 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open
Source development site.

(Continue reading)

headers

chealer | 1 Sep 2011 05:04

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[36757] trunk/tiki-switch_lang.php

Revision: 36757
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=36757&view=rev
Author:   chealer
Date:     2011-09-01 03:04:15 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
[REF] switch_lang: remove $orig_url manipulation which is useless now that the switchLang parameter is
no longer used

Modified Paths:
--------------
    trunk/tiki-switch_lang.php

Modified: trunk/tiki-switch_lang.php
===================================================================
--- trunk/tiki-switch_lang.php	2011-09-01 02:59:44 UTC (rev 36756)
+++ trunk/tiki-switch_lang.php	2011-09-01 03:04:15 UTC (rev 36757)
 <at>  <at>  -75,7 +75,6  <at>  <at> 
 		$orig_url = filter_out_sefurl($orig_url, $smarty);
 	}
 }
-$orig_url = preg_replace('/(.*\?.*)switchLang=[a-zA-Z-_]*&?(.*)/', '$1$2', $orig_url);
 $orig_url = preg_replace('/(.*[?&]lang=)[a-zA-Z-_]*(&?.*)/', '$1' . $_REQUEST['language'] . '$2',
$orig_url); // for tiki-view_lang.php?lang=en
 if (isset($_GET['language'])) {
 	$language = $_GET['language'];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open
Source development site.

(Continue reading)

headers

chealer | 1 Sep 2011 05:06

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[36758] trunk/tiki-switch_lang.php

Revision: 36758
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=36758&view=rev
Author:   chealer
Date:     2011-09-01 03:06:34 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
[REF] switch_lang: remove $orig_url manipulation which should be useless the way the switch is done now. I
can't understand the comment (tiki-view_lang.php ?)

Modified Paths:
--------------
    trunk/tiki-switch_lang.php

Modified: trunk/tiki-switch_lang.php
===================================================================
--- trunk/tiki-switch_lang.php	2011-09-01 03:04:15 UTC (rev 36757)
+++ trunk/tiki-switch_lang.php	2011-09-01 03:06:34 UTC (rev 36758)
 <at>  <at>  -75,7 +75,6  <at>  <at> 
 		$orig_url = filter_out_sefurl($orig_url, $smarty);
 	}
 }
-$orig_url = preg_replace('/(.*[?&]lang=)[a-zA-Z-_]*(&?.*)/', '$1' . $_REQUEST['language'] .
'$2', $orig_url); // for tiki-view_lang.php?lang=en
 if (isset($_GET['language'])) {
 	$language = $_GET['language'];
 	if ($user && $prefs['change_language'] == 'y') {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open
Source development site.

(Continue reading)

headers

Filipus Klutiero | 1 Sep 2011 07:36

Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[14114] trunk

Hi Sylvie,
is it intended that this only durably affects the language of anonymous users (except perhaps in some cases where a user has no custom language set)?
If so, could you explain what is the idea behind this feature?

Revision: 14114 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=14114&view=rev Author: sylvieg Date: 2008-08-07 15:06:21 +0000 (Thu, 07 Aug 2008) Log Message: ----------- [MOD]i18n: new option that forces the string to be in the same language of the page Modified Paths: -------------- trunk/lib/setup/prefs.php trunk/templates/tiki-admin-include-i18n.tpl trunk/tiki-admin_include_i18n.php trunk/tiki-index.php Modified: trunk/lib/setup/prefs.php =================================================================== --- trunk/lib/setup/prefs.php 2008-08-07 14:04:59 UTC (rev 14113) +++ trunk/lib/setup/prefs.php 2008-08-07 15:06:21 UTC (rev 14114) <at> <at> -745,6 +745,7 <at> <at> $prefs['feature_babelfish'] = 'n'; $prefs['feature_babelfish_logo'] = 'n'; $prefs['quantify_changes'] = 'n'; + $prefs['feature_sync_language'] = 'n'; # html header $prefs['metatag_keywords'] = ''; Modified: trunk/templates/tiki-admin-include-i18n.tpl =================================================================== --- trunk/templates/tiki-admin-include-i18n.tpl 2008-08-07 14:04:59 UTC (rev 14113) +++ trunk/templates/tiki-admin-include-i18n.tpl 2008-08-07 15:06:21 UTC (rev 14114) <at> <at> -57,6 +57,10 <at> <at> {if $prefs.feature_best_language eq 'y'}checked="checked"{/if}/></td> </tr><tr> + <td class="form"><label for="feature_sync_language">{tr}Page language forces to display strings in the same language{/tr}:</label></td> + <td><input type="checkbox" name="feature_sync_language" id="feature_sync_language" + {if $prefs.feature_sync_language eq 'y'}checked="checked"{/if}/></td> + </tr><tr> <td class="form"><label for="feature_detect_language">{tr}Detect browser language{/tr}:</label></td> <td><input type="checkbox" name="feature_detect_language" id="feature_detect_language" Modified: trunk/tiki-admin_include_i18n.php =================================================================== --- trunk/tiki-admin_include_i18n.php 2008-08-07 14:04:59 UTC (rev 14113) +++ trunk/tiki-admin_include_i18n.php 2008-08-07 15:06:21 UTC (rev 14114) <at> <at> -29,6 +29,7 <at> <at> "feature_multilingual", "feature_multilingual_structures", "feature_best_language", + 'feature_sync_language', "feature_detect_language", // This option should be re-added to this page, no? // "change_language", Modified: trunk/tiki-index.php =================================================================== --- trunk/tiki-index.php 2008-08-07 14:04:59 UTC (rev 14113) +++ trunk/tiki-index.php 2008-08-07 15:06:21 UTC (rev 14114) <at> <at> -65,7 +65,7 <at> <at> *[http://info.tikiwiki.org/Learn+More|Learn more about TikiWiki]. *[http://info.tikiwiki.org/Help+Others|Get help], including the [http://doc.tikiwiki.org|official documentation] and [http://www.tikiwiki.org/forums|support forums]. *[http://info.tikiwiki.org/Join+the+community|Join the TikiWiki community]. -',$tikilib->now,'Tiki initialization'); +',$tikilib->now,'Tiki initialization', 'admin', '0.0.0.0', '', 'en'); header('Location: tiki-index.php?page='.$userHomePage); } } else { <at> <at> -201,6 +201,7 <at> <at> if (!$info) $info = $tikilib->get_page_info($page); + // If the page doesn't exist then display an error if(empty($info) && !($user && $prefs['feature_wiki_userpage'] == 'y' && strcasecmp($prefs['feature_wiki_userpage_prefix'].$user, $page) == 0)) { if ($user && $prefs['feature_wiki_userpage'] == 'y' && strcasecmp($prefs['feature_wiki_userpage_prefix'], $page) == 0) { <at> <at> -236,6 +237,10 <at> <at> header('Location: tiki-editpage.php?page='.$prefs['feature_wiki_userpage_prefix'].$user); die; } +if ($prefs['feature_multilingual'] == 'y' && $prefs['feature_sync_language'] == 'y' && !empty($info['lang'])) { + $_SESSION['s_prefs']['language'] = $info['lang']; + $prefs['language'] = $info['lang']; +} /*Wiki SECURITY warning to optimizers : Although get_page_info is currently called even if permission is denied, we must still get page's real name

------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better 
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev

_______________________________________________
Tikiwiki-cvs mailing list
Tikiwiki-cvs@...
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs

249	May 2013
498	April 2013
401	March 2013
336	February 2013
352	January 2013
325	December 2012
483	November 2012
616	October 2012
450	September 2012
331	August 2012
383	July 2012
582	June 2012
567	May 2012
747	April 2012
845	March 2012
402	February 2012
400	January 2012
318	December 2011
522	November 2011
890	October 2011
1359	September 2011
1195	August 2011
980	July 2011
542	June 2011
659	May 2011
548	April 2011
705	March 2011
1133	February 2011
1048	January 2011
960	December 2010
656	November 2010
855	October 2010
1273	September 2010
726	August 2010
497	July 2010
512	June 2010
757	May 2010
518	April 2010
766	March 2010
1395	February 2010
933	January 2010
631	December 2009
942	November 2009
1135	October 2009
1095	September 2009
904	August 2009
696	July 2009
1046	June 2009
1187	May 2009
658	April 2009
811	March 2009
596	February 2009
384	January 2009
341	December 2008
426	November 2008
575	October 2008
361	September 2008
627	August 2008
621	July 2008
331	June 2008
351	May 2008
495	April 2008
681	March 2008
670	February 2008
638	January 2008
725	December 2007
781	November 2007
713	October 2007
496	September 2007
1144	August 2007
1146	July 2007
551	June 2007
370	May 2007
183	April 2007
1009	March 2007
700	February 2007
363	January 2007
712	December 2006
600	November 2006
309	October 2006
342	September 2006
364	August 2006
290	July 2006
147	June 2006
202	May 2006
341	April 2006
163	March 2006
282	February 2006
452	January 2006
434	December 2005
334	November 2005
443	October 2005
432	September 2005
338	August 2005
197	July 2005
236	June 2005
428	May 2005
801	April 2005
602	March 2005
667	February 2005
691	January 2005
203	December 2004
296	November 2004
776	October 2004
723	September 2004
725	August 2004
838	July 2004
1314	June 2004
623	May 2004
706	April 2004
1732	March 2004
752	February 2004
1453	January 2004
1068	December 2003
998	November 2003
1087	October 2003
442	September 2003
1084	August 2003
1432	July 2003
343	June 2003
561	May 2003

Mon	Tue	Wed	Thu	Fri	Sat	Sun

			1	2	3	4
5	6	7	8	9	10	11
12	13	14	15	16	17	18
19	20	21	22	23	24	25
26	27	28	29	30