From d1d747b20ab92ea87024cceb386eb8b38f4f74b2 Mon Sep 17 00:00:00 2001
From: inga-lovinde <52715130+inga-lovinde@users.noreply.github.com>
Date: Sun, 21 Nov 2010 17:19:41 +0000
Subject: [PATCH] I18n coverage improved

---
 Builder/IISMainHandler/build.txt      |   2 +-
 templates/Messages.xslt               |  99 +++++++++++++++++++
 templates/Modern/AvatarsSettings.xslt |  23 +++--
 templates/Modern/Board.xslt           |   6 +-
 templates/Modern/BoardAsThread.xslt   |   6 +-
 templates/Modern/Boards.xslt          | 136 +++++++++++---------------
 templates/Modern/Conversation.xslt    |   6 +-
 templates/Modern/Conversations.xslt   |   6 +-
 templates/Modern/Exception.xslt       |  15 ++-
 9 files changed, 193 insertions(+), 106 deletions(-)

diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt
index fe3b82a..91917fa 100644
--- a/Builder/IISMainHandler/build.txt
+++ b/Builder/IISMainHandler/build.txt
@@ -1 +1 @@
-1791
\ No newline at end of file
+1799
\ No newline at end of file
diff --git a/templates/Messages.xslt b/templates/Messages.xslt
index af7ff26..73cf7aa 100644
--- a/templates/Messages.xslt
+++ b/templates/Messages.xslt
@@ -28,6 +28,105 @@
 		<xsl:otherwise>Current avatars</xsl:otherwise>
 	</xsl:choose></xsl:template>
 
+	<xsl:template name="Messages_DisableAvatar"><xsl:choose>
+		<xsl:when test="$lang='ru'">Отключить аватарку</xsl:when>
+		<xsl:otherwise>Disable avatar</xsl:otherwise>
+	</xsl:choose></xsl:template>
+
+	<xsl:template name="Messages_UploadNewAvatar"><xsl:choose>
+		<xsl:when test="$lang='ru'">Выберите аватарку для загрузки</xsl:when>
+		<xsl:otherwise>Upload new avatar</xsl:otherwise>
+	</xsl:choose></xsl:template>
+
+	<xsl:template name="Messages_MaxAvatarSize"><xsl:choose>
+		<xsl:when test="$lang='ru'">Максимальный размер файла &#8211; 80КБ, допустимые разрешения: gif, jpg, png, svg, jpe, jpeg, jfif, jif</xsl:when>
+		<xsl:otherwise>File size should be less than 80KB; only gif, jpg, png, svg, jpe, jpeg, jfif, jif are allowed</xsl:otherwise>
+	</xsl:choose></xsl:template>
+
+	<xsl:template name="Messages_UploadButton"><xsl:choose>
+		<xsl:when test="$lang='ru'">Загрузить!</xsl:when>
+		<xsl:otherwise>Upload!</xsl:otherwise>
+	</xsl:choose></xsl:template>
+
+	<xsl:template name="Messages_NewAvatarFromUpload"><xsl:choose>
+		<xsl:when test="$lang='ru'">...или укажите номер файла в аплоаде</xsl:when>
+		<xsl:otherwise>...or, alternatively, you may enter uploaded entry id</xsl:otherwise>
+	</xsl:choose></xsl:template>
+
+	<xsl:template name="Messages_SubmitButton"><xsl:choose>
+		<xsl:when test="$lang='ru'">Отправить!</xsl:when>
+		<xsl:otherwise>Submit!</xsl:otherwise>
+	</xsl:choose></xsl:template>
+
+	<xsl:template name="Messages_SetAvatarAsDefault"><xsl:choose>
+		<xsl:when test="$lang='ru'">Сделать стандартной</xsl:when>
+		<xsl:otherwise>Make it my default avatar</xsl:otherwise>
+	</xsl:choose></xsl:template>
+
+	<xsl:template name="Messages_Remove"><xsl:choose>
+		<xsl:when test="$lang='ru'">Удалить</xsl:when>
+		<xsl:otherwise>Remove</xsl:otherwise>
+	</xsl:choose></xsl:template>
+
+	<xsl:template name="Messages_PageOuter"><xsl:choose>
+		<xsl:when test="$lang='ru'">страницы</xsl:when>
+		<xsl:otherwise>pages</xsl:otherwise>
+	</xsl:choose></xsl:template>
+
+	<xsl:template name="Messages_YouAreXXX">
+		<xsl:param name="userLink"/>
+		<xsl:choose>
+			<xsl:when test="$lang='ru'">Вы вошли в форум как <xsl:copy-of select="$userLink"/></xsl:when>
+			<xsl:otherwise>You are using <xsl:copy-of select="$userLink"/> username</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
+	<xsl:template name="Messages_YouAreAnonymous"><xsl:choose>
+		<xsl:when test="$lang='ru'">Вы не вошли в форум</xsl:when>
+		<xsl:otherwise>You are not logged in</xsl:otherwise>
+	</xsl:choose></xsl:template>
+
+	<xsl:template name="Messages_TotalRegisteredUsers">
+		<xsl:param name="usersNumber"/>
+		<xsl:choose>
+			<xsl:when test="$lang='ru'"><xsl:value-of select="$usersNumber"/> зарегистрированных пользователей</xsl:when>
+			<xsl:otherwise>Total <xsl:value-of select="$usersNumber"/> users registered</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
+	<xsl:template name="Messages_TotalOnlineUsers">
+		<xsl:param name="threshold"/>
+		<xsl:param name="sessionsNumber"/>
+		<xsl:choose>
+			<xsl:when test="$lang='ru'">За последние <xsl:value-of select="$threshold"/> минут форум посещало <xsl:value-of select="$sessionsNumber"/> зарегистрированных пользователей</xsl:when>
+			<xsl:otherwise>There were <xsl:value-of select="$sessionsNumber"/> registered users active during last <xsl:value-of select="$threshold"/> minutes</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
+	<xsl:template name="Messages_LastPosts"><xsl:choose>
+		<xsl:when test="$lang='ru'">Последние сообщения</xsl:when>
+		<xsl:otherwise>Last posts</xsl:otherwise>
+	</xsl:choose></xsl:template>
+
+	<xsl:template name="Messages_LastThreads"><xsl:choose>
+		<xsl:when test="$lang='ru'">Последние темы</xsl:when>
+		<xsl:otherwise>Last threads</xsl:otherwise>
+	</xsl:choose></xsl:template>
+
+	<xsl:template name="Messages_LastReplies"><xsl:choose>
+		<xsl:when test="$lang='ru'">Последние ответы на мои сообщения</xsl:when>
+		<xsl:otherwise>Last replies to my posts</xsl:otherwise>
+	</xsl:choose></xsl:template>
+
+	<xsl:template name="Messages_LastPollsParticipated"><xsl:choose>
+		<xsl:when test="$lang='ru'">Последние опросы с моим участием</xsl:when>
+		<xsl:otherwise>Last polls i've participated in</xsl:otherwise>
+	</xsl:choose></xsl:template>
+
+	<xsl:template name="Messages_Error"><xsl:choose>
+		<xsl:when test="$lang='ru'">Ошибка</xsl:when>
+		<xsl:otherwise>Error</xsl:otherwise>
+	</xsl:choose></xsl:template>
 
 </xsl:stylesheet>
 
