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

StationDetailsActivity: use german translation "Gleis" only for trains, otherwise use "Steig"

Browse source
This commit is contained in:
Julius Babies 2023-04-21 08:56:22 +00:00 • committed by Andreas Schildbach
parent 6fb89c878c
commit 1c353469cd
3 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
oeffi/res/values-de/strings.xml
View file

@ -355,6 +355,7 @@
<string name="time_hours">%1$dh&#x2009;%2$02d&#x200a;min</string> <string name="time_hours">%1$dh&#x2009;%2$02d&#x200a;min</string>
<!-- position --> <!-- position -->
<string name="position_platform">Gleis %s</string> <string name="position_platform_train">Gleis %s</string>
<string name="position_platform">Steig %s</string>
</resources> </resources>

1
oeffi/res/values/strings.xml
View file

@ -357,6 +357,7 @@
<string name="time_hours">%1$dh&#x2009;%2$02d&#x200a;min</string> <string name="time_hours">%1$dh&#x2009;%2$02d&#x200a;min</string>
<!-- position --> <!-- position -->
<string name="position_platform_train">platform %s</string>
<string name="position_platform">platform %s</string> <string name="position_platform">platform %s</string>
</resources> </resources>

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

@ -58,6 +58,7 @@ import de.schildbach.pte.dto.Line;
import de.schildbach.pte.dto.LineDestination; import de.schildbach.pte.dto.LineDestination;
import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.Location;
import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.LocationType;
import de.schildbach.pte.dto.Product;
import de.schildbach.pte.dto.QueryDeparturesResult; import de.schildbach.pte.dto.QueryDeparturesResult;
import de.schildbach.pte.dto.StationDepartures; import de.schildbach.pte.dto.StationDepartures;
import org.osmdroid.util.GeoPoint; import org.osmdroid.util.GeoPoint;
@ -69,6 +70,7 @@ import java.io.IOException;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.EnumSet;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@ -693,9 +695,17 @@ public class StationDetailsActivity extends OeffiActivity implements StationsAwa
itemView.setOnClickListener(null); itemView.setOnClickListener(null);
} }
// position // position: use german translation "Gleis" only for trains, otherwise use "Steig"
positionView.setText(departure.position != null ? Constants.DESTINATION_ARROW_INVISIBLE_PREFIX boolean isTrain = departure.line.product != null &&
+ context.getString(R.string.position_platform, departure.position) : null); EnumSet.of(Product.HIGH_SPEED_TRAIN, Product.REGIONAL_TRAIN, Product.SUBURBAN_TRAIN,
Product.SUBWAY).contains(departure.line.product);
positionView.setText(departure.position != null ?
Constants.DESTINATION_ARROW_INVISIBLE_PREFIX +
context.getString(isTrain ?
R.string.position_platform_train :
R.string.position_platform,
departure.position) :
null);
// capacity // capacity
final int[] capacity = departure.capacity; final int[] capacity = departure.capacity;