Mastodon
/
moshidon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/language-selector'

This commit is contained in:
sk 2022-12-10 22:30:25 +01:00
parent 661f545e35 231ea46f9f
commit 32a2c66c34
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
View File

@ -683,7 +683,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
languageMenu.add(0, allLanguages.indexOf(l), Menu.NONE, getActivity().getString(R.string.sk_language_name, l.getDefaultName(), l.getLanguageName())); languageMenu.add(0, allLanguages.indexOf(l), Menu.NONE, getActivity().getString(R.string.sk_language_name, l.getDefaultName(), l.getLanguageName()));
} }
SubMenu allLanguagesMenu = languageMenu.addSubMenu(R.string.sk_all_languages); SubMenu allLanguagesMenu = languageMenu.addSubMenu(R.string.sk_available_languages);
for (int i = 0; i < allLanguages.size(); i++) { for (int i = 0; i < allLanguages.size(); i++) {
MastodonLanguage l = allLanguages.get(i); MastodonLanguage l = allLanguages.get(i);
allLanguagesMenu.add(0, i, Menu.NONE, getActivity().getString(R.string.sk_language_name, l.getDefaultName(), l.getLanguageName())); allLanguagesMenu.add(0, i, Menu.NONE, getActivity().getString(R.string.sk_language_name, l.getDefaultName(), l.getLanguageName()));

2
mastodon/src/main/res/values/strings_sk.xml
View File

@ -52,7 +52,7 @@
<string name="sk_translate_show_original">Show original</string> <string name="sk_translate_show_original">Show original</string>
<string name="sk_translated_using">Translated using %s</string> <string name="sk_translated_using">Translated using %s</string>
<string name="sk_post_language">Language: %s</string> <string name="sk_post_language">Language: %s</string>
<string name="sk_all_languages">All languages</string> <string name="sk_available_languages">Available languages</string>
<string name="sk_language_name">%s (%s)</string> <string name="sk_language_name">%s (%s)</string>
<string name="sk_clear_recent_languages">Clear recent languages</string> <string name="sk_clear_recent_languages">Clear recent languages</string>
<string name="sk_confirm_clear_recent_languages">Are you sure you want to clear your recently used languages?</string> <string name="sk_confirm_clear_recent_languages">Are you sure you want to clear your recently used languages?</string>