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

[<ch...@us...>]

Revision: 24415
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=24415&view=rev
Author:   chealer
Date:     2010-01-15 19:08:11 +0000 (Fri, 15 Jan 2010)

Log Message:
-----------
[FIX] Minor edits described as not sending notifications, which is not always true. Ref: issue ID 2890

Modified Paths:
--------------
    trunk/templates/tiki-admin-include-wiki.tpl
    trunk/templates/wiki_edit_actions.tpl

Modified: trunk/templates/tiki-admin-include-wiki.tpl
===================================================================
--- trunk/templates/tiki-admin-include-wiki.tpl	2010-01-15 19:04:29 UTC (rev 24414)
+++ trunk/templates/tiki-admin-include-wiki.tpl	2010-01-15 19:08:11 UTC (rev 24415)
@@ -62,7 +62,7 @@
 				{preference name=wiki_edit_icons_toggle}
 				{preference name=wiki_edit_minor}
 				<div class="adminoptionboxchild" id="wiki_edit_minor_childcontainer">
-					{remarksbox type=note title=Note}{tr}Minor edits do not flag new content for translation and do not send watch notifications.{/tr}.
+					{remarksbox type=note title=Note}{tr}Minor edits do not flag new content for translation and do not send watch notifications (unless "Watch minor edits" is enabled).{/tr}
 						<br />
 						{tr}Only user groups granted the tiki_p_minor permission (and admins) will be able to save minor edits when this is enabled.{/tr}
 						<a class="link" href="tiki-assignpermission.php?type=wiki&amp;group=Registered" title="{tr}Permission{/tr}">{icon _id="key" alt="{tr}Permission{/tr}"}</a>

Modified: trunk/templates/wiki_edit_actions.tpl
===================================================================
--- trunk/templates/wiki_edit_actions.tpl	2010-01-15 19:04:29 UTC (rev 24414)
+++ trunk/templates/wiki_edit_actions.tpl	2010-01-15 19:08:11 UTC (rev 24415)
@@ -7,7 +7,7 @@
 			<input type="submit" class="wikiaction tips" title="{tr}Edit wiki page{/tr}|{tr}Save the page as a completed translation.{/tr}" name="save" value="{tr}Complete Translation{/tr}" onclick="needToConfirm=false"/>
 		{else}
 			{if $tiki_p_minor eq 'y' and $page|lower ne 'sandbox' and $prefs.wiki_edit_minor neq 'n'}
-			<input type="submit" class="wikiaction tips" name="minor" title="{tr}Edit wiki page{/tr}|{tr}Save the page, but do not send notifications and do not count it as new content to be translated.{/tr}" value="{tr}Save Minor Edit{/tr}" onclick="needToConfirm=false;" />
+			<input type="submit" class="wikiaction tips" name="minor" title="{tr}Edit wiki page{/tr}|{if $prefs.wiki_watch_minor}{tr}Save the page, but do not count it as new content to be translated.{/tr}{else}{tr}Save the page, but do not send notifications and do not count it as new content to be translated.{/tr}{/if}" value="{tr}Save Minor Edit{/tr}" onclick="needToConfirm=false;" />
 			{/if}
 			<input type="submit" class="wikiaction tips" title="{tr}Edit wiki page{/tr}|{tr}Save the page.{/tr}" name="save" value="{tr}Save{/tr}" onclick="needToConfirm=false;" />
 


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