s416084/find-my-tutor-android
1
0
Fork 0
Code Issues Pull Requests Releases 9 Wiki Activity

Merge branch 'develop' into bottomNavHighlighytAndBlackListStringsFix

Browse Source
This commit is contained in:
Domagalski 2019-01-08 23:08:08 +01:00
commit ae3c355259
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java
View File

@ -342,7 +342,7 @@ public class MapActivity extends BaseActivity
Button dismissButton = alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE);
dismissButton.setOnClickListener(view1 -> {
PrefUtils.putCurrentManualLocationName(getApplicationContext(), "Inne");
PrefUtils.putCurrentManualLocationName(getApplicationContext(), getString(R.string.other_location));
PrefUtils.putCurrentManualLocation(getApplicationContext(), "-1");
alertDialog.dismiss();

9
app/src/main/res/values-pl/strings.xml
View File

@ -279,5 +279,14 @@
<string name="floor">Piętro</string>
<string name="block_the_users">Zablokuj użytkowników</string>
<string name="be_visible_for_these_users">Bądź dostępny dla użytkowników</string>
<!--(ENG) Sharing Modes -->
<string name="manual_mode">manual</string>
<string name="exact_mode">exact</string>
<string name="approx_mode">approximate</string>
<!--(ENG) Undefined manual -->
<string name="other_location">Not saved location.</string>
</resources>

4
app/src/main/res/values/strings.xml
View File

@ -444,9 +444,9 @@
"For example, position the FAB to one side of stream of a cards so the FAB won’t interfere "
"when a user tries to pick up one of cards.\n\n"
</string>
<string name="manual_mode">manualny</string>
<string name="exact_mode">dokładny</string>
<string name="approx_mode">przybliżony</string>
<string name="other_location">Niezapisana lokalizacja.</string>
</resources>