diff --git a/templates/Modern/AvatarsSettings.xslt b/templates/Modern/AvatarsSettings.xslt
index ba9828b..82230da 100644
--- a/templates/Modern/AvatarsSettings.xslt
+++ b/templates/Modern/AvatarsSettings.xslt
@@ -27,7 +27,8 @@
 							<td class="lighttable">
 								<form method="post" action="/do/Avatars/SetAsDefault">
 									<input type="hidden" name="uploadId" value=""/>
-									<input type="submit" class="buttons" value="Отключить аватарку">
+									<input type="submit" class="buttons">
+										<xsl:attribute name="value"><xsl:call-template name="Messages_DisableAvatar"/></xsl:attribute>
 										<xsl:if test="not(/root/currentAvatar)">
 											<xsl:attribute name="disabled">disabled</xsl:attribute>
 										</xsl:if>
@@ -46,19 +47,21 @@
 					<table cellpadding="3" cellspacing="1" width="100%" class="tableborders">
 						<tr>
 							<td class="tdheader">
-								<xsl:text>Выберите аватарку для загрузки</xsl:text>
+								<xsl:call-template name="Messages_UploadNewAvatar"/>
 							</td>
 						</tr>
 						<tr class="darktable">
 							<td>
-								<xsl:text>Максимальный размер файла &#8211; 80КБ, допустимые разрешения: gif, jpg, png, svg, jpe, jpeg, jfif, jif</xsl:text>
+								<xsl:call-template name="Messages_MaxAvatarSize"/>
 							</td> 
 						</tr> 
 						<tr> 
 							<td class="lighttable"> 
 								<form method="post" action="/do/Avatars/Add" enctype="multipart/form-data">
 									<input type="file" name="file" class="formboxes" /><br/>
