From f443187b6d0bd1f9fea6526a7265a74de318cc9a Mon Sep 17 00:00:00 2001 From: Dario Solera Date: Sun, 28 Feb 2010 10:23:54 +0000 Subject: [PATCH] Fixed and closed #497: keywords, meta description and change comment are displayed in ?Code=1 mode. --- AssemblyVersion.cs | 4 +-- WebApplication/Default.aspx.cs | 17 ++++++++++-- WebApplication/Properties/Messages.af-ZA.resx | 11 +++++++- WebApplication/Properties/Messages.cs-CZ.resx | 9 +++++++ WebApplication/Properties/Messages.da-DK.resx | 9 +++++++ WebApplication/Properties/Messages.de-DE.resx | 9 +++++++ .../Properties/Messages.designer.cs | 27 +++++++++++++++++++ WebApplication/Properties/Messages.es-ES.resx | 9 +++++++ WebApplication/Properties/Messages.fr-FR.resx | 9 +++++++ WebApplication/Properties/Messages.hu-HU.resx | 11 +++++++- WebApplication/Properties/Messages.it-IT.resx | 9 +++++++ WebApplication/Properties/Messages.ja-JP.resx | 11 +++++++- WebApplication/Properties/Messages.nb-NO.resx | 9 +++++++ WebApplication/Properties/Messages.nl-NL.resx | 9 +++++++ WebApplication/Properties/Messages.pl-PL.resx | 9 +++++++ WebApplication/Properties/Messages.pt-BR.resx | 9 +++++++ WebApplication/Properties/Messages.resx | 9 +++++++ WebApplication/Properties/Messages.ro-RO.resx | 9 +++++++ WebApplication/Properties/Messages.ru-RU.resx | 9 +++++++ WebApplication/Properties/Messages.sk-SK.resx | 9 +++++++ .../Properties/Messages.sr-Latn-CS.resx | 9 +++++++ WebApplication/Properties/Messages.tr-TR.resx | 9 +++++++ WebApplication/Properties/Messages.uk-UA.resx | 9 +++++++ WebApplication/Properties/Messages.zh-cn.resx | 9 +++++++ WebApplication/Properties/Messages.zh-tw.resx | 12 +++++++-- 25 files changed, 246 insertions(+), 9 deletions(-) diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs index d010c83..8c092d2 100644 --- a/AssemblyVersion.cs +++ b/AssemblyVersion.cs @@ -16,5 +16,5 @@ using System.Reflection; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("3.0.2.502")] -[assembly: AssemblyFileVersion("3.0.2.502")] +[assembly: AssemblyVersion("3.0.2.503")] +[assembly: AssemblyFileVersion("3.0.2.503")] diff --git a/WebApplication/Default.aspx.cs b/WebApplication/Default.aspx.cs index 652254b..98eaf75 100644 --- a/WebApplication/Default.aspx.cs +++ b/WebApplication/Default.aspx.cs @@ -328,8 +328,8 @@ namespace ScrewTurn.Wiki { /// /// Prints the keywords in a CSV list. /// - /// - /// + /// The keywords. + /// The list. private string PrintKeywords(string[] keywords) { StringBuilder sb = new StringBuilder(50); for(int i = 0; i < keywords.Length; i++) { @@ -700,6 +700,19 @@ namespace ScrewTurn.Wiki { sb.Append(@""); + sb.Append("

"); + sb.Append(Properties.Messages.MetaKeywords); + sb.Append(": "); + sb.Append(PrintKeywords(currentContent.Keywords)); + sb.Append("
"); + sb.Append(Properties.Messages.MetaDescription); + sb.Append(": "); + sb.Append(currentContent.Description); + sb.Append("
"); + sb.Append(Properties.Messages.ChangeComment); + sb.Append(": "); + sb.Append(currentContent.Comment); + sb.Append(""); literal.Text = sb.ToString(); plhContent.Controls.Add(literal); } diff --git a/WebApplication/Properties/Messages.af-ZA.resx b/WebApplication/Properties/Messages.af-ZA.resx index 016148b..371ecd6 100644 --- a/WebApplication/Properties/Messages.af-ZA.resx +++ b/WebApplication/Properties/Messages.af-ZA.resx @@ -1,4 +1,4 @@ - +