Tiki Wiki CMS Groupware

Le Tue, Jun 08, 2010 at 09:20:52PM +0200, luci aka luciash d' being écrivait :
> hmmmmm...
> 
> isn't it extremely weird and wrong to try to translate image paths anyway ?

Well no, Bold is represented by a B icon in english for Bold, but in
French B doesn't make sense as Bold is "Gras" so should be represented
by the "G" icon... Icons are localisable in different languages so using
tra() on the path is a solution to this pb, not the best, but...

A+
> On 06/08/2010 09:00 PM, pkdille@... wrote:
> > Revision: 27542
> >           http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=27542&view=rev
> > Author:   pkdille
> > Date:     2010-06-08 19:00:30 +0000 (Tue, 08 Jun 2010)
> >
> > Log Message:
> > -----------
> > [QT] Rollback rejected proposition r27479
> >
> > Modified Paths:
> > --------------
> >     branches/proposals/4.x/lib/toolbars/toolbarslib.php
> >
> > Modified: branches/proposals/4.x/lib/toolbars/toolbarslib.php
> > ===================================================================
> > --- branches/proposals/4.x/lib/toolbars/toolbarslib.php	2010-06-08 18:36:03 UTC (rev 27541)
> > +++ branches/proposals/4.x/lib/toolbars/toolbarslib.php	2010-06-08 19:00:30 UTC (rev 27542)
> > @@ -469,26 +469,26 @@
> >  	{
> >  		switch( $tagName ) {
> >  		case 'bold':
> > -			$label = tra("Bold");
> > -			$icon = tra("pics/icons/text_bold.png");
> > +			$label = tra('Bold');
> > +			$icon = tra('pics/icons/text_bold.png');
> >  			$wysiwyg = 'Bold';
> >  			$syntax = '__text__';
> >  			break;
> >  		case 'italic':
> > -			$label = tra("Italic");
> > -			$icon = tra("pics/icons/text_italic.png");
> > +			$label = tra('Italic');
> > +			$icon = tra('pics/icons/text_italic.png');
> >  			$wysiwyg = 'Italic';
> >  			$syntax = "''text''";
> >  			break;
> >  		case 'strike':
> > -			$label = tra("Strikethrough");
> > -			$icon = tra("pics/icons/text_strikethrough.png");
> > +			$label = tra('Strikethrough');
> > +			$icon = tra('pics/icons/text_strikethrough.png');
> >  			$wysiwyg = 'StrikeThrough';
> >  			$syntax = '--text--';
> >  			break;
> >  		case 'nonparsed':
> > -			$label = tra("Non-parsed");
> > -			$icon = tra("pics/icons/noparse.png");
> > +			$label = tra('Non-parsed');
> > +			$icon = tra('pics/icons/noparse.png');
> >  			$wysiwyg = null;
> >  			$syntax = '~np~text~/np~';
> >  			break;
> > @@ -540,40 +540,40 @@
> >  	{
> >  		switch( $tagName ) {
> >  		case 'center':
> > -			$label = tra("Align Center");
> > -			$icon = tra("pics/icons/text_align_center.png");
> > +			$label = tra('Align Center');
> > +			$icon = tra('pics/icons/text_align_center.png');
> >  			$wysiwyg = 'JustifyCenter';
> >  			$syntax = "::text::";
> >  			break;
> >  		case 'rule':
> > -			$label = tra("Horizontal Bar");
> > -			$icon = tra("pics/icons/page.png");
> > +			$label = tra('Horizontal Bar');
> > +			$icon = tra('pics/icons/page.png');
> >  			$wysiwyg = 'Rule';
> >  			$syntax = '---';
> >  			break;
> >  		case 'pagebreak':
> > -			$label = tra("Page Break");
> > -			$icon = tra("lib/fckeditor_tiki/fckeditor-icons/Pagebreak.gif");
> > +			$label = tra('Page Break');
> > +			$icon = tra('lib/fckeditor_tiki/fckeditor-icons/Pagebreak.gif');
> >  			$wysiwyg = 'PageBreak';
> >  			$syntax = '...page...';
> >  			break;
> >  		case 'blockquote':
> > -			$label = tra("Block Quote");
> > -			$icon = tra("pics/icons/box.png");
> > +			$label = tra('Block Quote');
> > +			$icon = tra('pics/icons/box.png');
> >  			$wysiwyg = 'Blockquote';
> >  			$syntax = '^text^';
> >  			break;
> >  		case 'h1':
> >  		case 'h2':
> >  		case 'h3':
> > -			$label = tra("Heading") . ' ' . $tagName{1};
> > +			$label = tra('Heading') . ' ' . $tagName{1};
> >  			$icon = 'pics/icons/text_heading_' . $tagName{1} . '.png';
> >  			$wysiwyg = null;
> >  			$syntax = str_repeat('!', $tagName{1}) . 'text';
> >  			break;
> >  		case 'toc':
> > -			$label = tra("Table of contents");
> > -			$icon = tra("pics/icons/book.png");
> > +			$label = tra('Table of contents');
> > +			$icon = tra('pics/icons/book.png');
> >  			$wysiwyg = 'TOC';
> >  			$syntax = '{maketoc}';
> >  			break;
> > @@ -606,14 +606,14 @@
> >  	{
> >  		switch( $tagName ) {
> >  		case 'list':
> > -			$label = tra("Unordered List");
> > -			$icon = tra("pics/icons/text_list_bullets.png");
> > +			$label = tra('Unordered List');
> > +			$icon = tra('pics/icons/text_list_bullets.png');
> >  			$wysiwyg = 'UnorderedList';
> >  			$syntax = '*text';
> >  			break;
> >  		case 'numlist':
> > -			$label = tra("Ordered List");
> > -			$icon = tra("pics/icons/text_list_numbers.png");
> > +			$label = tra('Ordered List');
> > +			$icon = tra('pics/icons/text_list_numbers.png');
> >  			$wysiwyg = 'OrderedList';
> >  			$syntax = '#text';
> >  			break;
> > @@ -653,16 +653,16 @@
> >  		switch( $tagName ) {
> >  		case 'specialchar':
> >  			$wysiwyg = 'SpecialChar';
> > -			$label = tra("Special Characters");
> > -			$icon = tra("lib/fckeditor_tiki/fckeditor-icons/Specialchar.gif");
> > +			$label = tra('Special Characters');
> > +			$icon = tra('lib/fckeditor_tiki/fckeditor-icons/Specialchar.gif');
> >  			// Line taken from DokuWiki
> >              $list = explode(' ','À à Á á Â â Ã ã Ä ä Ǎ ǎ Ă ă Å å Ā ā Ą ą Æ æ Ć ć Ç ç Č č Ĉ ĉ Ċ ċ Ð đ ð Ď ď È è É é Ê ê Ë ë Ě ě Ē ē Ė ė Ę ę Ģ ģ Ĝ ĝ Ğ ğ Ġ ġ Ĥ ĥ Ì ì Í í Î î Ï ï Ǐ ǐ Ī ī İ ı Į į Ĵ ĵ Ķ ķ Ĺ ĺ Ļ ļ Ľ ľ Ł ł Ŀ ŀ Ń ń Ñ ñ Ņ ņ Ň ň Ò ò Ó ó Ô ô Õ õ Ö ö Ǒ ǒ Ō ō Ő ő Œ œ Ø ø Ŕ ŕ Ŗ ŗ Ř ř Ś ś Ş ş Š š Ŝ ŝ Ţ ţ Ť ť Ù ù Ú ú Û û Ü ü Ǔ ǔ Ŭ ŭ Ū ū Ů ů ǖ ǘ ǚ ǜ Ų ų Ű ű Ŵ ŵ Ý ý Ÿ ÿ Ŷ ŷ Ź ź Ž ž Ż ż Þ þ ß Ħ ħ ¿ ¡ ¢ £ ¤ ¥ € ¦ § ª ¬ ¯ ° ± ÷ ‰ ¼ ½ ¾ ¹ ² ³ µ ¶ † ‡ · • º ∀ ∂ ∃ Ə ə ∅ ∇ ∈ ∉ ∋ ∏ ∑ ‾ − ∗ √ ∝ ∞ ∠ ∧ ∨ ∩ ∪ ∫ ∴ ∼ ≅ ≈ ≠ ≡ ≤ ≥ ⊂ ⊃ ⊄ ⊆ ⊇ ⊕ ⊗ ⊥ ⋅ ◊ ℘ ℑ ℜ ℵ ♠ ♣ ♥ ♦ 𝛼 𝛽 𝛤 𝛾 𝛥 𝛿 𝜀 𝜁 𝛨 𝜂 𝛩 𝜃 𝜄 𝜅 𝛬 𝜆 𝜇 𝜈 𝛯 𝜉 𝛱 𝜋 𝛳 𝜍 𝛴 𝜎 𝜏 𝜐 𝛷 𝜑 𝜒 𝛹 𝜓 𝛺 𝜔 𝛻 𝜕 ★ ☆ ☎ ☚ ☛ ☜ ☝ ☞ ☟ ☹ ☺ ✔ ✘ × „ “ ” ‚ ‘ ’ « » ‹ › — – … ← ↑ → ↓ ↔ ⇐ ⇑ ⇒ ⇓ ⇔ © ™ ® ′ ″');
> >  			$list = array_combine( $list, $list );
> >  			break;
> >  		case 'smiley':
> >  			$wysiwyg = 'Smiley';
> > -			$label = tra("Smileys");
> > -			$icon = tra("img/smiles/icon_smile.gif");
> > +			$label = tra('Smileys');
> > +			$icon = tra('img/smiles/icon_smile.gif');
> >  			$rawList = array( 'biggrin', 'confused', 'cool', 'cry', 'eek', 'evil', 'exclaim', 'frown', 'idea', 'lol', 'mad', 'mrgreen', 'neutral', 'question', 'razz', 'redface', 'rolleyes', 'sad', 'smile', 'surprised', 'twisted', 'wink', 'arrow', 'santa' );
> >  			$prefs[] = 'feature_smileys';
> >  
> > @@ -674,8 +674,8 @@
> >  			break;
> >  		case 'color':
> >  			$wysiwyg = 'TextColor';
> > -			$label = tra("Foreground color");
> > -			$icon = tra("pics/icons/palette.png");
> > +			$label = tra('Foreground color');
> > +			$icon = tra('pics/icons/palette.png');
> >  			$rawList = array();
> >  			
> >  			$hex = array("0", "3", "6", "9", "c", "f");
> > @@ -695,8 +695,8 @@
> >  			break;
> >  
> >  		case 'bgcolor':
> > -			$label = tra("Background Color");
> > -			$icon = tra("pics/icons/palette_bg.png");
> > +			$label = tra('Background Color');
> > +			$icon = tra('pics/icons/palette_bg.png');
> >  			$wysiwyg = 'BGColor';
> >  
> >  			$hex = array("0", "3", "6", "9", "c", "f");
> > @@ -869,8 +869,8 @@
> >  
> >  		switch( $tagName ) {
> >  		case 'tikilink':
> > -			$label = tra("Wiki Link");
> > -			$icon = tra("pics/icons/page_link.png");
> > +			$label = tra('Wiki Link');
> > +			$icon = tra('pics/icons/page_link.png');
> >  			$wysiwyg = 'tikilink';
> >  			$list = array('Wiki Link',
> >  						'<label for="tbWLinkDesc">Show this text</label>',
> > @@ -932,8 +932,8 @@
> >  			break;
> >  		case 'link':
> >  			$wysiwyg = 'Link';
> > -			$label = tra("External Link");
> > -			$icon = tra("pics/icons/world_link.png");
> > +			$label = tra('External Link');
> > +			$icon = tra('pics/icons/world_link.png');
> >  			$list = array('External Link',
> >  						'<label for="tbLinkDesc">Show this text</label>',
> >  						'<input type="text" id="tbLinkDesc" class="ui-widget-content ui-corner-all" style="width: 100%" />',
> > @@ -1000,9 +1000,9 @@
> >  			break;
> >  
> >  		case 'table':
> > -			$icon = tra("pics/icons/table.png");
> > +			$icon = tra('pics/icons/table.png');
> >  			$wysiwyg = 'Table';
> > -			$label = tra("Table Builder");
> > +			$label = tra('Table Builder');
> >  			$list = array('Table Builder',
> >  						'{"open": function () {
> >  var s = getSelection($jq(getElementById(areaname))[0]);
> > @@ -1147,9 +1147,9 @@
> >  			break;
> >  
> >  		case 'find':
> > -			$icon = tra("pics/icons/find.png");
> > +			$icon = tra('pics/icons/find.png');
> >  			$wysiwyg = 'Find';
> > -			$label = tra("Find Text");
> > +			$label = tra('Find Text');
> >  			$list = array('Find Text',
> >  						'<label>Search:</label>',
> >  						'<input type="text" id="tbFindSearch" class="ui-widget-content ui-corner-all" />',
> > @@ -1191,9 +1191,9 @@
> >  			break;
> >  
> >  		case 'replace':
> > -			$icon = tra("pics/icons/text_replace.png");
> > +			$icon = tra('pics/icons/text_replace.png');
> >  			$wysiwyg = 'Replace';
> > -			$label = tra("Text Replace");
> > +			$label = tra('Text Replace');
> >  			$tool_prefs[] = 'feature_wiki_replace';
> >  			
> >  			$list = array('Text Replace',
> > @@ -1349,7 +1349,7 @@
> >  {
> >  	function __construct() // {{{
> >  	{
> > -		$this->setLabel( tra("Full Screen Edit") )
> > +		$this->setLabel( tra('Full Screen Edit') )
> >  			->setIcon( 'pics/icons/application_get.png' )
> >  			->setWysiwygToken( 'FitWindow' )
> >  				->setType('Fullscreen');
> > @@ -1373,15 +1373,15 @@
> >  	{
> >  		switch( $type ) {
> >  		case 'reduce':
> > -			$this->setLabel( tra("Reduce area height") )
> > -				->setIcon( tra("pics/icons/arrow_in.png") )
> > +			$this->setLabel( tra('Reduce area height') )
> > +				->setIcon( tra('pics/icons/arrow_in.png') )
> >  					->setType('TextareaResize');
> >  			$this->diff = '-10';
> >  			break;
> >  
> >  		case 'enlarge':
> > -			$this->setLabel( tra("Enlarge area height") )
> > -				->setIcon( tra("pics/icons/arrow_out.png") )
> > +			$this->setLabel( tra('Enlarge area height') )
> > +				->setIcon( tra('pics/icons/arrow_out.png') )
> >  					->setType('TextareaResize');
> >  			$this->diff = '+10';
> >  			break;
> > @@ -1407,7 +1407,7 @@
> >  {
> >  	function __construct() // {{{
> >  	{
> > -		$this->setLabel( tra("Wiki Help") )
> > +		$this->setLabel( tra('Wiki Help') )
> >  			->setIcon( 'pics/icons/help.png' )
> >  				->setType('Helptool');
> >  	} // }}}
> > @@ -1435,8 +1435,8 @@
> >  {
> >  	function __construct() // {{{
> >  	{
> > -		$this->setLabel( tra("Choose or upload images") )
> > -			->setIcon( tra("pics/icons/pictures.png") )
> > +		$this->setLabel( tra('Choose or upload images') )
> > +			->setIcon( tra('pics/icons/pictures.png') )
> >  				->setWysiwygToken( 'tikiimage' )
> >  					->setType('FileGallery')
> >  						->addRequiredPreference('feature_filegals_manager');
> > @@ -1461,8 +1461,8 @@
> >  {
> >  	function __construct() // {{{
> >  	{
> > -		$this->setLabel( tra("Switch Editor (wiki or WYSIWYG)") )
> > -			->setIcon( tra("pics/icons/pencil_go.png") )
> > +		$this->setLabel( tra('Switch Editor (wiki or WYSIWYG)') )
> > +			->setIcon( tra('pics/icons/pencil_go.png') )
> >  				->setWysiwygToken( 'tikiswitch' )
> >  					->setType('SwitchEditor')
> >  						->addRequiredPreference('feature_wysiwyg');
> > @@ -1701,7 +1701,7 @@
> >  				if ($c == 0 && $bitx == 1 && ($tiki_p_admin == 'y' or $tiki_p_admin_toolbars == 'y')) {
> >  					$params = array('_script' => 'tiki-admin_toolbars.php', '_onclick' => 'needToConfirm = true;', '_class' => 'toolbar', '_icon' => 'wrench', '_ajax' => 'n');
> >  					if (isset($section)) { $params['section'] = $section; }
> > -					$content = tra("Admin Toolbars");
> > +					$content = tra('Admin Toolbars');
> >  					$right .= smarty_block_self_link($params, $content, $smarty);
> >  				}
> >  			
> > @@ -1753,3 +1753,4 @@
> >  		return false;
> >  	} // }}}
> >  }
> > +
> >
> >
> > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
> >
> > ------------------------------------------------------------------------------
> > ThinkGeek and WIRED's GeekDad team up for the Ultimate 
> > GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the 
> > lucky parental unit.  See the prize list and enter to win: 
> > http://p.sf.net/sfu/thinkgeek-promo
> > _______________________________________________
> > Tikiwiki-cvs mailing list
> > Tikiwiki-cvs@...
> > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs
> >   
> 
> 
> ------------------------------------------------------------------------------
> ThinkGeek and WIRED's GeekDad team up for the Ultimate 
> GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the 
> lucky parental unit.  See the prize list and enter to win: 
> http://p.sf.net/sfu/thinkgeek-promo
> _______________________________________________
> Tikiwiki-cvs mailing list
> Tikiwiki-cvs@...
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs

-- 
Cordialement
-- 
Stéphane Casset            LOGIDÉE sàrl       Se faire plaisir d'apprendre
1a, rue Pasteur        Tel : +33 388 23 69 77           casset@...
F-67540 OSTWALD        Fax : +33 388 23 69 77           http://logidee.com

2002	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (246)
2003	Jan (243)	Feb (145)	Mar (512)	Apr (423)	May (572)	Jun (344)	Jul (1439)	Aug (1086)	Sep (452)	Oct (1093)	Nov (1000)	Dec (1070)
2004	Jan (1462)	Feb (753)	Mar (1752)	Apr (714)	May (617)	Jun (1326)	Jul (829)	Aug (726)	Sep (723)	Oct (777)	Nov (295)	Dec (203)
2005	Jan (694)	Feb (664)	Mar (606)	Apr (798)	May (429)	Jun (236)	Jul (197)	Aug (340)	Sep (432)	Oct (443)	Nov (334)	Dec (434)
2006	Jan (452)	Feb (283)	Mar (163)	Apr (341)	May (202)	Jun (147)	Jul (291)	Aug (363)	Sep (342)	Oct (309)	Nov (600)	Dec (722)
2007	Jan (363)	Feb (699)	Mar (1009)	Apr (186)	May (368)	Jun (551)	Jul (1146)	Aug (1152)	Sep (500)	Oct (714)	Nov (780)	Dec (725)
2008	Jan (640)	Feb (670)	Mar (679)	Apr (496)	May (351)	Jun (331)	Jul (621)	Aug (627)	Sep (361)	Oct (579)	Nov (423)	Dec (342)
2009	Jan (384)	Feb (603)	Mar (815)	Apr (663)	May (1194)	Jun (1055)	Jul (699)	Aug (907)	Sep (1104)	Oct (1142)	Nov (942)	Dec (631)
2010	Jan (935)	Feb (1420)	Mar (766)	Apr (517)	May (715)	Jun (512)	Jul (499)	Aug (725)	Sep (1272)	Oct (855)	Nov (657)	Dec (959)
2011	Jan (1048)	Feb (1135)	Mar (703)	Apr (548)	May (659)	Jun (543)	Jul (980)	Aug (1197)	Sep (1358)	Oct (890)	Nov (522)	Dec (318)
2012	Jan (400)	Feb (402)	Mar (846)	Apr (748)	May (565)	Jun (583)	Jul (383)	Aug (331)	Sep (451)	Oct (615)	Nov (483)	Dec (325)
2013	Jan (353)	Feb (335)	Mar (402)	Apr (498)	May (355)	Jun (444)	Jul (445)	Aug (408)	Sep (542)	Oct (525)	Nov (641)	Dec (480)
2014	Jan (431)	Feb (512)	Mar (485)	Apr (527)	May (541)	Jun (237)	Jul (455)	Aug (244)	Sep (268)	Oct (303)	Nov (265)	Dec (174)
2015	Jan (349)	Feb (490)	Mar (766)	Apr (464)	May (339)	Jun (196)	Jul (177)	Aug (172)	Sep (290)	Oct (258)	Nov (259)	Dec (275)
2016	Jan (281)	Feb (385)	Mar (478)	Apr (383)	May (264)	Jun (299)	Jul (343)	Aug (288)	Sep (331)	Oct (288)	Nov (465)	Dec (301)
2017	Jan (534)	Feb (136)	Mar (1034)	Apr (592)	May (630)	Jun (405)	Jul (419)	Aug (447)	Sep (436)	Oct (527)	Nov (508)	Dec (391)
2018	Jan (443)	Feb (203)	Mar (289)	Apr (391)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

S	M	T	W	T	F	S
		1 (87)	2 (20)	3 (8)	4 (10)	5 (11)
6 (5)	7 (28)	8 (38)	9 (25)	10 (8)	11 (21)	12 (6)
13 (5)	14 (15)	15 (25)	16 (23)	17 (43)	18 (7)	19 (6)
20 (6)	21 (24)	22 (11)	23 (13)	24 (12)	25 (9)	26 (4)
27 (6)	28 (9)	29 (17)	30 (10)

Thanks for helping keep SourceForge clean.

Tiki Wiki CMS Groupware

The Free / Libre / Open Source Web App with the most built-in features

Brought to you by: chibaguy, gezzzan, jonnybradley, jyhem, and 7 others

tikiwiki-cvs — SVN commits information, and comments about commits