Index: /home/metskem/workspace/JSPWiki-2.8/etc/i18n/CoreResources.properties =================================================================== --- /home/metskem/workspace/JSPWiki-2.8/etc/i18n/CoreResources.properties (revision 708207) +++ /home/metskem/workspace/JSPWiki-2.8/etc/i18n/CoreResources.properties (working copy) @@ -196,3 +196,14 @@ # RSSImageLinkTag rss.title=RSS feed for page {0} + +# AttachmentManager +attach.unwanted.file=Unwanted file name. +attach.empty.file=Empty file name given. +attach.parent.not.exist=Parent page does not exist + +# VariableManager +varmgr.not.logged.in=not logged in +varmgr.authenticated=authenticated +varmgr.asserted=asserted +varmgr.anonymous=anonymous Index: /home/metskem/workspace/JSPWiki-2.8/etc/i18n/CoreResources_nl.properties =================================================================== --- /home/metskem/workspace/JSPWiki-2.8/etc/i18n/CoreResources_nl.properties (revision 708207) +++ /home/metskem/workspace/JSPWiki-2.8/etc/i18n/CoreResources_nl.properties (working copy) @@ -195,4 +195,16 @@ install.installer.validate.logdir=Je moet de log directory opgeven. # RSSImageLinkTag -rss.title=RSS feed voor pagina {0} \ No newline at end of file +rss.title=RSS feed voor pagina {0} + + +# AttachmentManager +attach.unwanted.file=Ongewenste bestandsnaam +attach.empty.file=Geen bestandsnaam opgegeven +attach.parent.not.exist=De parent pagina bestaat niet + +# VariableManager +varmgr.not.logged.in=niet ingelogd +varmgr.authenticated=geauthenticeerd +varmgr.asserted=aangenomen identiteit +varmgr.anonymous=anoniem Index: /home/metskem/workspace/JSPWiki-2.8/etc/i18n/plugin/PluginResources.properties =================================================================== --- /home/metskem/workspace/JSPWiki-2.8/etc/i18n/plugin/PluginResources.properties (revision 708207) +++ /home/metskem/workspace/JSPWiki-2.8/etc/i18n/plugin/PluginResources.properties (working copy) @@ -46,4 +46,11 @@ formoutput.missingargument = Argument '{0}' required for Form plugin formselect.namemissing = Select element is missing parameter 'name'. formtextarea.noneedtoshow = (no need to show textarea field now) -formtextarea.namemissing = Textarea element is missing parameter 'name'. \ No newline at end of file +formtextarea.namemissing = Textarea element is missing parameter 'name'. + +# ListLocks plugin +plugin.listlocks.page=Page +plugin.listlocks.locked.by=Locked by +plugin.listlocks.acquired=Acquired +plugin.listlocks.expires=Expires +plugin.listlocks.no.locks.exist=No locks exist currently. \ No newline at end of file Index: /home/metskem/workspace/JSPWiki-2.8/etc/i18n/plugin/PluginResources_nl.properties =================================================================== --- /home/metskem/workspace/JSPWiki-2.8/etc/i18n/plugin/PluginResources_nl.properties (revision 708207) +++ /home/metskem/workspace/JSPWiki-2.8/etc/i18n/plugin/PluginResources_nl.properties (working copy) @@ -55,3 +55,10 @@ formselect.namemissing=Het element 'select' verwacht een parameter 'name'. formtextarea.noneedtoshow=(form textarea is hier niet nodig) formtextarea.namemissing=Het element 'textarea' verwacht de parameter 'name'. + +# ListLocks plugin +plugin.listlocks.page=Pagina +plugin.listlocks.locked.by=In gebruik door +plugin.listlocks.acquired=Sinds +plugin.listlocks.expires=Loopt af +plugin.listlocks.no.locks.exist=Er zijn momenteel geen locks. \ No newline at end of file Index: /home/metskem/workspace/JSPWiki-2.8/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java =================================================================== --- /home/metskem/workspace/JSPWiki-2.8/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java (revision 708207) +++ /home/metskem/workspace/JSPWiki-2.8/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java (working copy) @@ -30,6 +30,7 @@ import org.apache.log4j.Logger; import com.ecyrd.jspwiki.*; +import com.ecyrd.jspwiki.i18n.InternationalizationManager; import com.ecyrd.jspwiki.parser.MarkupParser; import com.ecyrd.jspwiki.providers.ProviderException; import com.ecyrd.jspwiki.providers.WikiAttachmentProvider; @@ -487,7 +488,13 @@ // if( !m_engine.getPageManager().pageExists( att.getParentName() ) ) { - throw new ProviderException("Parent page does not exist"); + // + //FIXME We should get the bundle from the wikicontext instead of the static call, + // but we don't have the context here, getting it here requires passing the wikicontext + // in the storeAttachment method, which requires quite some changes in other method signatures...... + // + ResourceBundle rb = ResourceBundle.getBundle( InternationalizationManager.CORE_BUNDLE ); + throw new ProviderException( rb.getString( "attach.parent.not.exist" ) ); } m_provider.putAttachmentData( att, in ); @@ -603,9 +610,15 @@ { if( filename == null || filename.trim().length() == 0 ) { - AttachmentServlet.log.error("Empty file name given."); - throw new WikiException("Empty file name given."); + // + //FIXME We should get the bundle from the wikicontext instead of the static call, + // but we don't have the context here, getting it here requires passing the wikicontext + // in the storeAttachment method, which requires quite some changes in other method signatures too...... + // + ResourceBundle rb = ResourceBundle.getBundle( InternationalizationManager.CORE_BUNDLE ); + log.error(rb.getString( "attach.empty.file" )); + throw new WikiException( rb.getString( "attach.empty.file" ) ); } // @@ -618,8 +631,13 @@ { log.info( "Attempt to upload a file with a .jsp/.jspf extension. In certain cases this" + " can trigger unwanted security side effects, so we're preventing it." ); - - throw new WikiException( "Unwanted file name." ); + // + //FIXME We should get the bundle from the wikicontext instead of the static call, + // but we don't have the context here, getting it here requires passing the wikicontext + // in the storeAttachment method, which requires quite some changes in other method signatures...... + // + ResourceBundle rb = ResourceBundle.getBundle( InternationalizationManager.CORE_BUNDLE ); + throw new WikiException( rb.getString( "attach.unwanted.file" ) ); } // Index: /home/metskem/workspace/JSPWiki-2.8/src/com/ecyrd/jspwiki/plugin/ListLocksPlugin.java =================================================================== --- /home/metskem/workspace/JSPWiki-2.8/src/com/ecyrd/jspwiki/plugin/ListLocksPlugin.java (revision 708207) +++ /home/metskem/workspace/JSPWiki-2.8/src/com/ecyrd/jspwiki/plugin/ListLocksPlugin.java (working copy) @@ -44,10 +44,13 @@ PageManager mgr = context.getEngine().getPageManager(); List locks = mgr.getActiveLocks(); + ResourceBundle rb = context.getBundle(WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE); result.append("\n"); result.append("\n"); - result.append("\n"); + result.append( "\n" ); result.append(""); if( locks.size() == 0 ) @@ -52,7 +55,8 @@ if( locks.size() == 0 ) { - result.append("\n"); + result.append( "\n" ); } else { Index: /home/metskem/workspace/JSPWiki-2.8/src/com/ecyrd/jspwiki/VariableManager.java =================================================================== --- /home/metskem/workspace/JSPWiki-2.8/src/com/ecyrd/jspwiki/VariableManager.java (revision 708207) +++ /home/metskem/workspace/JSPWiki-2.8/src/com/ecyrd/jspwiki/VariableManager.java (working copy) @@ -22,10 +22,7 @@ import java.lang.reflect.Method; import java.security.Principal; -import java.util.Date; -import java.util.Iterator; -import java.util.List; -import java.util.Properties; +import java.util.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; @@ -33,6 +30,7 @@ import org.apache.log4j.Logger; import com.ecyrd.jspwiki.filters.PageFilter; +import com.ecyrd.jspwiki.i18n.InternationalizationManager; import com.ecyrd.jspwiki.modules.InternalModule; /** @@ -481,7 +479,9 @@ public String getLoginstatus() { WikiSession session = m_context.getWikiSession(); - return session.getStatus(); + // + //FIXME not sure if this way of i18n is acceptable : + return m_context.getBundle(InternationalizationManager.CORE_BUNDLE).getString( "varmgr." + session.getStatus()); } public String getUsername() @@ -487,8 +487,9 @@ public String getUsername() { Principal wup = m_context.getCurrentUser(); - - return wup != null ? wup.getName() : "not logged in"; + + ResourceBundle rb = m_context.getBundle( InternationalizationManager.CORE_BUNDLE ); + return wup != null ? wup.getName() : rb.getString( "varmgr.not.logged.in" ); } public String getRequestcontext() Index: /home/metskem/workspace/JSPWiki-2.8/src/webdocs/templates/default/GroupContent.jsp =================================================================== --- /home/metskem/workspace/JSPWiki-2.8/src/webdocs/templates/default/GroupContent.jsp (revision 708207) +++ /home/metskem/workspace/JSPWiki-2.8/src/webdocs/templates/default/GroupContent.jsp (working copy) @@ -6,6 +6,7 @@ <%@ page import="com.ecyrd.jspwiki.auth.PrincipalComparator" %> <%@ page import="com.ecyrd.jspwiki.auth.authorize.Group" %> <%@ page import="com.ecyrd.jspwiki.auth.authorize.GroupManager" %> +<%@ page import="com.ecyrd.jspwiki.preferences.Preferences" %> <%@ page import="org.apache.log4j.*" %> <%@ page errorPage="/Error.jsp" %> <%@ page import="javax.servlet.jsp.jstl.fmt.*" %> @@ -35,7 +36,7 @@ creator = group.getCreator(); if ( group.getCreated() != null ) { - created = group.getCreated().toString(); + created = Preferences.renderDate(WikiContext.findContext( pageContext ), group.getCreated(),Preferences.TimeFormat.DATETIME); } modifier = group.getModifier(); if ( group.getLastModified() != null ) @@ -40,7 +41,7 @@ modifier = group.getModifier(); if ( group.getLastModified() != null ) { - modified = group.getLastModified().toString(); + modified = Preferences.renderDate(WikiContext.findContext( pageContext ), group.getLastModified(),Preferences.TimeFormat.DATETIME) ; } } name = TextUtil.replaceEntities(name); Index: /home/metskem/workspace/JSPWiki-2.8/src/webdocs/templates/default/GroupTab.jsp =================================================================== --- /home/metskem/workspace/JSPWiki-2.8/src/webdocs/templates/default/GroupTab.jsp (revision 708207) +++ /home/metskem/workspace/JSPWiki-2.8/src/webdocs/templates/default/GroupTab.jsp (working copy) @@ -7,6 +7,7 @@ <%@ page import="com.ecyrd.jspwiki.auth.PrincipalComparator" %> <%@ page import="com.ecyrd.jspwiki.auth.authorize.Group" %> <%@ page import="com.ecyrd.jspwiki.auth.authorize.GroupManager" %> +<%@ page import="com.ecyrd.jspwiki.preferences.Preferences" %> <%@ page import="org.apache.log4j.*" %> <%@ page errorPage="/Error.jsp" %> <%@ page import="javax.servlet.jsp.jstl.fmt.*" %> @@ -34,11 +35,11 @@ ss.append( delim ); mf = new MessageFormat(LocaleSupport.getLocalizedMessage(pageContext, "grp.createdon") ); - args = new Object[]{(group.getCreated()==null) ? "" : group.getCreated().toString(), group.getCreator()}; + args = new Object[]{(group.getCreated()==null) ? "" : Preferences.renderDate(WikiContext.findContext( pageContext ), group.getCreated(),Preferences.TimeFormat.DATETIME), group.getCreator()}; ss.append( mf.format( args ) ); mf = new MessageFormat(LocaleSupport.getLocalizedMessage(pageContext, "grp.lastmodified") ); - args = new Object[]{(group.getCreated()==null) ? "" : group.getCreated().toString(), group.getModifier()}; + args = new Object[]{(group.getLastModified()==null) ? "" : Preferences.renderDate(WikiContext.findContext( pageContext ), group.getLastModified(),Preferences.TimeFormat.DATETIME), group.getModifier()}; ss.append( mf.format( args ) ); ss.append( "\", " );
PageLocked byAcquiredExpires" + rb.getString( "plugin.listlocks.page" ) + "" + rb.getString( "plugin.listlocks.locked.by" ) + + "" + rb.getString( "plugin.listlocks.acquired" ) + "" + + rb.getString( "plugin.listlocks.expires" ) + "
No locks exist currently.
" + rb.getString( "plugin.listlocks.no.locks.exist" ) + + "