Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Introduce R.string.ltr_or_rtl_combine to get better translations

Browse source
This commit is contained in:
Victor Shcherb 2020-01-07 20:16:28 +01:00
parent be7281b34e
commit 3fa17b5997
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,7 @@
Thx - Hardy Thx - Hardy
--> -->
<string name="ltr_or_rtl_combine">%1$s: %2$s</string>
<string name="reset_confirmation_descr">By clicking %1$s, you will lose all your changes.</string> <string name="reset_confirmation_descr">By clicking %1$s, you will lose all your changes.</string>
<string name="reset_all_profile_settings_descr">All profile settings will be reset to the state after installation.</string> <string name="reset_all_profile_settings_descr">All profile settings will be reset to the state after installation.</string>
<string name="reset_all_profile_settings">Reset all profile settings to default?</string> <string name="reset_all_profile_settings">Reset all profile settings to default?</string>

7
OsmAnd/src/net/osmand/plus/settings/CoordinatesFormatFragment.java
View file

@ -77,9 +77,8 @@ public class CoordinatesFormatFragment extends BaseSettingsFragment {
String formattedCoordinates = OsmAndFormatter.getFormattedCoordinates(lat, lon, format); String formattedCoordinates = OsmAndFormatter.getFormattedCoordinates(lat, lon, format);
if (format == PointDescription.UTM_FORMAT) { if (format == PointDescription.UTM_FORMAT) {
SpannableStringBuilder spannableBuilder = new SpannableStringBuilder(); SpannableStringBuilder spannableBuilder = new SpannableStringBuilder();
spannableBuilder.append(getString(R.string.shared_string_example)); String combined = getString(R.string.ltr_or_rtl_combine, getString(R.string.shared_string_example), formattedCoordinates);
spannableBuilder.append(": "); spannableBuilder.append(combined);
spannableBuilder.append(formattedCoordinates);
spannableBuilder.append("\n"); spannableBuilder.append("\n");
spannableBuilder.append(getString(R.string.utm_format_descr)); spannableBuilder.append(getString(R.string.utm_format_descr));
@ -106,7 +105,7 @@ public class CoordinatesFormatFragment extends BaseSettingsFragment {
return spannableBuilder; return spannableBuilder;
} }
return getString(R.string.shared_string_example) + ": " + formattedCoordinates; return getString(R.string.ltr_or_rtl_combine, getString(R.string.shared_string_example), formattedCoordinates);
} }
@Override @Override