-									<input type="submit" name="buttlogin" value="Отправить!" class="buttons" /> 
+									<input type="submit" name="buttlogin" class="buttons"> 
+										<xsl:attribute name="value"><xsl:call-template name="Messages_UploadButton"/></xsl:attribute>
+									</input>
 								</form> 
 							</td> 
 						</tr>
@@ -73,14 +76,16 @@
 					<table cellpadding="3" cellspacing="1" width="100%" class="tableborders">
 						<tr class="tdheader"> 
 							<td> 
-								<xsl:text>Или укажите номер файла в аплоаде</xsl:text>
+								<xsl:call-template name="Messages_NewAvatarFromUpload"/>
 							</td> 
 						</tr> 
 						<tr> 
 							<td class="lighttable"> 
 								<form method="post" action="/do/Avatars/Add">
 									<input type="text" name="uploadId"/><br/>
-									<input type="submit" name="buttlogin" value="Отправить!" class="buttons" /> 
+									<input type="submit" name="buttlogin" class="buttons">
+										<xsl:attribute name="value"><xsl:call-template name="Messages_SubmitButton"/></xsl:attribute>
+									</input>
 								</form> 
 							</td> 
 						</tr> 
@@ -103,7 +108,8 @@
 						<input type="hidden" name="uploadId">
 							<xsl:attribute name="value"><xsl:value-of select="id"/></xsl:attribute>
 						</input>
-						<input type="submit" class="buttons" value="Сделать стандартной">
+						<input type="submit" class="buttons">
+							<xsl:attribute name="value"><xsl:call-template name="Messages_SetAvatarAsDefault"/></xsl:attribute>
 							<xsl:if test="/root/currentAvatar/upload/id = id">
 								<xsl:attribute name="disabled">disabled</xsl:attribute>
 							</xsl:if>
@@ -113,7 +119,8 @@
 						<input type="hidden" name="uploadId">
 							<xsl:attribute name="value"><xsl:value-of select="id"/></xsl:attribute>
 						</input>
-						<input type="submit" class="buttons" value="Удалить">
+						<input type="submit" class="buttons">
+							<xsl:attribute name="value"><xsl:call-template name="Messages_Remove"/></xsl:attribute>
 							<xsl:if test="/root/currentAvatar/upload/id = id">
 								<xsl:attribute name="disabled">disabled</xsl:attribute>
 							</xsl:if>
diff --git a/templates/Modern/Board.xslt b/templates/Modern/Board.xslt
index 5fb1009..6c25f4e 100644
--- a/templates/Modern/Board.xslt
+++ b/templates/Modern/Board.xslt
@@ -15,7 +15,8 @@
 			</div>
 		</xsl:if>
 		<div>
-			<xsl:text>страницы:</xsl:text>
+			<xsl:call-template name="Messages_PageOuter"/>
+			<xsl:text>:</xsl:text>
 			<xsl:apply-templates select="threads/pageOuter" mode="withCurrent"/>
 		</div>
 		<div class="threadscontainer">
@@ -29,7 +30,8 @@
 			</div>
 		</div>
 		<div>
-			<xsl:text>страницы:</xsl:text>
+			<xsl:call-template name="Messages_PageOuter"/>
+			<xsl:text>:</xsl:text>
 			<xsl:apply-templates select="threads/pageOuter" mode="withCurrent"/>
 		</div>
 	</xsl:template>
diff --git a/templates/Modern/BoardAsThread.xslt b/templates/Modern/BoardAsThread.xslt
index 7092814..068cfbc 100644
--- a/templates/Modern/BoardAsThread.xslt
+++ b/templates/Modern/BoardAsThread.xslt
@@ -8,14 +8,16 @@
 	<xsl:template name="isLiteEnabled">true</xsl:template>
 	<xsl:template name="specific">
 		<div>
-			<xsl:text>страницы:</xsl:text>
+			<xsl:call-template name="Messages_PageOuter"/>
+			<xsl:text>:</xsl:text>
 			<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
 		</div>
 		<div class="postscontainer">
 			<xsl:apply-templates select="posts/post"/>
 		</div>
 		<div>
-			<xsl:text>страницы:</xsl:text>
+			<xsl:call-template name="Messages_PageOuter"/>
+			<xsl:text>:</xsl:text>
 			<xsl:apply-templates select="posts/pageOuter" mode="withCurrent"/>
 		</div>
 	</xsl:template>
diff --git a/templates/Modern/Boards.xslt b/templates/Modern/Boards.xslt
index 707f23c..531f523 100644
--- a/templates/Modern/Boards.xslt
+++ b/templates/Modern/Boards.xslt
@@ -8,86 +8,62 @@
 		<div class="categoriescontainer">
 			<xsl:apply-templates select="categories/category"/>
 		</div>
