Improved labels for the finishing in the app

This commit is contained in:
Armin Zamani committed 2013-04-14 20:13:50 +08:00
1 parent 7dced14016
commit 7bb49f219b
5 files changed
+6 -5

No files matched your search

@@ -113,7 +113,7 @@
android:id="@+id/buttonPositioning"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="Change positioning"
android:text="Set positionings"
android:textSize="14pt"
android:gravity="center_vertical|center_horizontal"
android:ems="10" />
@@ -23,7 +23,8 @@
<string name="current_time">Current time</string>
<string name="race_finished_template">%s is finished</string>
<string name="race_first_boat_finished">First boat finished at:</string>
<string name="race_time_limit" formatted="false">First finisher at %s, Race finishing limit is at %s</string>
<string name="race_first_finisher_and_time_limit" formatted="false">First finisher at %s, Race finishing limit is at %s</string>
<string name="race_time_limit">Race finishing limit is at %s</string>
<string name="choose_startmode">Choose the start mode for this race</string>
<string name="choose_abort_mode">Select the flags you want to display</string>
<string name="choose_abort_flag_mode">Select the aborting flag mode</string>
@@ -81,7 +81,7 @@ public class FinishedRaceFragment extends RaceFragment {
private CharSequence getTimeLimitText() {
TimePoint timeLimit = getTimeLimit();
if (timeLimit != null) {
return String.format("%s %s", getString(R.string.race_time_limit),
return String.format(getString(R.string.race_time_limit),
getFormattedTime(timeLimit.asDate()));
}
return getString(R.string.empty);
@@ -99,7 +99,7 @@ public class FinishingRaceFragment extends RaceFragment {
private CharSequence getTimeLimitText() {
TimePoint timeLimit = getTimeLimit();
if (timeLimit != null) {
return String.format(getString(R.string.race_time_limit),
return String.format(getString(R.string.race_first_finisher_and_time_limit),
getFormattedTime(getRace().getState().getFinishingStartTime().asDate()), getFormattedTime(timeLimit.asDate()));
}
return getString(R.string.empty);
@@ -55,7 +55,7 @@ public class PositioningFragment extends RaceDialogFragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
if (isDialog()) {
getDialog().setTitle("Change positioning");
getDialog().setTitle("Set positionings");
}
return inflater.inflate(R.layout.race_positioning_view, container, false);
}