Merge pull request dubeaud#198 from uspenskiyan/patch-2

Localization patch
philippjenni · Apr 19, 2016 · 77a72f0 · 77a72f0
2 parents f6ce861 + 8ac2763
commit 77a72f0
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 8 deletions.
diff --git a/src/BugNET_WAP/App_GlobalResources/SharedIssueProperties.resx b/src/BugNET_WAP/App_GlobalResources/SharedIssueProperties.resx
@@ -186,4 +186,13 @@
   <data name="NotifyCheckbox" xml:space="preserve">
     <value>Notify</value>
   </data>
-</root>
+  <data name="IssueDescriptionLabel" xml:space="preserve">
+    <value>Description</value>
+  </data>
+  <data name="IssueTitleLabel" xml:space="preserve">
+    <value>Title</value>
+  </data>
+  <data name="NewIssueLiteral" xml:space="preserve">
+    <value>New issue</value>
+  </data>
+</root>
diff --git a/src/BugNET_WAP/App_GlobalResources/SharedIssueProperties.ru-RU.resx b/src/BugNET_WAP/App_GlobalResources/SharedIssueProperties.ru-RU.resx
@@ -136,7 +136,7 @@
     <value>Статус:</value>
   </data>
   <data name="PrivateLabel" xml:space="preserve">
-    <value>Закрытое задание:</value>
+    <value>Скрытое задание:</value>
   </data>
   <data name="ProgressLabel" xml:space="preserve">
     <value>Процент выполнения:</value>
@@ -186,4 +186,13 @@
   <data name="NotifyCheckbox" xml:space="preserve">
     <value>Уведомлять</value>
   </data>
-</root>
+  <data name="IssueDescriptionLabel" xml:space="preserve">
+    <value>Описание:</value>
+  </data>
+  <data name="IssueTitleLabel" xml:space="preserve">
+    <value>Заголовок:</value>
+  </data>
+  <data name="NewIssueLiteral" xml:space="preserve">
+    <value>Новое задание</value>
+  </data>
+</root>
diff --git a/src/BugNET_WAP/Issues/App_LocalResources/CreateIssue.aspx.ru-RU.resx b/src/BugNET_WAP/Issues/App_LocalResources/CreateIssue.aspx.ru-RU.resx
@@ -121,7 +121,7 @@
 		<value>Вложение</value>
 	</data>
 	<data name="AttachmentDescriptionLabel.Text" xml:space="preserve">
-		<value>Описание:</value>
+		<value>Описание вложения:</value>
 	</data>
 	<data name="AttachmentFileLabel.Text" xml:space="preserve">
 		<value>Файл:</value>
@@ -132,4 +132,4 @@
 	<data name="Page.Title" xml:space="preserve">
 		<value>Новое задание</value>
 	</data>
-</root>
+</root>
diff --git a/src/BugNET_WAP/Issues/CreateIssue.aspx b/src/BugNET_WAP/Issues/CreateIssue.aspx
@@ -12,7 +12,7 @@
 <asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="Server">
      <div class="page-header">
         <h1 class="page-title">
-            <asp:Literal ID="Literal1" runat="server" Text="New Issue" /> 
+            <asp:Literal ID="Literal1" runat="server" Text="<%$Resources:SharedIssueProperties, NewIssueLiteral %>" /> 
             <small>
                 <asp:Literal ID="litProject" runat="Server" />
                 <span>(<asp:Literal ID="litProjectCode" runat="Server"></asp:Literal>)</span>
@@ -24,7 +24,7 @@
         <div class="row">
             <div class="col-md-12">
                 <div class="form-group <%= !TitleRequired.IsValid ? "has-error" : "" %>">
-                    <label for="TitleTextBox" class="control-label col-sm-2">Title</label>
+                    <asp:Label ID="IssueTitleLabel" runat="server" CssClass="col-sm-2 control-label" AssociatedControlID="TitleTextBox" Text="<%$Resources:SharedIssueProperties, IssueTitleLabel %>" />
                     <div class="col-sm-10">
                         <asp:TextBox ID="TitleTextBox" CssClass="form-control input-lg" placeholder="<%$ Resources:SharedIssueProperties, IssueTitleWatermark %>" runat="server" />
                         <asp:RequiredFieldValidator ControlToValidate="TitleTextBox" SetFocusOnError="true" ErrorMessage="<%$ Resources:SharedIssueProperties, IssueTitleRequiredErrorMessage %>"
@@ -163,7 +163,7 @@
         <div class="row">
             <div class="col-md-12">
                 <div class="form-group">
-                    <label class="control-label col-sm-2">Description</label>
+                    <asp:Label ID="IssueDescriptionLabel" AssociatedControlID="DescriptionHtmlEditor" runat="server" CssClass="col-sm-2 control-label" Text="<%$Resources:SharedIssueProperties, IssueDescriptionLabel %>" />
                     <div class="col-sm-10">
                         <bn:HtmlEditor ID="DescriptionHtmlEditor" runat="server" />
                     </div>