diff options
3 files changed, 14 insertions, 6 deletions
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java index eb32a5c8..0ef5ea28 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java @@ -12,6 +12,7 @@ import androidx.annotation.ColorInt; import androidx.appcompat.view.ActionMode; import androidx.appcompat.view.ActionMode.Callback; import androidx.appcompat.widget.SearchView; +import androidx.core.content.res.ResourcesCompat; import androidx.core.graphics.drawable.DrawableCompat; import androidx.fragment.app.FragmentManager; import androidx.recyclerview.widget.RecyclerView; @@ -124,7 +125,7 @@ public class MultiSelectedActionModeCallback implements Callback { refreshLists.run(); String restoreSnackbarTitle = deletedNotes.size() == 1 ? context.getString(R.string.action_note_restored, deletedNotes.get(0).getTitle()) - : context.getString(R.string.bulk_notes_restored, deletedNotes.size()); + : context.getResources().getQuantityString(R.plurals.bulk_notes_restored, deletedNotes.size(), deletedNotes.size()); BrandedSnackbar.make(viewProvider.getView(), restoreSnackbarTitle, Snackbar.LENGTH_SHORT) .show(); }) @@ -141,7 +142,7 @@ public class MultiSelectedActionModeCallback implements Callback { case R.id.menu_share: final String subject = (adapter.getSelected().size() == 1) ? ((DBNote) adapter.getItem(adapter.getSelected().get(0))).getTitle() - : context.getString(R.string.share_multiple, adapter.getSelected().size()); + : context.getResources().getQuantityString(R.plurals.share_multiple, adapter.getSelected().size(), adapter.getSelected().size()); final StringBuilder noteContents = new StringBuilder(); for (Integer i : adapter.getSelected()) { final DBNote noteWithoutContent = (DBNote) adapter.getItem(i); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 699b9915..9c48717a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -156,7 +156,6 @@ <string name="simple_more">More</string> <string name="simple_move">Move</string> <string name="checkbox_could_not_be_toggled">Checkbox could not be toggled.</string> - <string name="bulk_notes_restored">Restored %1$d notes</string> <string name="category_readonly">Read only</string> <string name="no_category">No category</string> <string name="add_category">Add %1$s</string> @@ -193,7 +192,6 @@ <string name="simple_appearance">Appearance</string> <string name="simple_synchronization">Synchronization</string> <string name="simple_behavior">Behavior</string> - <string name="share_multiple">Share content of %1$d notes</string> <string name="manage_accounts">Manage accounts</string> <string name="action_formatting_help">Formatting</string> @@ -231,9 +229,17 @@ <item quantity="other">%d selected</item> </plurals> <plurals name="bulk_notes_deleted"> - <item quantity="one">Deleted %1$d note</item> + <item quantity="one">Deleted one note</item> <item quantity="other">Deleted %1$d notes</item> </plurals> + <plurals name="bulk_notes_restored"> + <item quantity="one">Restored one note</item> + <item quantity="other">Restored %1$d notes</item> + </plurals> + <plurals name="share_multiple"> + <item quantity="one">Share content of %1$d note</item> + <item quantity="other">Share content of %1$d notes</item> + </plurals> <!-- Formatting help --> diff --git a/fastlane/metadata/android/en-US/changelogs/2017000.txt b/fastlane/metadata/android/en-US/changelogs/2017000.txt index a2b107d5..4b2af15a 100644 --- a/fastlane/metadata/android/en-US/changelogs/2017000.txt +++ b/fastlane/metadata/android/en-US/changelogs/2017000.txt @@ -1,3 +1,4 @@ - Selecting a note in the main note list highlights two notes (#920) (@muety) - Support www links without protocol in preview mode (#949) (@muety) -- Allow to modify category in multi-select view (#946)
\ No newline at end of file +- Allow to modify category in multi-select view (#946) +- Add plural form to string (#931)
\ No newline at end of file |