From c55578c8ae5e9031f3525418883a3d34e11334da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20Wrzeszczy=C5=84ski?= Date: Tue, 8 Jan 2019 23:31:07 +0100 Subject: [PATCH 1/2] Fix typo --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2119d2a..cd6522f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -337,7 +337,7 @@ Currently, there are no\nactive users. Currently, there are no\noffline users. - Only online users + Only active users No such a user Network Error ! From 5dcaca9dd26e78bf5224f944be9f21b719fae02f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20Wrzeszczy=C5=84ski?= Date: Tue, 8 Jan 2019 23:41:30 +0100 Subject: [PATCH 2/2] Fix strings --- .../uam/wmi/findmytutor/activity/MapActivity.java | 7 +++++-- app/src/main/res/values-pl/strings.xml | 11 +++++------ app/src/main/res/values/strings.xml | 12 ++++++++---- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java index b7a39e2..4688914 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java @@ -208,8 +208,11 @@ public class MapActivity extends BaseActivity } String sharingLevelToRender = sharingLevel; +Log.e("LOCALE",PrefUtils.getLocale(getApplicationContext())); - if (PrefUtils.getLocale(getApplicationContext()).equals("pl")) { + if (PrefUtils.getLocale(getApplicationContext()).equals("pl") || + PrefUtils.getLocale(getApplicationContext()).equals("pl-PL") || + PrefUtils.getLocale(getApplicationContext()).equals("[pl-PL]")) { if (sharingLevel.equals(SharingLevel.MANUAL.toString())) { sharingLevelToRender = getString(R.string.manual_mode); } else if (sharingLevel.equals(SharingLevel.EXACT.toString())) { @@ -648,7 +651,7 @@ public class MapActivity extends BaseActivity public void searchUser(String textToSearch) { getUserFromApi(textToSearch); - Log.e("LOCALE",LocaleUtils.getCurrentLocale()); + Log.e("LOCALE", LocaleUtils.getCurrentLocale()); } private void getUserFromApi(String userNameToSearch) { diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 5f99fa4..da9c071 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -280,13 +280,12 @@ Zablokuj użytkowników Bądź dostępny dla użytkowników - - manual - exact - approximate + manualny + dokładny + przybliżony + Niezapisana lokalizacja. + - - Not saved location. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cd6522f..6b9c670 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -445,8 +445,12 @@ "when a user tries to pick up one of cards.\n\n" - manualny - dokładny - przybliżony - Niezapisana lokalizacja. + + + manual + exact + approximate + + + Not saved location.