-				<br />
-				<table width="95%" align="center" class="tablesurround" cellpadding="1" cellspacing="1">
-					<tr>
-						<td>
-							<table width="100%" class="tableborders" cellpadding="3" cellspacing="1">
-								<tr>
-									<td colspan="3" class="tdheader">
-										<b>Дополнительная информация</b>
-									</td>
-								</tr>
-								<tr class="lighttable">
-									<td width="45%" class="small" valign="top">
-										<xsl:choose>
-											<xsl:when test="session/user">
-												<xsl:text>Вы вошли в форум как </xsl:text>
-												<xsl:apply-templates select="session/user" mode="userLink"/>
-											</xsl:when>
-											<xsl:otherwise>
-												<xsl:text>Вы не вошли в форум</xsl:text>
-											</xsl:otherwise>
-										</xsl:choose>
-										<br />
-										<xsl:value-of select="totalRegistered"/>
-										<xsl:text> Зарегистрированных пользователей.</xsl:text>
-										<br />
-										<!--xsl:text>Приветствуем нового пользователя, </xsl:text>
-										<a href="/showprofile.php?User=_PC&amp;What=ubbthreads">_PC</a>
-										<br /-->
-										<xsl:text>За последние </xsl:text>
-										<xsl:value-of select="activity/threshold"/>
-										<xsl:text> форум посещало </xsl:text>
-										<xsl:value-of select="activity/sessions"/>
-										<xsl:text> зарегистрированных пользователей.</xsl:text>
-										<br />
-										<a>Текущее время:</a><xsl:text> </xsl:text>
-										<xsl:apply-templates select="currentDate" mode="dateTime"/>
-									</td>
-									<td width="30%" class="small" valign="top">
-										<a>
-											<xsl:attribute name="href">/AllPosts/</xsl:attribute>
-											<xsl:text>Последние сообщения</xsl:text>
-										</a>
-										<br />
-										<a>
-											<xsl:attribute name="href">/AllThreads/</xsl:attribute>
-											<xsl:text>Последние темы</xsl:text>
-										</a>
-										<br />
-										<a>
-											<xsl:if test="session/user">
-												<xsl:attribute name="href">/Users/User/<xsl:value-of select="session/user/id"/>/Replies/</xsl:attribute>
-											</xsl:if>
-											<xsl:text>Последние ответы на мои сообщения</xsl:text>
-										</a>
-										<br />
-										<a>
-											<xsl:if test="session/user">
-												<xsl:attribute name="href">/Users/User/<xsl:value-of select="session/user/id"/>/PollsParticipated/</xsl:attribute>
-											</xsl:if>
-											<xsl:text>Последние опросы с моим участием</xsl:text>
-										</a>
-										<br />
-										<a>Мои сообщения с оценками</a>
-										<br />
-										<a>Рейтинги сообщений</a>
-									</td>
-									<td class="small" valign="top">
-										<b>Легенда:</b>
-										<br />
-										<img src="/static/images/newposts.gif" alt="*" />
-										<xsl:text>Новые сообщения</xsl:text>
-										<br />
-										<img src="/static/images/nonewposts.gif" alt="*" />
-										<xsl:text>Нет новых сообщений</xsl:text>
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
+		<p>
+			<xsl:choose>
+				<xsl:when test="session/user">
+					<xsl:call-template name="Messages_YouAreXXX">
+						<xsl:with-param name="userLink">
+							<xsl:apply-templates select="session/user" mode="userLink"/>
+						</xsl:with-param>
+					</xsl:call-template>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:call-template name="Messages_YouAreAnonymous"/>
+				</xsl:otherwise>
+			</xsl:choose>
+			<xsl:text>. </xsl:text>
+			<xsl:call-template name="Messages_TotalRegisteredUsers">
+				<xsl:with-param name="usersNumber">
+					<xsl:value-of select="totalRegistered"/>
+				</xsl:with-param>
+			</xsl:call-template>
+			<xsl:text>. </xsl:text>
+			<xsl:call-template name="Messages_TotalOnlineUsers">
+				<xsl:with-param name="threshold">
+					<xsl:value-of select="activity/threshold"/>
+				</xsl:with-param>
+				<xsl:with-param name="sessionsNumber">
+					<xsl:value-of select="activity/sessions"/>
+				</xsl:with-param>
+			</xsl:call-template>
+			<xsl:text>. </xsl:text>
+		</p>
+		<p>
+			<a>
+				<xsl:attribute name="href">/AllPosts/</xsl:attribute>
+				<xsl:call-template name="Messages_LastPosts"/>
+			</a>
+			<xsl:text>. </xsl:text>
+			<a>
+				<xsl:attribute name="href">/AllThreads/</xsl:attribute>
+				<xsl:call-template name="Messages_LastThreads"/>
+			</a>
+			<xsl:text>. </xsl:text>
+			<a>
+				<xsl:if test="session/user">
+					<xsl:attribute name="href">/Users/User/<xsl:value-of select="session/user/id"/>/Replies/</xsl:attribute>
+				</xsl:if>
+				<xsl:call-template name="Messages_LastReplies"/>
+			</a>
+			<xsl:text>. </xsl:text>
+			<a>
+				<xsl:if test="session/user">
+					<xsl:attribute name="href">/Users/User/<xsl:value-of select="session/user/id"/>/PollsParticipated/</xsl:attribute>
+				</xsl:if>
+				<xsl:call-template name="Messages_LastPollsParticipated"/>
+			</a>
+			<xsl:text>. </xsl:text>
+		</p>
 	</xsl:template>
 
 	<xsl:template match="category">
