From 7cf95d12da3988b9a7bf86d92cfe651216c8159e Mon Sep 17 00:00:00 2001 From: Thomas Date: Sun, 31 Oct 2021 18:12:58 +0100 Subject: [PATCH] Fix issue #532 --- .../android/client/Entities/PeertubeInformation.java | 1 + .../fedilab/android/fragments/ContentSettingsFragment.java | 4 ++++ .../main/java/app/fedilab/android/helper/BaseHelper.java | 7 +++++-- app/src/main/res/values/strings.xml | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/client/Entities/PeertubeInformation.java b/app/src/main/java/app/fedilab/android/client/Entities/PeertubeInformation.java index 8197e372d..451d3422d 100644 --- a/app/src/main/java/app/fedilab/android/client/Entities/PeertubeInformation.java +++ b/app/src/main/java/app/fedilab/android/client/Entities/PeertubeInformation.java @@ -38,6 +38,7 @@ public class PeertubeInformation { aMap.put("cs", "cs-CZ"); aMap.put("zh-CN", "zh-Hans-CN"); aMap.put("zh-TW", "zh-Hans-TW"); + aMap.put("sc", "sc"); langueMapped = aMap; } diff --git a/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java b/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java index dcb175207..925be257d 100644 --- a/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java @@ -2564,6 +2564,10 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "szl"); editor.commit(); break; + case 23: + editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "sc"); + editor.commit(); + break; } PackageManager packageManager = context.getPackageManager(); diff --git a/app/src/main/java/app/fedilab/android/helper/BaseHelper.java b/app/src/main/java/app/fedilab/android/helper/BaseHelper.java index 396e2973c..361790d37 100644 --- a/app/src/main/java/app/fedilab/android/helper/BaseHelper.java +++ b/app/src/main/java/app/fedilab/android/helper/BaseHelper.java @@ -255,7 +255,7 @@ public class BaseHelper { public static final String TAG = "mastodon_etalab"; public static final String CLIENT_NAME_VALUE = "Fedilab"; public static final String OAUTH_SCOPES = "read write follow push"; - public static final String OAUTH_SCOPES_ADMIN = "read write follow push admin:read admin:write admin"; + public static final String OAUTH_SCOPES_ADMIN = "read write follow push admin:read admin:write"; public static final String OAUTH_SCOPES_PEERTUBE = "user"; public static final String PREF_KEY_OAUTH_TOKEN = "oauth_token"; @@ -3787,13 +3787,15 @@ public class BaseHelper { return 21; case "szl": return 22; + case "sc": + return 23; default: return 0; } } public static String[] getLocales(Context context) { - String[] locale = new String[23]; + String[] locale = new String[24]; locale[0] = context.getString(R.string.default_language); locale[1] = context.getString(R.string.english); locale[2] = context.getString(R.string.french); @@ -3817,6 +3819,7 @@ public class BaseHelper { locale[20] = context.getString(R.string.kabyle); locale[21] = context.getString(R.string.catalan); locale[22] = context.getString(R.string.silesian); + locale[23] = context.getString(R.string.sardinian); return locale; } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0c11a237b..de2b8d1fc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -707,6 +707,7 @@ Українська Русский Norsk + Sarda Media only Show NSFW Crowdin translations