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

Merge branch 'fix-trans' of s416084/find-my-tutor-android into develop

Browse Source
This commit is contained in:
Mieszko Wrzeszczyński 2019-01-08 22:42:12 +00:00 committed by Gogs
commit b7b284252b
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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())) {

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

@ -280,13 +280,12 @@
<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>
<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>
<!--(ENG) Undefined manual -->
<string name="other_location">Not saved location.</string>
</resources>

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

@ -337,7 +337,7 @@
<!--(ENG) Checkbox online users list -->
<string name="no_online_users">Currently, there are no\nactive users.</string>
<string name="no_offline_users">Currently, there are no\noffline users.</string>
<string name="only_online_users">Only online users</string>
<string name="only_online_users">Only active users</string>
<string name="no_such_a_user">No such a user</string>
<string name="network_err">Network Error !</string>
@ -445,8 +445,12 @@
"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>
<!--(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>