svn commit: r748636 - in /incubator/jspwiki/trunk: ./ src/WebContent/WEB-INF/classes/plugin/ src/java/org/apache/wiki/ src/java/org/apache/wiki/plugin/

[metskem]

Author: metskem
Date: Fri Feb 27 18:51:47 2009
New Revision: 748636

URL: http://svn.apache.org/viewvc?rev=748636&view=rev
Log:
 3.0.0-svn-75 JSPWIKI-414 - denounce plugin localized, the denouncetext is now 
in PluginResources.properties

Modified:
    incubator/jspwiki/trunk/ChangeLog
    
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/plugin/PluginResources.properties
    
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/plugin/PluginResources_nl.properties
    incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/Denounce.java

Modified: incubator/jspwiki/trunk/ChangeLog
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=748636&r1=748635&r2=748636&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Fri Feb 27 18:51:47 2009
@@ -1,3 +1,9 @@
+2009-02-27  Harry Metske <mets...@apache.org>
+
+        * 3.0.0-svn-75
+        
+        * JSPWIKI-414 - denounce plugin localized, the denouncetext is now in 
PluginResources.properties
+        
 2009-02-26  Harry Metske <mets...@apache.org>
 
         * 3.0.0-svn-74

Modified: 
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/plugin/PluginResources.properties
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/plugin/PluginResources.properties?rev=748636&r1=748635&r2=748636&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/plugin/PluginResources.properties
 (original)
+++ 
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/plugin/PluginResources.properties
 Fri Feb 27 18:51:47 2009
@@ -72,6 +72,7 @@
 
 # DenouncePlugin
 plugin.denounce.no.parameter=Denounce: No parameter defined:
+plugin.denounce.denouncetext = &lt;Link removed because I do not wish to 
endorse this link to search engines&gt;
 
 # IfPlugin
 plugin.if.faulty.pattern=Faulty pattern:

Modified: 
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/plugin/PluginResources_nl.properties
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/plugin/PluginResources_nl.properties?rev=748636&r1=748635&r2=748636&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/plugin/PluginResources_nl.properties
 (original)
+++ 
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/plugin/PluginResources_nl.properties
 Fri Feb 27 18:51:47 2009
@@ -81,6 +81,7 @@
 
 # DenouncePlugin
 plugin.denounce.no.parameter=Denounce: Geen parameter gedefinieerd:
+plugin.denounce.denouncetext = &lt;Link verwijderd, omdat hij niet meer door 
zoekmachines mag worden geindexeerd&gt;
 
 # IfPlugin
 plugin.if.faulty.pattern=Vaut patroon:

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=748636&r1=748635&r2=748636&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Fri Feb 27 
18:51:47 2009
@@ -77,7 +77,7 @@
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "74";
+    public static final String     BUILD         = "75";
     
     /**
      *  This is the generic version string you should use

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/Denounce.java
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/Denounce.java?rev=748636&r1=748635&r2=748636&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/Denounce.java 
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/Denounce.java Fri 
Feb 27 18:51:47 2009
@@ -1,8 +1,6 @@
-/* 
+/*
     JSPWiki - a JSP-based WikiWiki clone.
 
-    Copyright (C) 2003 Janne Jalkanen (janne.jalka...@iki.fi)
-
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information
@@ -18,7 +16,7 @@
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
-    under the License.  
+    under the License.    
  */
 package org.apache.wiki.plugin;
 
@@ -90,8 +88,6 @@
             Properties props = new Properties();
             props.load( in );
 
-            c_denounceText = props.getProperty( PROP_DENOUNCETEXT, 
c_denounceText );
-
             for( Enumeration e = props.propertyNames(); e.hasMoreElements(); )
             {
                 String name = (String) e.nextElement();
@@ -135,6 +131,8 @@
     public String execute( WikiContext context, Map<String,String> params )
         throws PluginException
     {
+        c_denounceText = context.getBundle( 
WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE ).getString( 
"plugin.denounce.denouncetext" );
+
         String link = (String) params.get( PARAM_LINK );
         String text = (String) params.get( PARAM_TEXT );
         boolean linkAllowed = true;