erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-06 17:05:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

chore(android): Tweak languages strings

Browse source
This commit is contained in:
Darcy Wong 2020-08-24 08:33:09 +07:00
parent 90bdd1f260
commit 542a4db3d5
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeymanSettingsInstallActivity.java
View file

@ -89,7 +89,7 @@ public class KeymanSettingsInstallActivity extends AppCompatActivity {
*/
hashMap = new HashMap<>();
hashMap.put(titleKey, getString(R.string.add_language_to_installed_keyboard));
hashMap.put(titleKey, getString(R.string.add_languages_to_installed_keyboard));
hashMap.put(subtitleKey, getString(R.string.add_language_subtext));
icon = String.valueOf(R.drawable.ic_content_add);
hashMap.put(iconKey, icon);
@ -108,7 +108,7 @@ public class KeymanSettingsInstallActivity extends AppCompatActivity {
if (itemTitle.equals(getString(R.string.install_from_other_device))) {
// Scan QR code not implemented yet
return false;
} else if (itemTitle.equals(getString(R.string.add_language_to_installed_keyboard))) {
} else if (itemTitle.equals(getString(R.string.add_languages_to_installed_keyboard))) {
if (KeyboardController.getInstance().getInstalledPackagesList() == null) {
// Disable if no keyboard packages installed
return false;
@ -155,7 +155,7 @@ public class KeymanSettingsInstallActivity extends AppCompatActivity {
// TODO
// Add language from keyboard package already installed
} else if (itemTitle.equals(getString(R.string.add_language_to_installed_keyboard))) {
} else if (itemTitle.equals(getString(R.string.add_languages_to_installed_keyboard))) {
Intent intent = new Intent(context, SelectPackageActivity.class);
context.startActivity(intent);
}

2
android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/SelectLanguageFragment.java
View file

@ -107,7 +107,7 @@ public final class SelectLanguageFragment extends Fragment implements BlockingSt
}
final String keyboardID = keyboard.getKeyboardID();
final String keyboardName = keyboard.getKeyboardName();
String title_install = String.format(getString(R.string.title_select_language_for_package), keyboardName);
String title_install = String.format(getString(R.string.title_select_languages_for_package), keyboardName);
String title_no_install = getString(R.string.all_languages_installed);
final TextView textView = v.findViewById(R.id.bar_title);
textView.setText(title_no_install);

14
android/KMAPro/kMAPro/src/main/res/values/strings.xml
View file

@ -107,22 +107,22 @@
<string name="install_from_other_device" comment="Scan QR Code">Install from other device</string>
<!-- Context: Keyman Settings "Install Keyboard or Dictionary" menu -->
<string name="add_language_to_installed_keyboard" comment="Install another language from a keyboard package">Add language to installed keyboard</string>
<string name="add_languages_to_installed_keyboard" comment="Install additional languages from a keyboard package">Add languages to installed keyboard</string>
<!-- Context: Keyman Settings "Install Keyboard or Dictionary" menu -->
<string name="add_language_subtext" comment="Additional information for adding another language">(from keyboard package)</string>
<!-- Context: Select Package and Select Language menu -->
<string name="title_select_keyboard_package_list" comment="Select a keyboard package to add a language">Select Keyboard Package</string>
<!-- Context: Select Package and Select Languages menu -->
<string name="title_select_keyboard_package_list" comment="Select a keyboard package to add languages">Select Keyboard Package</string>
<!-- Context: Select Package and Select Language menu -->
<string name="title_select_language_for_package" comment="Select a language name from the keyboard package">Select language for %1$s</string>
<!-- Context: Select Package and Select Languages menu -->
<string name="title_select_languages_for_package" comment="Select language names from the keyboard package">Select languages for %1$s</string>
<!-- Context: Select Package and Select Language menu -->
<!-- Context: Select Package and Select Languages menu -->
<string name="added_language_to_keyboard" comment="Notification that a language name is added to a keyboard">Added language %1$s to %2$s</string>
<!-- Context: Select Package and Select Language menu -->
<!-- Context: Select Package and Select Languages menu -->
<string name="all_languages_installed" comment="Text when all languages from a keyboard package have been installed">All languages already installed</string>