mirrors/oeffi
1
0
Fork 0
mirror of https://gitlab.com/oeffi/oeffi.git synced 2025-07-07 19:08:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix implied default locale when invoking String.format().

Browse source
This commit is contained in:
Andreas Schildbach 2019-10-26 20:46:12 +02:00
parent 3c7d5a21a9
commit 0514ca2cc1
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java
View file

@ -552,7 +552,7 @@ public class TripDetailsActivity extends OeffiActivity implements LocationListen
.setText(fareTypes[fare.type.ordinal()]); .setText(fareTypes[fare.type.ordinal()]);
((TextView) fareRow.findViewById(R.id.directions_trip_details_fare_entry_row_name)).setText(fare.name); ((TextView) fareRow.findViewById(R.id.directions_trip_details_fare_entry_row_name)).setText(fare.name);
((TextView) fareRow.findViewById(R.id.directions_trip_details_fare_entry_row_fare)) ((TextView) fareRow.findViewById(R.id.directions_trip_details_fare_entry_row_fare))
.setText(String.format("%s%.2f", fare.currency.getSymbol(), fare.fare)); .setText(String.format(Locale.US, "%s%.2f", fare.currency.getSymbol(), fare.fare));
final TextView unitView = (TextView) fareRow final TextView unitView = (TextView) fareRow
.findViewById(R.id.directions_trip_details_fare_entry_row_unit); .findViewById(R.id.directions_trip_details_fare_entry_row_unit);
if (fare.units != null && fare.unitName != null) if (fare.units != null && fare.unitName != null)

3
oeffi/src/de/schildbach/oeffi/stations/NearestFavoriteStationWidgetListService.java
View file

@ -19,6 +19,7 @@ package de.schildbach.oeffi.stations;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Locale;
import de.schildbach.oeffi.Constants; import de.schildbach.oeffi.Constants;
import de.schildbach.oeffi.R; import de.schildbach.oeffi.R;
@ -127,7 +128,7 @@ public class NearestFavoriteStationWidgetListService extends RemoteViewsService
? predictedTime.getTime() - plannedTime.getTime() : 0; ? predictedTime.getTime() - plannedTime.getTime() : 0;
final long delayMins = delay / DateUtils.MINUTE_IN_MILLIS; final long delayMins = delay / DateUtils.MINUTE_IN_MILLIS;
views.setViewVisibility(R.id.station_widget_entry_delay, delayMins != 0 ? View.VISIBLE : View.GONE); views.setViewVisibility(R.id.station_widget_entry_delay, delayMins != 0 ? View.VISIBLE : View.GONE);
final SpannableString delayStr = new SpannableString(String.format("(%+d)", delayMins)); final SpannableString delayStr = new SpannableString(String.format(Locale.US, "(%+d)", delayMins));
delayStr.setSpan(new StyleSpan(isPredicted ? Typeface.BOLD_ITALIC : Typeface.BOLD), 0, delayStr.length(), delayStr.setSpan(new StyleSpan(isPredicted ? Typeface.BOLD_ITALIC : Typeface.BOLD), 0, delayStr.length(),
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
views.setTextViewText(R.id.station_widget_entry_delay, delayStr); views.setTextViewText(R.id.station_widget_entry_delay, delayStr);

3
oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java
View file

@ -26,6 +26,7 @@ import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.regex.Matcher; import java.util.regex.Matcher;
@ -780,7 +781,7 @@ public class StationDetailsActivity extends OeffiActivity implements StationsAwa
final long delay = predictedTime != null && plannedTime != null final long delay = predictedTime != null && plannedTime != null
? predictedTime.getTime() - plannedTime.getTime() : 0; ? predictedTime.getTime() - plannedTime.getTime() : 0;
final long delayMins = delay / DateUtils.MINUTE_IN_MILLIS; final long delayMins = delay / DateUtils.MINUTE_IN_MILLIS;
delayView.setText(delayMins != 0 ? String.format("(%+d)", delayMins) + ' ' : ""); delayView.setText(delayMins != 0 ? String.format(Locale.US, "(%+d)", delayMins) + ' ' : "");
delayView.setTypeface(Typeface.DEFAULT, isPredicted ? Typeface.ITALIC : Typeface.NORMAL); delayView.setTypeface(Typeface.DEFAULT, isPredicted ? Typeface.ITALIC : Typeface.NORMAL);
// line // line