Skip to content

Commit

Permalink
Add localisation for RU edit milestone
Browse files Browse the repository at this point in the history
  • Loading branch information
phansier committed Dec 17, 2017
1 parent 177aff9 commit be4ea89
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -84,7 +85,7 @@ public static Intent createIntent(final Milestone milestone,

private EditText descriptionText;

private EditText dateText;
private TextView dateText;

private MilestoneDialog milestoneDialog;

Expand All @@ -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);
Expand Down
20 changes: 10 additions & 10 deletions app/src/main/res/layout/milestone_edit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -87,7 +87,7 @@
android:minLines="5"
android:inputType="textMultiLine"
android:lines="5"
android:text="@string/description" />
/>

<LinearLayout
android:id="@+id/ll_textviews"
Expand All @@ -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"
Expand Down Expand Up @@ -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>

Expand All @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
3 changes: 3 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

0 comments on commit be4ea89

Please sign in to comment.