diff --git a/templates/Modern/Conversation.xslt b/templates/Modern/Conversation.xslt
index 710e5a7..e6b5f75 100644
--- a/templates/Modern/Conversation.xslt
+++ b/templates/Modern/Conversation.xslt
@@ -8,14 +8,16 @@
 	<xsl:template name="isLiteEnabled">true</xsl:template>
 	<xsl:template name="specific">
 		<div>
-			<xsl:text>страницы:</xsl:text>
+			<xsl:call-template name="Messages_PageOuter"/>
+			<xsl:text>:</xsl:text>
 			<xsl:apply-templates select="messages/pageOuter" mode="withCurrent"/>
 		</div>
 		<div class="postscontainer">
 			<xsl:apply-templates select="messages/message"/>
 		</div>
 		<div>
-			<xsl:text>страницы:</xsl:text>
+			<xsl:call-template name="Messages_PageOuter"/>
+			<xsl:text>:</xsl:text>
 			<xsl:apply-templates select="messages/pageOuter" mode="withCurrent"/>
 		</div>
 	</xsl:template>
diff --git a/templates/Modern/Conversations.xslt b/templates/Modern/Conversations.xslt
index fc6b474..262ee42 100644
--- a/templates/Modern/Conversations.xslt
+++ b/templates/Modern/Conversations.xslt
@@ -7,14 +7,16 @@
 	<xsl:template name="isRssEnabled">true</xsl:template>
 	<xsl:template name="specific">
 		<div>
-			<xsl:text>страницы:</xsl:text>
+			<xsl:call-template name="Messages_PageOuter"/>
+			<xsl:text>:</xsl:text>
 			<xsl:apply-templates select="conversations/pageOuter" mode="withCurrent"/>
 		</div>
 		<div class="conversationscontainer">
 			<xsl:apply-templates select="conversations/conversation"/>
 		</div>
 		<div>
-			<xsl:text>страницы:</xsl:text>
+			<xsl:call-template name="Messages_PageOuter"/>
+			<xsl:text>:</xsl:text>
 			<xsl:apply-templates select="conversations/pageOuter" mode="withCurrent"/>
 		</div>
 	</xsl:template>
diff --git a/templates/Modern/Exception.xslt b/templates/Modern/Exception.xslt
index 1009f91..8c92508 100644
--- a/templates/Modern/Exception.xslt
+++ b/templates/Modern/Exception.xslt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1251"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
-	<xsl:template name="specificTitle">Ошибка</xsl:template>
+	<xsl:template name="specificTitle"><xsl:call-template name="Messages_Error"/></xsl:template>
 	<xsl:template name="specific">
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
@@ -9,20 +9,17 @@
 					<table cellpadding="3" cellspacing="1" width="100%" class="tableborders">
 						<tr>
 							<td class="tdheader">
-								<xsl:text>Произошла ошибка</xsl:text>
+								<xsl:call-template name="Messages_Error"/>
 							</td> 
 						</tr>
 						<tr class="lighttable"> 
 							<td>
-								<xsl:text>Тип ошибки: </xsl:text>
-								<xsl:value-of select="exception/type"/>
-								<br/>
-								<xsl:text>Сообщение об ошибке: </xsl:text>
 								<xsl:value-of select="exception/message"/>
-								<br/>
-								<xsl:text>ID ошибки: </xsl:text>
+								<xsl:text> (</xsl:text>
+								<xsl:value-of select="exception/type"/>
+								<xsl:text>, ID </xsl:text>
 								<xsl:value-of select="exception/guid"/>
-								<br/>
+								<xsl:text>)</xsl:text>
 							</td> 
 						</tr> 
 					</table>