Author: jalkanen
Date: Tue May 20 12:57:38 2008
New Revision: 658406
URL: http://svn.apache.org/viewvc?rev=658406&view=rev
Log:
JSPWIKI-170: Fixed localization of unknown author (or added a comment if it
can't be)
Modified:
incubator/jspwiki/trunk/etc/i18n/CoreResources.properties
incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/BasicAttachmentProvider.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/AuthorTag.java
Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources.properties?rev=658406&r1=658405&r2=658406&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources.properties Tue May 20
12:57:38 2008
@@ -21,6 +21,10 @@
# Date stamp format when showing just the date.
common.dateformat = EEEE, MMMM d, yyyy
+# "Unknown author"
+
+common.unknownauthor = UnknownAuthor
+
# Decisions: {0}=task owner; {1}=requester; {2-9}=additional message arguments
for workflow
decision.editWikiApproval=Edit page {2}
Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties?rev=658406&r1=658405&r2=658406&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties Tue May 20
12:57:38 2008
@@ -13,6 +13,8 @@
common.dateformat = dd/MM/yyyy
common.timeformat = HH:mm:ss
+common.unknownauthor = TuntematonHyypiö
+
# Decisions: {0}=task owner; {1}=requester; {2-9}=additional message arguments
for workflow
decision.editWikiApproval=Muokkaa sivua {2}
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java?rev=658406&r1=658405&r2=658406&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
Tue May 20 12:57:38 2008
@@ -32,6 +32,7 @@
import com.ecyrd.jspwiki.WikiEngine;
import com.ecyrd.jspwiki.WikiPage;
import com.ecyrd.jspwiki.attachment.Attachment;
+import com.ecyrd.jspwiki.i18n.InternationalizationManager;
import com.ecyrd.jspwiki.preferences.Preferences;
import com.ecyrd.jspwiki.preferences.Preferences.TimeFormat;
@@ -191,7 +192,7 @@
}
else
{
- authorinfo.addElement("unknown");
+ authorinfo.addElement(
context.getBundle(InternationalizationManager.CORE_BUNDLE).getString(
"common.unknownauthor" ) );
}
row.addElement( authorinfo );
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/BasicAttachmentProvider.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/BasicAttachmentProvider.java?rev=658406&r1=658405&r2=658406&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/BasicAttachmentProvider.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/BasicAttachmentProvider.java
Tue May 20 12:57:38 2008
@@ -344,7 +344,7 @@
if( author == null )
{
- author = "unknown";
+ author = "unknown"; // FIXME: Should be localized, but cannot
due to missing WikiContext
}
props.setProperty( versionNumber+".author", author );
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java?rev=658406&r1=658405&r2=658406&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java
Tue May 20 12:57:38 2008
@@ -369,7 +369,7 @@
String cmd = m_checkinCommand;
String author = page.getAuthor();
- if( author == null ) author = "unknown";
+ if( author == null ) author = "unknown"; // Should be localized
but cannot due to missing WikiContext
String changenote = (String)page.getAttribute(WikiPage.CHANGENOTE);
if( changenote == null ) changenote = "";
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/AuthorTag.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/AuthorTag.java?rev=658406&r1=658405&r2=658406&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/AuthorTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/AuthorTag.java Tue May
20 12:57:38 2008
@@ -25,6 +25,7 @@
import com.ecyrd.jspwiki.WikiEngine;
import com.ecyrd.jspwiki.WikiPage;
import com.ecyrd.jspwiki.TextUtil;
+import com.ecyrd.jspwiki.i18n.InternationalizationManager;
import com.ecyrd.jspwiki.parser.MarkupParser;
import com.ecyrd.jspwiki.parser.WikiDocument;
import com.ecyrd.jspwiki.render.RenderingManager;
@@ -69,7 +70,7 @@
}
else
{
- pageContext.getOut().print( "unknown" );
+ pageContext.getOut().print( m_wikiContext.getBundle(
InternationalizationManager.CORE_BUNDLE ).getString( "common.unknownauthor" ));
}
return SKIP_BODY;
