Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[56400] trunk
|
From: <li...@us...> - 2015-10-03 13:38:40
|
Revision: 56400
http://sourceforge.net/p/tikiwiki/code/56400
Author: lindonb
Date: 2015-10-03 13:38:38 +0000 (Sat, 03 Oct 2015)
Log Message:
-----------
[MRG] Automatic merge, branches/14.x 56387 to 56399
Modified Paths:
--------------
trunk/lib/wiki-plugins/wikiplugin_trackertoggle.php
trunk/lib/wiki-plugins/wikiplugin_trade.php
trunk/lib/wiki-plugins/wikiplugin_transclude.php
trunk/lib/wiki-plugins/wikiplugin_translated.php
trunk/lib/wiki-plugins/wikiplugin_translationof.php
trunk/lib/wiki-plugins/wikiplugin_twitter.php
Property Changed:
----------------
trunk/
Index: trunk
===================================================================
--- trunk 2015-10-03 13:37:53 UTC (rev 56399)
+++ trunk 2015-10-03 13:38:38 UTC (rev 56400)
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -2,7 +2,7 ##
/branches/11.x:45702-47762
/branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881,55301
/branches/13.x:51407-53060,53145,53192,53882
-/branches/14.x:54079-56387
+/branches/14.x:54079-56399
/branches/3.0:16998-18916
/branches/4.x:22817-23908
/branches/5.x:26025-26523,26527-28378
\ No newline at end of property
Modified: trunk/lib/wiki-plugins/wikiplugin_trackertoggle.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_trackertoggle.php 2015-10-03 13:37:53 UTC (rev 56399)
+++ trunk/lib/wiki-plugins/wikiplugin_trackertoggle.php 2015-10-03 13:38:38 UTC (rev 56400)
@@ -10,13 +10,16 @@
return array(
'name' => tra('Tracker Toggle'),
'documentation' => 'PluginTrackerToggle',
- 'description' => tra('Toggle element display on a field value'),
+ 'description' => tra('Show or hide tracker content'),
+ 'iconname' => 'trackers',
+ 'introduced' => 7,
'prefs' => array('wikiplugin_trackertoggle', 'feature_jquery', 'feature_trackers'),
'params' => array(
'fieldId' => array(
'required' => true,
'name' => tra('Field ID'),
'description' => tra('Numeric value representing the field ID tested.'),
+ 'since' => '7.0',
'filter' => 'digits',
'profile_reference' => 'tracker_field',
),
@@ -24,25 +27,35 @@
'required' => true,
'name' => tra('Value'),
'description' => tra('Value to compare against.'),
+ 'since' => '7.0',
'filter' => 'text',
),
'visible' => array(
'required' => false,
- 'name' => tra('Element visibility'),
- 'description' => 'y|n' . tra('If y, is visible when the field has the value.'),
+ 'name' => tra('Element Visibility'),
+ 'description' => tra('Set whether visible when the field has the value.'),
+ 'since' => '7.0',
'filter' => 'alpha',
- 'default' => 'n'
+ 'default' => 'n',
+ 'options' => array(
+ array('text' => '', 'value' => ''),
+ array('text' => tra('Yes'), 'value' => 'y'),
+ array('text' => tra('No'), 'value' => 'n')
+ )
),
'id' => array(
'required' => true,
'name' => tra('ID'),
'description' => tra('Html ID of the element that is toggled'),
+ 'since' => '7.0',
'filter' => 'text',
),
'itemId' => array(
'required' => false,
'name' => tra('Item ID'),
- 'description' => tra('Use the field of specific item. The URL param itemId is used if this parameter is not set.'),
+ 'description' => tra('Use the field of specific item. The URL param itemId is used if this parameter
+ is not set.'),
+ 'since' => '7.0',
'filter' => 'digits',
'default' => 0,
'profile_reference' => 'tracker_item',
Modified: trunk/lib/wiki-plugins/wikiplugin_trade.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_trade.php 2015-10-03 13:37:53 UTC (rev 56399)
+++ trunk/lib/wiki-plugins/wikiplugin_trade.php 2015-10-03 13:38:38 UTC (rev 56400)
@@ -12,16 +12,18 @@
return array(
'name' => tra('Trade'),
'documentation' => 'PluginTrade',
- 'description' => tra('Send or receive payments from one member to another. (for cclite only so far, experimental)'),
+ 'description' => tra('Send payments between members using cclite'),
'validate' => 'all',
'prefs' => array( 'wikiplugin_trade', 'payment_feature' ),
- 'icon' => 'img/icons/money.png',
+ 'iconname' => 'money',
+ 'introduced' => 6,
'tags' => array( 'experimental' ),
'params' => array(
'price' => array(
'required' => true,
'name' => tra('Price'),
'description' => tr('Currency depends on the selected registry.'),
+ 'since' => '6.0',
'filter' => 'text',
'default' => '',
),
@@ -29,6 +31,7 @@
'required' => false,
'name' => tra('Registry'),
'description' => tr('Registry to trade in. Default: site preference (or first in list when more than one)'),
+ 'since' => '6.0',
'filter' => 'text',
'default' => '',
),
@@ -36,20 +39,25 @@
'required' => false,
'name' => tra('Currency'),
'description' => tr('Currency to trade in. Default: Cclite currency preference for registry set above'),
+ 'since' => '6.0',
'filter' => 'text',
'default' => '',
),
'other_user' => array(
'required' => false,
'name' => tra('Other User'),
- 'description' => tra('Name of the user to recieve or send the payment.') . ' ' . tra('Leave empty to display an input box.'),
+ 'description' => tra('Name of the user to receive or send the payment.') . ' '
+ . tra('Leave empty to display an input box.'),
+ 'since' => '6.0',
'filter' => 'username',
'default' => '',
),
'wanted' => array(
'required' => false,
'name' => tra('Mode'),
- 'description' => tr('Offered or wanted item.') . ' ' . tr('Default') . ':' . tra('Offered'),
+ 'description' => tr('Offered or wanted item.') . ' ' . tr('Default') . ':' . tr('%0Offered%1', '<code>',
+ '</code>'),
+ 'since' => '6.0',
'options' => array(
array('text' => '', 'value' => ''),
array('text' => tra('Offered'), 'value' => 'n'),
@@ -61,15 +69,19 @@
'action' => array(
'required' => false,
'name' => tra('Button Label'),
- 'description' => tr('Default') . ':' . tra('Continue'),
+ 'description' => tr('Default') . ':' . tr('%0Continue%1', '<code>', '</code>'),
+ 'since' => '6.0',
'filter' => 'text',
'default' => tra('Continue'),
),
'inputtitle' => array(
'required' => false,
'name' => tra('Input Title'),
- 'description' => tra('Title of the input form.').' '. tra('Use %0 for the amount, %1 for currency, %2 for your user name, %3 for the other user.').' '.tra('Supports wiki syntax') . '<br />'.
- tr('Default') . ':' . tra('"Payment of %0 %1 from user %2 to %3" for offered items, "Request payment of %0 %1 to user %2 from %3" for wanted'),
+ 'description' => tra('Title of the input form.').' '. tr('Use %0%0%1 for the amount, %0%1%1 for currency,
+ %0%2%1 for your user name, %0%3%1 for the other user.', '<code>', '</code>').' '.tra('Supports
+ wiki syntax') . '<br />'. tr('Default') . ':' . tra('"Payment of %0 %1 from user %2 to %3" for
+ offered items, "Request payment of %0 %1 to user %2 from %3" for wanted'),
+ 'since' => '6.0',
'filter' => 'text',
'default' => '',
),
Modified: trunk/lib/wiki-plugins/wikiplugin_transclude.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_transclude.php 2015-10-03 13:37:53 UTC (rev 56399)
+++ trunk/lib/wiki-plugins/wikiplugin_transclude.php 2015-10-03 13:38:38 UTC (rev 56400)
@@ -14,13 +14,16 @@
'prefs' => array('wikiplugin_transclude', 'feature_wiki'),
'extraparams' => true,
'defaultfilter' => 'text',
- 'icon' => 'img/icons/page_copy.png',
+ 'iconname' => 'copy',
+ 'introduced' => 6,
'params' => array(
'page' => array(
'required' => true,
'name' => tra('Page Name'),
'description' => tra('Name of the wiki page to use as a template for the values.'),
+ 'since' => '6.0',
'default' => '',
+ 'filter' => 'pagename',
'profile_reference' => 'wiki_page',
),
),
Modified: trunk/lib/wiki-plugins/wikiplugin_translated.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_translated.php 2015-10-03 13:37:53 UTC (rev 56399)
+++ trunk/lib/wiki-plugins/wikiplugin_translated.php 2015-10-03 13:38:38 UTC (rev 56400)
@@ -10,21 +10,26 @@
return array(
'name' => tra('Translated'),
'documentation' => 'PluginTranslated',
- 'description' => tra('Create multi-lingual links'),
+ 'description' => tra('Create multilingual links'),
'prefs' => array( 'feature_multilingual', 'wikiplugin_translated' ),
'body' => tra('[url] or ((wikiname)) or ((inter:interwiki)) (use wiki syntax)'),
- 'icon' => 'img/icons/world_link.png',
+ 'iconname' => 'language',
+ 'introduced' => 1,
'params' => array(
'lang' => array(
'required' => true,
'name' => tra('Language'),
- 'description' => tra('Two letter language code of the language, ex: fr'),
+ 'description' => tra('Two letter language code of the language, example:') . ' <code>fr</code>',
+ 'since' => '1',
+ 'filter' => 'alpha',
'default' => '',
),
'flag' => array(
'required' => false,
'name' => tra('Flag'),
- 'description' => tra('Country name, ex: France'),
+ 'description' => tr('Country name, example:') . ' <code>France</code>',
+ 'since' => '1',
+ 'filter' => 'alpha',
'default' => '',
),
),
Modified: trunk/lib/wiki-plugins/wikiplugin_translationof.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_translationof.php 2015-10-03 13:37:53 UTC (rev 56399)
+++ trunk/lib/wiki-plugins/wikiplugin_translationof.php 2015-10-03 13:38:38 UTC (rev 56400)
@@ -20,31 +20,39 @@
function wikiplugin_translationof_info()
{
$description =
- tra('Assist in the translation of a link from one language to another.');
+ tra('Translate a link from one language to another');
return array(
'name' => tra('TranslationOf'),
'documentation' => 'PluginTranslationOf',
'description' => $description,
'prefs' => array( 'feature_multilingual', 'wikiplugin_translationof' ),
- 'icon' => 'img/icons/world_link.png',
+ 'iconname' => 'language',
+ 'introduced' => 12,
'params' => array(
'orig_page' => array(
'required' => true,
'name' => tra('Original Page'),
- 'description' => tra('Name of the page from which this link will be translate.'),
+ 'description' => tra('Name of the page from which this link will be translated.'),
+ 'since' => '12.0',
+ 'filter' => 'pagename',
'default' => '',
),
'translation_lang' => array(
'required' => true,
'name' => tra('Translation Language'),
- 'description' => tra('Two letter language code of the language in which you want to translate this link, ex: fr'),
+ 'description' => tr('Two letter language code of the language in which you want to translate this
+ link. Example:') . ' <code>fr</code>',
+ 'since' => '12.0',
+ 'filter' => 'alpha',
'default' => '',
),
'translation_page' => array(
'required' => false,
'name' => tra('Translation Name'),
'description' => tra('Name of the page that will become the translation of the "Original Page".'),
+ 'since' => '12.0',
+ 'filter' => 'pagename',
'default' => '',
),
),
Modified: trunk/lib/wiki-plugins/wikiplugin_twitter.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_twitter.php 2015-10-03 13:37:53 UTC (rev 56399)
+++ trunk/lib/wiki-plugins/wikiplugin_twitter.php 2015-10-03 13:38:38 UTC (rev 56400)
@@ -10,15 +10,20 @@
return array(
'name' => tra('Twitter'),
'documentation' => 'PluginTwitter',
- 'description' => tra('Twitter Timeline. Display the activity for a twitter account'),
+ 'description' => tra('Display the activity for a twitter account'),
'prefs' => array('wikiplugin_twitter'),
'body' => '',
- 'icon' => 'img/icons/twitter.png',
+ 'iconname' => 'twitter',
+ 'introduced' => 7,
'params' => array(
'tweet' => array(
'required' => true,
'name' => tra('Twitter Path'),
- 'description' => tra('Depends on the type of timeline (Users, Collections, Favorites or Lists). For an User, it is the Account Name (like twitterdev), for Favorites it is like (twitterdev/favorites), for lists it is like twitterdev/lists/listname, etc. '),
+ 'description' => tr('Depends on the type of timeline (Users, Collections, Favorites or Lists). For a
+ User, it is the Account Name (like %0twitterdev%1), for Favorites, something like
+ %0twitterdev/favorites%1. For lists, something like %0twitterdev/lists/listname%1, etc. ',
+ '<code>', '</code>'),
+ 'since' => '7.0',
'filter' => 'text',
'default' => ''
),
@@ -26,15 +31,20 @@
'required' => true,
'name' => tra('Widget Id'),
'description' => tra('Numeric identifier of the widget'),
+ 'since' => '13.1',
'filter' => 'digits',
'default' => ''
),
'theme' => array(
'required' => false,
'name' => tra('Theme'),
- 'description' => tra('Embedded timelines are available in light and dark themes for customization. The light theme is for pages that use a light colored background, while the dark theme is for pages that use a dark colored background. Default is light'),
+ 'description' => tra('Embedded timelines are available in light and dark themes for customization.
+ The light theme is for pages that use a light colored background, while the dark theme is for pages
+ that use a dark colored background. Default is %0light%1.', '<code>', '</code>'),
+ 'since' => '13.1',
'filter' => 'alpha',
'options' => array(
+ array('text' => '', 'value' => ''),
array('text' => tra('light'), 'value' => 'light'),
array('text' => tra('dark'), 'value' => 'dark'),
),
@@ -42,38 +52,44 @@
),
'tweetcolor' => array(
'required' => false,
- 'name' => tra('Link color'),
+ 'name' => tra('Link Color'),
'description' => tra('Text color for individual tweets. Default is theme default.'),
+ 'since' => '7.0',
'accepted' => tra('Valid HTML color codes (with beginning #) or names.'),
'filter' => 'text'
),
'tweetbg' => array(
'required' => false,
- 'name' => tra('Border color'),
+ 'name' => tra('Border Color'),
'description' => tra('Change the border color used by the widget. Default is theme default.'),
+ 'since' => '7.0',
'accepted' => tra('Valid HTML color codes (with beginning #) or names.'),
'filter' => 'text'
),
'height' => array(
'required' => false,
'name' => tra('Height'),
- 'description' => tra('Height of widget in pixels. Default is 300.'),
+ 'description' => tr('Height of widget in pixels. Default is %0.', '<code>300</code>'),
+ 'since' => '7.0',
'filter' => 'digits',
'default' => 300
),
'width' => array(
'required' => false,
'name' => tra('Width'),
- 'description' => tra('Width of widget in pixels or \'auto\' to fit to width of page. Default is auto.'),
+ 'description' => tr('Width of widget in pixels or \'auto\' to fit to width of page. Default is %0.',
+ '<code>auto</code>'),
'accepted' => tra('Number of pixels or the word \'auto\'.'),
+ 'since' => '7.0',
'filter' => 'text',
'default' => 'auto'
),
'noheader' => array(
'required' => false,
'advanced' => true,
- 'name' => tra('Layout Option: No Header'),
+ 'name' => tra('No Header'),
'description' => tra('Default is with Header'),
+ 'since' => '13.1',
'filter' => 'text',
'options' => array(
array('text' => tra('Header'), 'value' => ''),
@@ -83,8 +99,9 @@
'nofooter' => array(
'required' => false,
'advanced' => true,
- 'name' => tra('Layout Option: No Footer'),
+ 'name' => tra('No Footer'),
'description' => tra('Default is with Footer'),
+ 'since' => '13.1',
'filter' => 'text',
'options' => array(
array('text' => tra('Footer'), 'value' => ''),
@@ -96,6 +113,7 @@
'advanced' => true,
'name' => tra('Layout Option: No Borders'),
'description' => tra('Default is with Borders'),
+ 'since' => '13.1',
'filter' => 'text',
'options' => array(
array('text' => tra('Borders'), 'value' => ''),
@@ -105,8 +123,9 @@
'noscrollbar' => array(
'required' => false,
'advanced' => true,
- 'name' => tra('Layout Option: No Scrollbar'),
+ 'name' => tra('No Scrollbar'),
'description' => tra('Default is with Scrollbar'),
+ 'since' => '13.1',
'filter' => 'text',
'options' => array(
array('text' => tra('Scrollbar'), 'value' => ''),
@@ -116,8 +135,9 @@
'shellbg' => array(
'required' => false,
'advanced' => true,
- 'name' => tra('Layout Option: Transparent Background'),
+ 'name' => tra('Transparent Background'),
'description' => tra('Transparent Shell Background. Default is theme default'),
+ 'since' => '7.0',
'filter' => 'text',
'options' => array(
array('text' => tra('Theme default'), 'value' => ''),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|