From be4ea8947797248c3d2effc951a95308b97bc0b8 Mon Sep 17 00:00:00 2001
From: phansier <beryukhov-andrey@yandex.ru>
Date: Sun, 17 Dec 2017 19:04:20 +0300
Subject: [PATCH] Add localisation for RU edit milestone

---
 .../ui/milestone/EditMilestoneActivity.java   |  5 +++--
 app/src/main/res/layout/milestone_edit.xml    | 20 +++++++++----------
 app/src/main/res/values-ru/strings.xml        |  3 +++
 app/src/main/res/values/strings.xml           |  3 +++
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/github/mobile/ui/milestone/EditMilestoneActivity.java b/app/src/main/java/com/github/mobile/ui/milestone/EditMilestoneActivity.java
index 202808c3..7a43fbb1 100644
--- a/app/src/main/java/com/github/mobile/ui/milestone/EditMilestoneActivity.java
+++ b/app/src/main/java/com/github/mobile/ui/milestone/EditMilestoneActivity.java
@@ -14,6 +14,7 @@
 import android.widget.Button;
 import android.widget.DatePicker;
 import android.widget.EditText;
+import android.widget.TextView;
 
 import com.github.mobile.Intents;
 import com.github.mobile.R;
@@ -84,7 +85,7 @@ public static Intent createIntent(final Milestone milestone,
 
     private EditText descriptionText;
 
-    private EditText dateText;
+    private TextView dateText;
 
     private MilestoneDialog milestoneDialog;
 
@@ -107,7 +108,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         titleText = finder.find(R.id.et_milestone_title);
         descriptionText = finder.find(R.id.et_milestone_description);
-        dateText = finder.find(R.id.et_milestone_date);
+        dateText = finder.find(R.id.tv_milestone_date);
         Button twoWeeksButton = finder.find(R.id.b_two_weeks);
         Button monthButton = finder.find(R.id.b_month);
         Button chooseDateButton = finder.find(R.id.b_choose_date);
diff --git a/app/src/main/res/layout/milestone_edit.xml b/app/src/main/res/layout/milestone_edit.xml
index 24ef9283..fe19e576 100644
--- a/app/src/main/res/layout/milestone_edit.xml
+++ b/app/src/main/res/layout/milestone_edit.xml
@@ -62,7 +62,7 @@
                 android:layout_alignStart="@+id/tv_milestone_title"
                 android:layout_below="@+id/tv_milestone_title"
                 android:layout_marginTop="10dp"
-                android:text="@string/title" />
+                />
 
             <TextView
                 android:id="@+id/tv_milestone_description"
@@ -77,7 +77,7 @@
 
             <EditText
                 android:id="@+id/et_milestone_description"
-                style="@style/FormalSingleLineEditText"
+                style="@style/FormalMultiLineEditText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignEnd="@+id/et_milestone_title"
@@ -87,7 +87,7 @@
                 android:minLines="5"
                 android:inputType="textMultiLine"
                 android:lines="5"
-                android:text="@string/description" />
+                 />
 
             <LinearLayout
                 android:id="@+id/ll_textviews"
@@ -99,13 +99,13 @@
                 android:layout_marginTop="10dp">
 
                 <TextView
-                    android:id="@+id/tv_milestone_date"
+                    android:id="@+id/tv_milestone_date_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Date:" />
+                    android:text="@string/ms_due_by" />
 
-                <EditText
-                    android:id="@+id/et_milestone_date"
+                <TextView
+                    android:id="@+id/tv_milestone_date"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textColor="@color/text"
@@ -134,14 +134,14 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="2 weeks" />
+                    android:text="@string/ms_date_2_weeks" />
 
                 <Button
                     android:id="@+id/b_month"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="month" />
+                    android:text="@string/ms_date_month" />
 
             </LinearLayout>
 
@@ -153,7 +153,7 @@
                 android:layout_alignStart="@+id/ll_buttons"
                 android:layout_below="@+id/ll_buttons"
                 android:layout_marginTop="15dp"
-                android:text="Choose date" />
+                android:text="@string/ms_choose_date" />
 
         </RelativeLayout>
     </ScrollView>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 7294215a..d2b05ede 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -347,5 +347,8 @@
     <string name="ms_closed_issues">"Закрытые: "</string>
     <string name="ms_due_by">"До "</string>
     <string name="ms_opened_issues">"Открытые: "</string>
+    <string name="ms_choose_date">Выбрать дату</string>
+    <string name="ms_date_2_weeks">2 недели</string>
+    <string name="ms_date_month">Месяц</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7d4b3970..3349de12 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -350,5 +350,8 @@
     <string name="ms_opened_issues">Opened:</string>
     <string name="ms_closed_issues">Closed:</string>
     <string name="new_milestone">New milestone</string>
+    <string name="ms_date_2_weeks">2 weeks</string>
+    <string name="ms_date_month">month</string>
+    <string name="ms_choose_date">Choose date</string>
 
 </resources>