Fixed and closed #414: "Link to this section" is now translated.
Fixed and closed #413: "~~~~" tag now correctly renders the display name. Fixed #408: reverse formatter now works even when no new lines are present at the end of the content.
This commit is contained in:
Dario Solera
parent
acf1af0491
commit
1147017d92
25 changed files with 34 additions and 32 deletions
|
|
@ -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.1.425")]
|
||||
[assembly: AssemblyFileVersion("3.0.1.425")]
|
||||
[assembly: AssemblyVersion("3.0.1.426")]
|
||||
[assembly: AssemblyFileVersion("3.0.1.426")]
|
||||
|
|
|
|||
|
|
@ -67,6 +67,7 @@ namespace ScrewTurn.Wiki {
|
|||
private const string ExtendedUpReplacement = "GetFile.aspx?$File=";
|
||||
private const string ExtendedUpReplacementForAttachment = "GetFile.aspx?$Page=@&File=";
|
||||
private const string SingleBrPlaceHolder = "%%%%SingleBrPlaceHolder%%%%";
|
||||
private const string SectionLinkTextPlaceHolder = "%%%%SectionLinkTextPlaceHolder%%%%";
|
||||
|
||||
/// <summary>
|
||||
/// Detects the current namespace.
|
||||
|
|
@ -911,7 +912,7 @@ namespace ScrewTurn.Wiki {
|
|||
buffer.Append(@""" href=""#");
|
||||
buffer.Append(id);
|
||||
buffer.Append(@""" title=""");
|
||||
buffer.Append(Exchanger.ResourceExchanger.GetResource("LinkToThisSection"));
|
||||
buffer.Append(SectionLinkTextPlaceHolder);
|
||||
if(Settings.EnableSectionAnchors) buffer.Append(@""">¶</a>");
|
||||
else buffer.Append(@"""></a>");
|
||||
}
|
||||
|
|
@ -2401,6 +2402,8 @@ namespace ScrewTurn.Wiki {
|
|||
match = Phase3SpecialTagRegex.Match(sb.ToString());
|
||||
}
|
||||
|
||||
sb.Replace(SectionLinkTextPlaceHolder, Exchanger.ResourceExchanger.GetResource("LinkToThisSection"));
|
||||
|
||||
match = RecentChangesRegex.Match(sb.ToString());
|
||||
while(match.Success) {
|
||||
sb.Remove(match.Index, match.Length);
|
||||
|
|
@ -2443,11 +2446,9 @@ namespace ScrewTurn.Wiki {
|
|||
int idx = txt.LastIndexOf(",");
|
||||
string[] fields = new string[] { txt.Substring(0, idx), txt.Substring(idx + 1) };
|
||||
dummy = new StringBuilder();
|
||||
dummy.Append(@"<span class=""signature""><a class=""systemlink"" href=""");
|
||||
UrlTools.BuildUrl(dummy, "User.aspx?Username=", Tools.UrlEncode(fields[0]));
|
||||
dummy.Append(@""">");
|
||||
dummy.Append(fields[0]);
|
||||
dummy.Append("</a>, ");
|
||||
dummy.Append(@"<span class=""signature"">");
|
||||
dummy.Append(Users.UserLink(fields[0]));
|
||||
dummy.Append(", ");
|
||||
dummy.Append(Preferences.AlignWithTimezone(DateTime.Parse(fields[1])).ToString(Settings.DateTimeFormat));
|
||||
dummy.Append("</span>");
|
||||
sb.Insert(match.Index, dummy.ToString());
|
||||
|
|
|
|||
|
|
@ -81,6 +81,7 @@ namespace ScrewTurn.Wiki {
|
|||
Match match = null;
|
||||
|
||||
StringBuilder buffer = new StringBuilder(html);
|
||||
if(!html.EndsWith("\r\n")) buffer.Append("\r\n");
|
||||
|
||||
buffer.Replace("<br>", "<br />");
|
||||
buffer.Replace("<BR>", "<br />");
|
||||
|
|
|
|||
|
|
@ -256,7 +256,7 @@
|
|||
<value />
|
||||
</data>
|
||||
<data name="lblApprovalRequiredInfoResource1.Text" xml:space="preserve">
|
||||
<value>Le tue midifiche saranno salvate come bozza e non verranno pubblicate finchè un editore o amministratore non le avrà approvate.</value>
|
||||
<value>Le tue modifiche saranno salvate come bozza e non verranno pubblicate finchè un editore o amministratore non le avrà approvate.</value>
|
||||
</data>
|
||||
<data name="lblAttachmentManagerResource1.Text" xml:space="preserve">
|
||||
<value>Gestione allegati</value>
|
||||
|
|
@ -322,7 +322,7 @@
|
|||
<value>Salvare questa pagina potrebbe causare <b>perdite di dati</b>.</value>
|
||||
</data>
|
||||
<data name="lblSaveDisabledResource1.Text" xml:space="preserve">
|
||||
<value>Gli amministratori non permettoni di salvare questa pagina.</value>
|
||||
<value>Gli amministratori non permettono di salvare questa pagina.</value>
|
||||
</data>
|
||||
<data name="lblSessionRefreshResource1.Text" xml:space="preserve">
|
||||
<value />
|
||||
|
|
|
|||
|
|
@ -256,7 +256,7 @@
|
|||
<value>Uživatelské jméno již existuje</value>
|
||||
</data>
|
||||
<data name="lblCaptchaResource1.Text" xml:space="preserve">
|
||||
<value>Kontrolní text (ohled na velikost písmen):</value>
|
||||
<value>Kontrolní text (ohled na velikost písmen)</value>
|
||||
</data>
|
||||
<data name="lblDisplayNameResource1.Text" xml:space="preserve">
|
||||
<value>Zobrazované jméno</value>
|
||||
|
|
|
|||
|
|
@ -271,7 +271,7 @@
|
|||
<value>Klik er for at oprette en konto</value>
|
||||
</data>
|
||||
<data name="lblCaptchaResource1.Text" xml:space="preserve">
|
||||
<value>Kontrol tekst:</value>
|
||||
<value>Kontrol tekst</value>
|
||||
</data>
|
||||
<data name="lblEmail1Resource1.Text" xml:space="preserve">
|
||||
<value>E-mail</value>
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@
|
|||
<value />
|
||||
</data>
|
||||
<data name="lblCaptchaResource1.Text" xml:space="preserve">
|
||||
<value>Control Text (case sensitive):</value>
|
||||
<value>Control Text (case sensitive)</value>
|
||||
</data>
|
||||
<data name="lblDisplayNameResource1.Text" xml:space="preserve">
|
||||
<value>Display Name</value>
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@
|
|||
<value />
|
||||
</data>
|
||||
<data name="lblCaptchaResource1.Text" xml:space="preserve">
|
||||
<value>Control Text (case sensitive):</value>
|
||||
<value>Control Text (case sensitive)</value>
|
||||
</data>
|
||||
<data name="lblDisplayNameResource1.Text" xml:space="preserve">
|
||||
<value>Display Name</value>
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@
|
|||
<value />
|
||||
</data>
|
||||
<data name="lblCaptchaResource1.Text" xml:space="preserve">
|
||||
<value>Ellenőrző szöveg (kis-nagybetű számít):</value>
|
||||
<value>Ellenőrző szöveg (kis-nagybetű számít)</value>
|
||||
</data>
|
||||
<data name="lblDisplayNameResource1.Text" xml:space="preserve">
|
||||
<value>Megjelenő név</value>
|
||||
|
|
|
|||
|
|
@ -172,10 +172,10 @@
|
|||
<value />
|
||||
</data>
|
||||
<data name="lblCaptchaResource1.Text" xml:space="preserve">
|
||||
<value>Testo di controllo (sensibile alle maiuscole):</value>
|
||||
<value>Testo di controllo (sensibile alle maiuscole)</value>
|
||||
</data>
|
||||
<data name="lblDisplayNameResource1.Text" xml:space="preserve">
|
||||
<value>Nome visualizzato:</value>
|
||||
<value>Nome visualizzato</value>
|
||||
</data>
|
||||
<data name="lblEmail1Resource1.Text" xml:space="preserve">
|
||||
<value>Email</value>
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@
|
|||
<value />
|
||||
</data>
|
||||
<data name="lblCaptchaResource1.Text" xml:space="preserve">
|
||||
<value>Control Text (case sensitive):</value>
|
||||
<value>Control Text (case sensitive)</value>
|
||||
</data>
|
||||
<data name="lblDisplayNameResource1.Text" xml:space="preserve">
|
||||
<value>Display Name</value>
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@
|
|||
<value />
|
||||
</data>
|
||||
<data name="lblCaptchaResource1.Text" xml:space="preserve">
|
||||
<value>Control Text (case sensitive):</value>
|
||||
<value>Control Text (case sensitive)</value>
|
||||
</data>
|
||||
<data name="lblDisplayNameResource1.Text" xml:space="preserve">
|
||||
<value>Display Name</value>
|
||||
|
|
|
|||
|
|
@ -271,7 +271,7 @@
|
|||
<value>Kliknij tutaj aby utworzyć swoje konto</value>
|
||||
</data>
|
||||
<data name="lblCaptchaResource1.Text" xml:space="preserve">
|
||||
<value>Tekst kontrolny:</value>
|
||||
<value>Tekst kontrolny</value>
|
||||
</data>
|
||||
<data name="lblEmail1Resource1.Text" xml:space="preserve">
|
||||
<value>Adres e-mail</value>
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@
|
|||
<value />
|
||||
</data>
|
||||
<data name="lblCaptchaResource1.Text" xml:space="preserve">
|
||||
<value>Control Text (case sensitive):</value>
|
||||
<value>Control Text (case sensitive)</value>
|
||||
</data>
|
||||
<data name="lblDisplayNameResource1.Text" xml:space="preserve">
|
||||
<value>Display Name</value>
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@
|
|||
<value />
|
||||
</data>
|
||||
<data name="lblCaptchaResource1.Text" xml:space="preserve">
|
||||
<value>Control Text (case sensitive):</value>
|
||||
<value>Control Text (case sensitive)</value>
|
||||
</data>
|
||||
<data name="lblDisplayNameResource1.Text" xml:space="preserve">
|
||||
<value>Display Name</value>
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@
|
|||
<value />
|
||||
</data>
|
||||
<data name="lblCaptchaResource1.Text" xml:space="preserve">
|
||||
<value>Control Text (case sensitive):</value>
|
||||
<value>Control Text (case sensitive)</value>
|
||||
</data>
|
||||
<data name="lblDisplayNameResource1.Text" xml:space="preserve">
|
||||
<value>Display Name</value>
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@
|
|||
<value />
|
||||
</data>
|
||||
<data name="lblCaptchaResource1.Text" xml:space="preserve">
|
||||
<value>Защита от авторегистраций (регистрозависимо):</value>
|
||||
<value>Защита от авторегистраций (регистрозависимо)</value>
|
||||
</data>
|
||||
<data name="lblDisplayNameResource1.Text" xml:space="preserve">
|
||||
<value>НикНейм</value>
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@
|
|||
<value />
|
||||
</data>
|
||||
<data name="lblCaptchaResource1.Text" xml:space="preserve">
|
||||
<value>Control Text (case sensitive):</value>
|
||||
<value>Control Text (case sensitive)</value>
|
||||
</data>
|
||||
<data name="lblDisplayNameResource1.Text" xml:space="preserve">
|
||||
<value>Display Name</value>
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@
|
|||
<value />
|
||||
</data>
|
||||
<data name="lblCaptchaResource1.Text" xml:space="preserve">
|
||||
<value>Control Text (case sensitive):</value>
|
||||
<value>Control Text (case sensitive)</value>
|
||||
</data>
|
||||
<data name="lblDisplayNameResource1.Text" xml:space="preserve">
|
||||
<value>Display Name</value>
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@
|
|||
<value />
|
||||
</data>
|
||||
<data name="lblCaptchaResource1.Text" xml:space="preserve">
|
||||
<value>Kontrol metni (Büyük/küçük harfe dikkat):</value>
|
||||
<value>Kontrol metni (Büyük/küçük harfe dikkat)</value>
|
||||
</data>
|
||||
<data name="lblDisplayNameResource1.Text" xml:space="preserve">
|
||||
<value>Görünür Ad</value>
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@
|
|||
<value />
|
||||
</data>
|
||||
<data name="lblCaptchaResource1.Text" xml:space="preserve">
|
||||
<value>Захист від автореєстрацій (регістрозалежно):</value>
|
||||
<value>Захист від автореєстрацій (регістрозалежно)</value>
|
||||
</data>
|
||||
<data name="lblDisplayNameResource1.Text" xml:space="preserve">
|
||||
<value>НікНейм</value>
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@
|
|||
<value />
|
||||
</data>
|
||||
<data name="lblCaptchaResource1.Text" xml:space="preserve">
|
||||
<value>验证码（大小写敏感）：</value>
|
||||
<value>验证码（大小写敏感）</value>
|
||||
</data>
|
||||
<data name="lblDisplayNameResource1.Text" xml:space="preserve">
|
||||
<value>显示名称</value>
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@
|
|||
<value />
|
||||
</data>
|
||||
<data name="lblCaptchaResource1.Text" xml:space="preserve">
|
||||
<value>Control Text (case sensitive):</value>
|
||||
<value>Control Text (case sensitive)</value>
|
||||
</data>
|
||||
<data name="lblDisplayNameResource1.Text" xml:space="preserve">
|
||||
<value>Display Name</value>
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@
|
|||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="vertical-align: top;"><p style="text-align: right;"><asp:Literal ID="lblCaptcha" runat="server" Text="Control Text (case sensitive):" meta:resourcekey="lblCaptchaResource1" /></p></td>
|
||||
<td style="vertical-align: top;"><p style="text-align: right;"><asp:Literal ID="lblCaptcha" runat="server" Text="Control Text (case sensitive)" meta:resourcekey="lblCaptchaResource1" />:</p></td>
|
||||
<td><st:Captcha ID="captcha" runat="server" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
|
|||
2
WebApplication/Register.aspx.designer.cs
generated
2
WebApplication/Register.aspx.designer.cs
generated
|
|
@ -1,7 +1,7 @@
|
|||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Runtime Version:2.0.50727.3082
|
||||
// Runtime Version:2.0.50727.4927
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue