Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Add catalan support in languages picker

This commit is contained in:
tom79 2020-02-02 10:26:01 +01:00
parent 11f759106a
commit 60231dd2ee
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java
View File

@ -2530,6 +2530,9 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
case 20:
editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "kab");
editor.commit();
case 21:
editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "ca");
editor.commit();
break;
}

11
app/src/main/java/app/fedilab/android/helper/Helper.java
View File

@ -3937,11 +3937,7 @@ public class Helper {
}
private static void removeOnGlobalLayoutListener(View v, ViewTreeObserver.OnGlobalLayoutListener listener) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
v.getViewTreeObserver().removeGlobalOnLayoutListener(listener);
} else {
v.getViewTreeObserver().removeOnGlobalLayoutListener(listener);
}
v.getViewTreeObserver().removeOnGlobalLayoutListener(listener);
}
public static String getLocalesTwoChars(int stringLocaleId) {
@ -4045,13 +4041,15 @@ public class Helper {
return 19;
case "kab":
return 20;
case "ca":
return 21;
default:
return 0;
}
}
public static String[] getLocales(Context context) {
String[] locale = new String[21];
String[] locale = new String[22];
locale[0] = context.getString(R.string.default_language);
locale[1] = context.getString(R.string.english);
locale[2] = context.getString(R.string.french);
@ -4073,6 +4071,7 @@ public class Helper {
locale[18] = context.getString(R.string.russian);
locale[19] = context.getString(R.string.norwegian);
locale[20] = context.getString(R.string.kabyle);
locale[21] = context.getString(R.string.catalan);
return locale;
}