Skip to content

Commit

Permalink
Item12180: {RCS}{asciiFileSuffixes} feedback => autocheck (no button)…
Browse files Browse the repository at this point in the history
…. Remove item checker (use generic default). use nbsp to prevent CleanupTemplateResidues from removing spaces around "and"

git-svn-id: http://svn.foswiki.org/trunk@15956 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
TimotheLitt authored and TimotheLitt committed Nov 8, 2012
1 parent 254046f commit dd02a10
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 43 deletions.
2 changes: 1 addition & 1 deletion core/lib/Foswiki.spec
Original file line number Diff line number Diff line change
Expand Up @@ -1455,7 +1455,7 @@ $Foswiki::cfg{RCS}{AutoAttachPubFiles} = $FALSE;
# blank on other platforms.
$Foswiki::cfg{RCS}{ExtOption} = "";
# **REGEX EXPERT FEEDBACK="Re-Test" DISPLAY_IF /Foswiki::Store::Rcs/.test({Store}{Implementation})**
# **REGEX EXPERT FEEDBACK=auto DISPLAY_IF /Foswiki::Store::Rcs/.test({Store}{Implementation})**
# Perl regular expression matching suffixes valid on plain text files
# Defines which attachments will be treated as ASCII in RCS. This is a
# filter <b>in</b>, so any filenames that match this expression will
Expand Down
36 changes: 0 additions & 36 deletions core/lib/Foswiki/Configure/Checkers/RCS/asciiFileSuffixes.pm

This file was deleted.

6 changes: 3 additions & 3 deletions core/lib/Foswiki/Configure/templates/authorize.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,11 @@
<#if someProblems gt 0>
<div><h3></#if>
<#if someProblems == 1>
There is an unresolved problem.</h3> There is </#if>
There is an unresolved problem.</h3></#if>
<#if someProblems gt 1>
There are unresolved problems.</h3> There are </#if>
There are unresolved problems.</h3></#if>
<#if totalErrors gt 0>
${totalErrors} error</#if><#if totalErrors gt 1>s</#if><#if totalErrors gt 0 && totalWarnings gt 0> and </#if><#if totalWarnings gt 0>${totalWarnings} warning</#if><#if totalWarnings gt 1>s</#if><#if someProblems gt 0>.
${totalErrors} error</#if><#if totalErrors gt 1>s</#if><#if totalErrors gt 0 && totalWarnings gt 0>&nbsp;and&nbsp;</#if><#if totalWarnings gt 0>${totalWarnings} warning</#if><#if totalWarnings gt 1>s</#if><#if someProblems gt 0>
<p>We recommend that you resolve </#if>
<#if someProblems == 1>this </#if>
<#if someProblems gt 1>these </#if>
Expand Down
6 changes: 3 additions & 3 deletions core/lib/Foswiki/Configure/templates/confirm.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
<#if someProblems gt 0>
<div><h3></#if>
<#if someProblems == 1>
There is an unresolved problem.</h3> There is </#if>
There is an unresolved problem.</h3></#if>
<#if someProblems gt 1>
There are unresolved problems.</h3> There are </#if>
There are unresolved problems.</h3></#if>
<#if totalErrors gt 0>
${totalErrors} error</#if><#if totalErrors gt 1>s</#if><#if totalErrors gt 0 && totalWarnings gt 0> and </#if><#if totalWarnings gt 0>${totalWarnings} warning</#if><#if totalWarnings gt 1>s</#if><#if someProblems gt 0>.
${totalErrors} error</#if><#if totalErrors gt 1>s</#if><#if totalErrors gt 0 && totalWarnings gt 0>&nbsp;and&nbsp;</#if><#if totalWarnings gt 0>${totalWarnings} warning</#if><#if totalWarnings gt 1>s</#if><#if someProblems gt 0>
<p>We recommend that you resolve </#if>
<#if someProblems == 1>this </#if>
<#if someProblems gt 1>these </#if>
Expand Down

0 comments on commit dd02a10

Please sign in to comment.