Author: juanpablo
Date: Fri Feb 8 20:37:49 2013
New Revision: 1444224
URL: http://svn.apache.org/r1444224
Log:
deprecated / moved [2/2]:
-> WikiContext#getBundle( String ) in favour of Preferences#getBundle(
WikiContext, String )
-> WikiContext#getLocale( WikiContext ) in favour of Preferences#getLocale(
WikiContext )
Modified:
incubator/jspwiki/trunk/src/org/apache/wiki/VariableManager.java
incubator/jspwiki/trunk/src/org/apache/wiki/attachment/AttachmentServlet.java
incubator/jspwiki/trunk/src/org/apache/wiki/auth/UserManager.java
incubator/jspwiki/trunk/src/org/apache/wiki/diff/TraditionalDiffProvider.java
incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormClose.java
incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormInput.java
incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormOpen.java
incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormOutput.java
incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormSelect.java
incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormTextarea.java
incubator/jspwiki/trunk/src/org/apache/wiki/i18n/InternationalizationManager.java
incubator/jspwiki/trunk/src/org/apache/wiki/parser/JSPWikiMarkupParser.java
incubator/jspwiki/trunk/src/org/apache/wiki/parser/PluginContent.java
incubator/jspwiki/trunk/src/org/apache/wiki/plugin/BugReportHandler.java
incubator/jspwiki/trunk/src/org/apache/wiki/plugin/CurrentTimePlugin.java
incubator/jspwiki/trunk/src/org/apache/wiki/plugin/DefaultPluginManager.java
incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ListLocksPlugin.java
incubator/jspwiki/trunk/src/org/apache/wiki/plugin/PluginManager.java
incubator/jspwiki/trunk/src/org/apache/wiki/plugin/RecentChangesPlugin.java
incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ReferringPagesPlugin.java
incubator/jspwiki/trunk/src/org/apache/wiki/plugin/TableOfContents.java
incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogEntryPlugin.java
incubator/jspwiki/trunk/src/org/apache/wiki/tags/AuthorTag.java
incubator/jspwiki/trunk/src/org/apache/wiki/tags/RSSImageLinkTag.java
incubator/jspwiki/trunk/src/org/apache/wiki/tags/UserNameTag.java
incubator/jspwiki/trunk/src/org/apache/wiki/tags/UserProfileTag.java
incubator/jspwiki/trunk/src/org/apache/wiki/ui/InputValidator.java
incubator/jspwiki/trunk/src/org/apache/wiki/ui/TemplateManager.java
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/VariableManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/VariableManager.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/VariableManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/VariableManager.java Fri Feb 8
20:37:49 2013
@@ -31,6 +31,7 @@ import org.apache.wiki.api.engine.Filter
import org.apache.wiki.api.filters.PageFilter;
import org.apache.wiki.i18n.InternationalizationManager;
import org.apache.wiki.modules.InternalModule;
+import org.apache.wiki.preferences.Preferences;
/**
* Manages variables. Variables are case-insensitive. A list of all
@@ -478,14 +479,14 @@ public class VariableManager
public String getLoginstatus()
{
WikiSession session = m_context.getWikiSession();
- return
m_context.getBundle(InternationalizationManager.CORE_BUNDLE).getString(
"varmgr." + session.getStatus());
+ return Preferences.getBundle( m_context,
InternationalizationManager.CORE_BUNDLE ).getString( "varmgr." +
session.getStatus());
}
public String getUsername()
{
Principal wup = m_context.getCurrentUser();
- ResourceBundle rb = m_context.getBundle(
InternationalizationManager.CORE_BUNDLE );
+ ResourceBundle rb = Preferences.getBundle( m_context,
InternationalizationManager.CORE_BUNDLE );
return wup != null ? wup.getName() : rb.getString(
"varmgr.not.logged.in" );
}
Modified:
incubator/jspwiki/trunk/src/org/apache/wiki/attachment/AttachmentServlet.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/attachment/AttachmentServlet.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/org/apache/wiki/attachment/AttachmentServlet.java
(original)
+++
incubator/jspwiki/trunk/src/org/apache/wiki/attachment/AttachmentServlet.java
Fri Feb 8 20:37:49 2013
@@ -48,6 +48,7 @@ import org.apache.wiki.api.exceptions.Wi
import org.apache.wiki.auth.AuthorizationManager;
import org.apache.wiki.auth.permissions.PermissionFactory;
import org.apache.wiki.i18n.InternationalizationManager;
+import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.providers.ProviderException;
import org.apache.wiki.ui.progress.ProgressItem;
import org.apache.wiki.util.HttpUtil;
@@ -650,7 +651,8 @@ public class AttachmentServlet extends H
{
// this is a kludge, the exception that is caught here contains
the i18n key
// here we have the context available, so we can internationalize
it properly :
- throw new RedirectException(context.getBundle(
InternationalizationManager.CORE_BUNDLE ).getString( e.getMessage() ),
errorPage );
+ throw new RedirectException (Preferences.getBundle( context,
InternationalizationManager.CORE_BUNDLE )
+ .getString( e.getMessage()
), errorPage );
}
//
@@ -735,7 +737,8 @@ public class AttachmentServlet extends H
{
// this is a kludge, the exception that is caught here
contains the i18n key
// here we have the context available, so we can
internationalize it properly :
- throw new ProviderException( context.getBundle(
InternationalizationManager.CORE_BUNDLE ).getString( pe.getMessage() ) );
+ throw new ProviderException( Preferences.getBundle( context,
InternationalizationManager.CORE_BUNDLE )
+ .getString(
pe.getMessage() ) );
}
log.info( "User " + user + " uploaded attachment to " + parentPage
+
@@ -743,8 +746,7 @@ public class AttachmentServlet extends H
}
else
{
- throw new RedirectException("No permission to upload a file",
- errorPage);
+ throw new RedirectException( "No permission to upload a file",
errorPage );
}
return created;
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/auth/UserManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/auth/UserManager.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/auth/UserManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/auth/UserManager.java Fri Feb
8 20:37:49 2013
@@ -46,6 +46,7 @@ import org.apache.wiki.event.WikiEventMa
import org.apache.wiki.event.WikiSecurityEvent;
import org.apache.wiki.filters.SpamFilter;
import org.apache.wiki.i18n.InternationalizationManager;
+import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.rpc.RPCCallable;
import org.apache.wiki.rpc.json.JSONRPCManager;
import org.apache.wiki.ui.InputValidator;
@@ -478,7 +479,7 @@ public final class UserManager
boolean isNew = profile.isNew();
WikiSession session = context.getWikiSession();
InputValidator validator = new InputValidator( SESSION_MESSAGES,
context );
- ResourceBundle rb = context.getBundle(
InternationalizationManager.CORE_BUNDLE );
+ ResourceBundle rb = Preferences.getBundle( context,
InternationalizationManager.CORE_BUNDLE );
//
// Query the SpamFilter first
Modified:
incubator/jspwiki/trunk/src/org/apache/wiki/diff/TraditionalDiffProvider.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/diff/TraditionalDiffProvider.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/org/apache/wiki/diff/TraditionalDiffProvider.java
(original)
+++
incubator/jspwiki/trunk/src/org/apache/wiki/diff/TraditionalDiffProvider.java
Fri Feb 8 20:37:49 2013
@@ -32,6 +32,7 @@ import org.apache.wiki.NoRequiredPropert
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
import org.apache.wiki.i18n.InternationalizationManager;
+import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.util.TextUtil;
import org.suigeneris.jrcs.diff.Diff;
import org.suigeneris.jrcs.diff.DifferentiationFailedException;
@@ -140,7 +141,7 @@ public class TraditionalDiffProvider imp
{
m_result = sb;
m_context = ctx;
- m_rb = ctx.getBundle( InternationalizationManager.CORE_BUNDLE );
+ m_rb = Preferences.getBundle( ctx,
InternationalizationManager.CORE_BUNDLE );
}
public void visit(Revision rev)
@@ -182,7 +183,7 @@ public class TraditionalDiffProvider imp
double[] choiceLimits = { 1, 2 };
MessageFormat fmt = new MessageFormat("");
- fmt.setLocale( WikiContext.getLocale(m_context) );
+ fmt.setLocale( Preferences.getLocale(m_context) );
ChoiceFormat cfmt = new ChoiceFormat( choiceLimits, choiceString );
fmt.applyPattern( type );
Format[] formats = { NumberFormat.getInstance(), cfmt,
NumberFormat.getInstance() };
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormClose.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormClose.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormClose.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormClose.java Fri Feb 8
20:37:49 2013
@@ -24,6 +24,7 @@ import java.util.ResourceBundle;
import org.apache.wiki.WikiContext;
import org.apache.wiki.api.exceptions.PluginException;
import org.apache.wiki.api.plugin.WikiPlugin;
+import org.apache.wiki.preferences.Preferences;
/**
* Closes a WikiForm.
@@ -51,7 +52,7 @@ public class FormClose
{
if( info.hide() )
{
- ResourceBundle rb =
ctx.getBundle(WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE);
+ ResourceBundle rb = Preferences.getBundle( ctx,
WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
return "<p>" + rb.getString( "formclose.noneedtoshow" ) +
"</p>";
}
}
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormInput.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormInput.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormInput.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormInput.java Fri Feb 8
20:37:49 2013
@@ -26,6 +26,7 @@ import org.apache.ecs.xhtml.input;
import org.apache.wiki.WikiContext;
import org.apache.wiki.api.exceptions.PluginException;
import org.apache.wiki.api.plugin.WikiPlugin;
+import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.util.TextUtil;
/**
@@ -52,7 +53,7 @@ public class FormInput
String inputValue = params.get( PARAM_VALUE );
String inputType = params.get( PARAM_TYPE );
String size = params.get( PARAM_SIZE );
- ResourceBundle rb =
ctx.getBundle(WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE);
+ ResourceBundle rb = Preferences.getBundle( ctx,
WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
if( inputName == null )
throw new PluginException( rb.getString( "forminput.namemissing" )
);
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormOpen.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormOpen.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormOpen.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormOpen.java Fri Feb 8
20:37:49 2013
@@ -25,6 +25,7 @@ import java.util.ResourceBundle;
import org.apache.wiki.WikiContext;
import org.apache.wiki.api.exceptions.PluginException;
import org.apache.wiki.api.plugin.WikiPlugin;
+import org.apache.wiki.preferences.Preferences;
/**
* Opens a WikiForm.
@@ -77,12 +78,11 @@ public class FormOpen
public String execute( WikiContext ctx, Map< String, String > params )
throws PluginException
{
- ResourceBundle rb =
ctx.getBundle(WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE);
+ ResourceBundle rb = Preferences.getBundle( ctx,
WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
String formName = params.get( PARAM_FORM );
if( formName == null )
{
- Object[] args = { PARAM_FORM };
- throw new PluginException( MessageFormat.format( rb.getString(
"formopen.missingparam" ), args ) );
+ throw new PluginException( MessageFormat.format( rb.getString(
"formopen.missingparam" ), PARAM_FORM ) );
}
String hide = params.get( PARAM_HIDEFORM );
String sourcePage = ctx.getPage().getName();
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormOutput.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormOutput.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormOutput.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormOutput.java Fri Feb
8 20:37:49 2013
@@ -27,6 +27,7 @@ import org.apache.wiki.api.engine.Plugin
import org.apache.wiki.api.exceptions.PluginException;
import org.apache.wiki.api.plugin.WikiPlugin;
import org.apache.wiki.plugin.DefaultPluginManager;
+import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.util.FormUtil;
/**
@@ -64,7 +65,7 @@ public class FormOutput
{
return "";
}
- ResourceBundle rb =
ctx.getBundle(WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE);
+ ResourceBundle rb = Preferences.getBundle( ctx,
WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
// If we are NOT here due to this form being submitted, we do nothing.
// The submitted form MUST have parameter 'formname' equal to the name
@@ -89,9 +90,8 @@ public class FormOutput
String handler = params.get( PARAM_HANDLER );
if( handler == null || handler.length() == 0 )
{
- Object[] args = { PARAM_HANDLER };
// Need to print out an error here as this form is misconfigured
- return "<p class=\"error\">" + MessageFormat.format( rb.getString(
"formoutput.missingargument" ), args ) + "</p>";
+ return "<p class=\"error\">" + MessageFormat.format( rb.getString(
"formoutput.missingargument" ), PARAM_HANDLER ) + "</p>";
}
String sourcePage = ctx.getPage().getName();
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormSelect.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormSelect.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormSelect.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormSelect.java Fri Feb
8 20:37:49 2013
@@ -28,6 +28,7 @@ import org.apache.ecs.xhtml.select;
import org.apache.wiki.WikiContext;
import org.apache.wiki.api.exceptions.PluginException;
import org.apache.wiki.api.plugin.WikiPlugin;
+import org.apache.wiki.preferences.Preferences;
/**
* Creates a Form select field.
@@ -45,7 +46,7 @@ public class FormSelect
// Don't render if no error and error-only-rendering is on.
FormInfo info = getFormInfo( ctx );
- ResourceBundle rb =
ctx.getBundle(WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE);
+ ResourceBundle rb = Preferences.getBundle( ctx,
WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
Map< String, String > previousValues = null;
if( info != null )
@@ -68,7 +69,9 @@ public class FormSelect
// We should look for extra params, e.g. width, ..., here.
if( field != null )
- return field.toString(ctx.getEngine().getContentEncoding());
+ {
+ return field.toString( ctx.getEngine().getContentEncoding() );
+ }
return "";
}
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormTextarea.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormTextarea.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormTextarea.java
(original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormTextarea.java Fri Feb
8 20:37:49 2013
@@ -27,6 +27,7 @@ import org.apache.ecs.xhtml.textarea;
import org.apache.wiki.WikiContext;
import org.apache.wiki.api.exceptions.PluginException;
import org.apache.wiki.api.plugin.WikiPlugin;
+import org.apache.wiki.preferences.Preferences;
/**
* Creates a Form text area element. You may specify the size of the
textarea
@@ -51,7 +52,7 @@ public class FormTextarea extends FormEl
// Don't render if no error and error-only-rendering is on.
FormInfo info = getFormInfo( ctx );
Map< String, String > previousValues = null;
- ResourceBundle rb =
ctx.getBundle(WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE);
+ ResourceBundle rb = Preferences.getBundle( ctx,
WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
if( info != null )
{
Modified:
incubator/jspwiki/trunk/src/org/apache/wiki/i18n/InternationalizationManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/i18n/InternationalizationManager.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/org/apache/wiki/i18n/InternationalizationManager.java
(original)
+++
incubator/jspwiki/trunk/src/org/apache/wiki/i18n/InternationalizationManager.java
Fri Feb 8 20:37:49 2013
@@ -40,7 +40,7 @@ public class InternationalizationManager
/** The name of the ResourceBundle which contains any and all JSPWiki
default templates
* resource strings. It's value is {@value}.
*/
- public static final String DEF_TEMPLATE = "templates/default";
+ public static final String DEF_TEMPLATE = "templates.default";
// public static final String JSPWIKI_BUNDLE = "jspwiki";
// public static final String PLUGINS_BUNDLE = "plugins";
@@ -105,7 +105,7 @@ public class InternationalizationManager
* @param bundle Which bundle the string is in
* @param locale Locale to use - null for default
* @param key Which key to use.
- * @param args parameters to insert n the String.
+ * @param args parameters to insert in the String.
* @return A localized string (or from the default language, if not found)
* @throws MissingResourceException If the key cannot be located at all,
even from the default locale.
*/
Modified:
incubator/jspwiki/trunk/src/org/apache/wiki/parser/JSPWikiMarkupParser.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/parser/JSPWikiMarkupParser.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/parser/JSPWikiMarkupParser.java
(original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/parser/JSPWikiMarkupParser.java
Fri Feb 8 20:37:49 2013
@@ -40,6 +40,7 @@ import org.apache.wiki.attachment.Attach
import org.apache.wiki.auth.WikiSecurityException;
import org.apache.wiki.auth.acl.Acl;
import org.apache.wiki.i18n.InternationalizationManager;
+import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.providers.ProviderException;
import org.apache.wiki.render.CleanTextRenderer;
import org.apache.wiki.render.RenderingManager;
@@ -505,8 +506,7 @@ public class JSPWikiMarkupParser
{
type = EMPTY;
}
- ResourceBundle rb =
m_context.getBundle(InternationalizationManager.CORE_BUNDLE);
- Object[] args = { link };
+ ResourceBundle rb = Preferences.getBundle( m_context,
InternationalizationManager.CORE_BUNDLE );
switch(type)
{
@@ -516,7 +516,7 @@ public class JSPWikiMarkupParser
case EDIT:
el = createAnchor( EDIT,
m_context.getURL(WikiContext.EDIT,link), text, "" );
- el.setAttribute("title", MessageFormat.format( rb.getString(
"markupparser.link.create" ), args ) );
+ el.setAttribute("title", MessageFormat.format( rb.getString(
"markupparser.link.create" ), link ) );
break;
case EMPTY:
@@ -1421,9 +1421,8 @@ public class JSPWikiMarkupParser
}
catch( Exception e )
{
- ResourceBundle rb =
m_context.getBundle(InternationalizationManager.CORE_BUNDLE);
- Object[] args = { link };
- return makeError( MessageFormat.format( rb.getString(
"markupparser.error.invalidset" ), args ) );
+ ResourceBundle rb = Preferences.getBundle( m_context,
InternationalizationManager.CORE_BUNDLE );
+ return makeError( MessageFormat.format( rb.getString(
"markupparser.error.invalidset" ), link ) );
}
return m_currentElement;
@@ -1444,7 +1443,7 @@ public class JSPWikiMarkupParser
*/
private Element handleHyperlinks( String linktext, int pos )
{
- ResourceBundle rb =
m_context.getBundle(InternationalizationManager.CORE_BUNDLE);
+ ResourceBundle rb = Preferences.getBundle( m_context,
InternationalizationManager.CORE_BUNDLE );
StringBuilder sb = new StringBuilder(linktext.length()+80);
@@ -1481,7 +1480,7 @@ public class JSPWikiMarkupParser
//log.info( "Root cause:",e.getRootThrowable() );
if( !m_wysiwygEditorMode )
{
- ResourceBundle rbPlugin =
m_context.getBundle(WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE);
+ ResourceBundle rbPlugin = Preferences.getBundle(
m_context, WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
return addElement( makeError( MessageFormat.format(
rbPlugin.getString( "plugin.error.insertionfailed" ), e.getMessage() ) ) );
}
}
@@ -2391,7 +2390,7 @@ public class JSPWikiMarkupParser
if( style != null && style.indexOf("javascript:") != -1 )
{
log.debug("Attempt to output javascript within
CSS:"+style);
- ResourceBundle rb =
m_context.getBundle(InternationalizationManager.CORE_BUNDLE);
+ ResourceBundle rb = Preferences.getBundle( m_context,
InternationalizationManager.CORE_BUNDLE );
return addElement( makeError( rb.getString(
"markupparser.error.javascriptattempt" ) ) );
}
}
@@ -2400,9 +2399,8 @@ public class JSPWikiMarkupParser
//
// If there are unknown entities, we don't want the parser to
stop.
//
- ResourceBundle rb =
m_context.getBundle(InternationalizationManager.CORE_BUNDLE);
- Object[] args = { e.getMessage() };
- String msg = MessageFormat.format( rb.getString(
"markupparser.error.parserfailure"), args );
+ ResourceBundle rb = Preferences.getBundle( m_context,
InternationalizationManager.CORE_BUNDLE );
+ String msg = MessageFormat.format( rb.getString(
"markupparser.error.parserfailure"), e.getMessage() );
return addElement( makeError( msg ) );
}
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/parser/PluginContent.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/parser/PluginContent.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/parser/PluginContent.java
(original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/parser/PluginContent.java Fri
Feb 8 20:37:49 2013
@@ -29,6 +29,7 @@ import org.apache.wiki.api.engine.Plugin
import org.apache.wiki.api.exceptions.PluginException;
import org.apache.wiki.api.plugin.ParserStagePlugin;
import org.apache.wiki.api.plugin.WikiPlugin;
+import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.render.RenderingManager;
import org.jdom.Text;
@@ -198,7 +199,7 @@ public class PluginContent extends Text
else
{
// log.info("Failed to execute plugin",e);
- ResourceBundle rb =
context.getBundle(WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE);
+ ResourceBundle rb = Preferences.getBundle( context,
WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE);
result = JSPWikiMarkupParser.makeError(
MessageFormat.format( rb.getString(
"plugin.error.insertionfailed" ), e.getMessage() ) ).getText();
}
@@ -219,7 +220,7 @@ public class PluginContent extends Text
{
PluginManager pm = context.getEngine().getPluginManager();
if( pm.pluginsEnabled() ) {
- ResourceBundle rb =
context.getBundle(WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE);
+ ResourceBundle rb = Preferences.getBundle( context,
WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
Map<String, String> params = getParameters();
WikiPlugin plugin = pm.newWikiPlugin( getPluginName(), rb );
try
Modified:
incubator/jspwiki/trunk/src/org/apache/wiki/plugin/BugReportHandler.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/BugReportHandler.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/BugReportHandler.java
(original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/BugReportHandler.java
Fri Feb 8 20:37:49 2013
@@ -34,6 +34,7 @@ import org.apache.wiki.api.exceptions.Re
import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.api.plugin.WikiPlugin;
import org.apache.wiki.parser.MarkupParser;
+import org.apache.wiki.preferences.Preferences;
/**
* Provides a handler for bug reports. Still under construction.
@@ -77,7 +78,7 @@ public class BugReportHandler
String version;
String submitter = null;
SimpleDateFormat format = new SimpleDateFormat( DEFAULT_DATEFORMAT );
- ResourceBundle rb =
context.getBundle(WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE);
+ ResourceBundle rb = Preferences.getBundle( context,
WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
title = params.get( PARAM_TITLE );
description = params.get( PARAM_DESCRIPTION );
Modified:
incubator/jspwiki/trunk/src/org/apache/wiki/plugin/CurrentTimePlugin.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/CurrentTimePlugin.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/CurrentTimePlugin.java
(original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/CurrentTimePlugin.java
Fri Feb 8 20:37:49 2013
@@ -55,9 +55,13 @@ public class CurrentTimePlugin implement
SimpleDateFormat fmt;
if( formatString != null )
+ {
fmt = new SimpleDateFormat( formatString );
+ }
else
+ {
fmt = Preferences.getDateFormat( context, TimeFormat.DATETIME
);
+ }
Date d = new Date(); // Now.
@@ -65,7 +69,7 @@ public class CurrentTimePlugin implement
}
catch( IllegalArgumentException e )
{
- ResourceBundle rb =
context.getBundle(WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE);
+ ResourceBundle rb = Preferences.getBundle( context,
WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
throw new PluginException(
rb.getString("currenttimeplugin.badformat") + e.getMessage() );
}
Modified:
incubator/jspwiki/trunk/src/org/apache/wiki/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/DefaultPluginManager.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/org/apache/wiki/plugin/DefaultPluginManager.java
(original)
+++
incubator/jspwiki/trunk/src/org/apache/wiki/plugin/DefaultPluginManager.java
Fri Feb 8 20:37:49 2013
@@ -37,6 +37,7 @@ import org.apache.wiki.api.plugin.WikiPl
import org.apache.wiki.modules.ModuleManager;
import org.apache.wiki.modules.WikiModuleInfo;
import org.apache.wiki.parser.PluginContent;
+import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.util.ClassUtil;
import org.apache.wiki.util.FileUtil;
import org.apache.wiki.util.TextUtil;
@@ -312,7 +313,7 @@ public class DefaultPluginManager extend
if( !m_pluginsEnabled )
return "";
- ResourceBundle rb =
context.getBundle(WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE);
+ ResourceBundle rb = Preferences.getBundle( context,
WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
boolean debug = TextUtil.isPositive( params.get( PARAM_DEBUG ) );
try
{
@@ -505,9 +506,11 @@ public class DefaultPluginManager extend
throws PluginException
{
if( !m_pluginsEnabled )
+ {
return "";
+ }
- ResourceBundle rb =
context.getBundle(WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE);
+ ResourceBundle rb = Preferences.getBundle( context,
WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
PatternMatcher matcher = new Perl5Matcher();
try
Modified:
incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ListLocksPlugin.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ListLocksPlugin.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ListLocksPlugin.java
(original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ListLocksPlugin.java Fri
Feb 8 20:37:49 2013
@@ -51,7 +51,7 @@ public class ListLocksPlugin
PageManager mgr = context.getEngine().getPageManager();
List locks = mgr.getActiveLocks();
- ResourceBundle rb =
context.getBundle(WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE);
+ ResourceBundle rb = Preferences.getBundle( context,
WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
result.append("<table class=\"wikitable\">\n");
result.append("<tr>\n");
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/PluginManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/PluginManager.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/PluginManager.java
(original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/PluginManager.java Fri
Feb 8 20:37:49 2013
@@ -33,6 +33,7 @@ import org.apache.wiki.api.plugin.Parser
import org.apache.wiki.api.plugin.WikiPlugin;
import org.apache.wiki.modules.WikiModuleInfo;
import org.apache.wiki.parser.PluginContent;
+import org.apache.wiki.preferences.Preferences;
import org.jdom.Element;
/**
@@ -196,7 +197,7 @@ public class PluginManager extends Defau
if( !pluginsEnabled() )
return;
- ResourceBundle rb =
context.getBundle(WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE);
+ ResourceBundle rb = Preferences.getBundle( context,
WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
Map<String, String> params = content.getParameters();
WikiPlugin plugin = newWikiPlugin( content.getPluginName(), rb );
try
Modified:
incubator/jspwiki/trunk/src/org/apache/wiki/plugin/RecentChangesPlugin.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/RecentChangesPlugin.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/RecentChangesPlugin.java
(original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/RecentChangesPlugin.java
Fri Feb 8 20:37:49 2013
@@ -201,7 +201,8 @@ public class RecentChangesPlugin extends
}
else
{
- authorinfo.addElement(
context.getBundle(InternationalizationManager.CORE_BUNDLE).getString(
"common.unknownauthor" ) );
+ authorinfo.addElement( Preferences.getBundle( context,
InternationalizationManager.CORE_BUNDLE )
+ .getString(
"common.unknownauthor" ) );
}
row.addElement( authorinfo );
@@ -253,10 +254,12 @@ public class RecentChangesPlugin extends
{
String formatString = get(params, DEFAULT_DATE_FORMAT,
PARAM_DATE_FORMAT);
- if ("".equals(formatString.trim()))
+ if( "".equals(formatString.trim() ) )
+ {
return Preferences.getDateFormat( context, TimeFormat.DATE );
+ }
- return new SimpleDateFormat(formatString);
+ return new SimpleDateFormat( formatString );
}
Modified:
incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ReferringPagesPlugin.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ReferringPagesPlugin.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ReferringPagesPlugin.java
(original)
+++
incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ReferringPagesPlugin.java
Fri Feb 8 20:37:49 2013
@@ -29,6 +29,7 @@ import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiPage;
import org.apache.wiki.api.exceptions.PluginException;
import org.apache.wiki.api.plugin.WikiPlugin;
+import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.util.TextUtil;
/**
@@ -74,7 +75,7 @@ public class ReferringPagesPlugin
{
ReferenceManager refmgr = context.getEngine().getReferenceManager();
String pageName = params.get( PARAM_PAGE );
- ResourceBundle rb =
context.getBundle(WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE);
+ ResourceBundle rb = Preferences.getBundle( context,
WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
StringBuffer result = new StringBuffer( 256 );
Modified:
incubator/jspwiki/trunk/src/org/apache/wiki/plugin/TableOfContents.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/TableOfContents.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/TableOfContents.java
(original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/TableOfContents.java Fri
Feb 8 20:37:49 2013
@@ -34,6 +34,7 @@ import org.apache.wiki.api.plugin.WikiPl
import org.apache.wiki.parser.Heading;
import org.apache.wiki.parser.HeadingListener;
import org.apache.wiki.parser.JSPWikiMarkupParser;
+import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.util.TextUtil;
/**
@@ -153,11 +154,13 @@ public class TableOfContents
{
WikiEngine engine = context.getEngine();
WikiPage page = context.getPage();
- ResourceBundle rb =
context.getBundle(WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE);
+ ResourceBundle rb = Preferences.getBundle( context,
WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
if( context.getVariable( VAR_ALREADY_PROCESSING ) != null )
+ {
//return rb.getString("tableofcontents.title");
return "<a href=\"#section-TOC\"
class=\"toc\">"+rb.getString("tableofcontents.title")+"</a>";
+ }
StringBuffer sb = new StringBuffer();
Modified:
incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogEntryPlugin.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogEntryPlugin.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogEntryPlugin.java
(original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogEntryPlugin.java
Fri Feb 8 20:37:49 2013
@@ -25,6 +25,7 @@ import org.apache.log4j.Logger;
import org.apache.wiki.*;
import org.apache.wiki.api.exceptions.PluginException;
import org.apache.wiki.api.plugin.WikiPlugin;
+import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.providers.ProviderException;
/**
@@ -88,7 +89,7 @@ public class WeblogEntryPlugin implement
public String execute( WikiContext context, Map<String, String> params )
throws PluginException
{
- ResourceBundle rb =
context.getBundle(WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE);
+ ResourceBundle rb = Preferences.getBundle( context,
WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
String weblogName = params.get( PARAM_BLOGNAME );
if( weblogName == null )
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/tags/AuthorTag.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/tags/AuthorTag.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/tags/AuthorTag.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/tags/AuthorTag.java Fri Feb 8
20:37:49 2013
@@ -25,6 +25,7 @@ import org.apache.wiki.WikiPage;
import org.apache.wiki.i18n.InternationalizationManager;
import org.apache.wiki.parser.MarkupParser;
import org.apache.wiki.parser.WikiDocument;
+import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.render.RenderingManager;
import org.apache.wiki.util.TextUtil;
@@ -72,7 +73,8 @@ public class AuthorTag
}
else
{
- pageContext.getOut().print( m_wikiContext.getBundle(
InternationalizationManager.CORE_BUNDLE ).getString( "common.unknownauthor" ));
+ pageContext.getOut().print( Preferences.getBundle( m_wikiContext,
InternationalizationManager.CORE_BUNDLE )
+ .getString(
"common.unknownauthor" ) );
}
return SKIP_BODY;
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/tags/RSSImageLinkTag.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/tags/RSSImageLinkTag.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/tags/RSSImageLinkTag.java
(original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/tags/RSSImageLinkTag.java Fri
Feb 8 20:37:49 2013
@@ -27,6 +27,7 @@ import javax.servlet.jsp.JspWriter;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
import org.apache.wiki.i18n.InternationalizationManager;
+import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.rss.RSSGenerator;
/**
@@ -91,7 +92,7 @@ public class RSSImageLinkTag
{
WikiEngine engine = m_wikiContext.getEngine();
JspWriter out = pageContext.getOut();
- ResourceBundle rb = m_wikiContext.getBundle(
InternationalizationManager.CORE_BUNDLE );
+ ResourceBundle rb = Preferences.getBundle( m_wikiContext,
InternationalizationManager.CORE_BUNDLE );
if( engine.getRSSGenerator() != null &&
engine.getRSSGenerator().isEnabled() )
{
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/tags/UserNameTag.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/tags/UserNameTag.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/tags/UserNameTag.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/tags/UserNameTag.java Fri Feb
8 20:37:49 2013
@@ -27,6 +27,7 @@ import javax.servlet.http.HttpServletReq
import org.apache.wiki.WikiEngine;
import org.apache.wiki.WikiSession;
import org.apache.wiki.i18n.InternationalizationManager;
+import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.util.TextUtil;
/**
@@ -59,9 +60,8 @@ public class UserNameTag extends WikiTag
}
else
{
- pageContext.getOut().print(
-
m_wikiContext.getBundle(InternationalizationManager.CORE_BUNDLE)
-
.getString("security.user.fullname.invalid"));
+ pageContext.getOut().print( Preferences.getBundle(
m_wikiContext, InternationalizationManager.CORE_BUNDLE )
+ .getString(
"security.user.fullname.invalid" ) );
}
}
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/tags/UserProfileTag.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/tags/UserProfileTag.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/tags/UserProfileTag.java
(original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/tags/UserProfileTag.java Fri
Feb 8 20:37:49 2013
@@ -36,6 +36,7 @@ import org.apache.wiki.auth.WikiSecurity
import org.apache.wiki.auth.authorize.Role;
import org.apache.wiki.auth.user.UserProfile;
import org.apache.wiki.i18n.InternationalizationManager;
+import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.util.TextUtil;
/**
@@ -219,7 +220,7 @@ public class UserProfileTag extends Wiki
{
Principal[] roles = context.getWikiSession().getRoles();
List<String> tempRoles = new ArrayList<String>();
- ResourceBundle rb =
context.getBundle(InternationalizationManager.CORE_BUNDLE);
+ ResourceBundle rb = Preferences.getBundle( context,
InternationalizationManager.CORE_BUNDLE );
for ( Principal role : roles )
{
@@ -260,7 +261,7 @@ public class UserProfileTag extends Wiki
{
Principal[] roles = context.getWikiSession().getRoles();
List<String> tempRoles = new ArrayList<String>();
- ResourceBundle rb = context.getBundle(
InternationalizationManager.CORE_BUNDLE );
+ ResourceBundle rb = Preferences.getBundle( context,
InternationalizationManager.CORE_BUNDLE );
for ( Principal role : roles )
{
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/ui/InputValidator.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/ui/InputValidator.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/ui/InputValidator.java
(original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/ui/InputValidator.java Fri Feb
8 20:37:49 2013
@@ -25,6 +25,7 @@ import java.util.regex.Pattern;
import org.apache.wiki.*;
import org.apache.wiki.i18n.InternationalizationManager;
+import org.apache.wiki.preferences.Preferences;
/**
* Provides basic validation services for HTTP parameters. Three standard
@@ -102,11 +103,10 @@ public final class InputValidator
{
if ( isBlank( input ) )
{
- ResourceBundle rb = m_context.getBundle(
InternationalizationManager.CORE_BUNDLE );
+ ResourceBundle rb = Preferences.getBundle( m_context,
InternationalizationManager.CORE_BUNDLE );
- Object[] args = { label };
m_session.addMessage( m_form, MessageFormat.format(
rb.getString("validate.cantbenull"),
- args ) );
+ label ) );
return false;
}
return validate( input, label, type ) && !isBlank( input );
@@ -131,7 +131,7 @@ public final class InputValidator
return true;
}
- ResourceBundle rb = m_context.getBundle(
InternationalizationManager.CORE_BUNDLE );
+ ResourceBundle rb = Preferences.getBundle( m_context,
InternationalizationManager.CORE_BUNDLE );
// Otherwise, see if it matches the pattern for the target type
Matcher matcher;
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/ui/TemplateManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/ui/TemplateManager.java?rev=1444224&r1=1444223&r2=1444224&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/ui/TemplateManager.java
(original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/ui/TemplateManager.java Fri Feb
8 20:37:49 2013
@@ -36,6 +36,7 @@ import org.apache.log4j.Logger;
import org.apache.wiki.InternalWikiException;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
+import org.apache.wiki.i18n.InternationalizationManager;
import org.apache.wiki.modules.ModuleManager;
import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.preferences.Preferences.TimeFormat;
@@ -687,7 +688,7 @@ public class TemplateManager
sb.append( "var LocalizedStrings = {\n");
- ResourceBundle rb = context.getBundle("templates.default");
+ ResourceBundle rb = Preferences.getBundle( context,
InternationalizationManager.DEF_TEMPLATE );
boolean first = true;
