Index: TWiki.pm =================================================================== RCS file: /cvsroot/twiki/twiki/lib/TWiki.pm,v retrieving revision 1.208 diff -U3 -r1.208 TWiki.pm --- TWiki.pm 11 Feb 2003 05:04:29 -0000 1.208 +++ TWiki.pm 16 Feb 2003 17:49:56 -0000 @@ -2343,10 +2343,16 @@ $theLinkText =~ s/([\s\(])($singleUpperAlphaRegex)/$1$2/go; my $exist = &TWiki::Store::topicExists( $theWeb, $theTopic ); - # I18N - Only apply plural processing if site language is English, - # and to topic names ending in 's'. - if( ( $doPluralToSingular ) && ( $siteLang eq 'en' ) - && ( $theTopic =~ /s$/ ) && ! ( $exist ) ) { + # I18N - Only apply plural processing if site language is English, or + # if a built-in English-language web (Main, TWiki or Plugins). Plurals + # apply to names ending in 's', where topic doesn't exist with plural + # name. + if( ( $doPluralToSingular ) and ( $siteLang eq 'en' + or $theWeb eq $mainWebname + or $theWeb eq $twikiWebname + or $theWeb eq 'Plugins' + ) + and ( $theTopic =~ /s$/ ) and not ( $exist ) ) { # Topic name is plural in form and doesn't exist as written my $tmp = $theTopic; $tmp =~ s/ies$/y/; # plurals like policy / policies