diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 33981d82e2..395ffd501d 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -14,9 +14,7 @@ Importing data from %1$s Importing OsmAnd check %1$s for duplicates with existing items in the application.\n\nIt may take some time. - Added: %1$s item - Added: %1$s items - Added: %1$s items + Items added: %1$s Quick action Import complete All data from the %1$s is imported, you can use buttons below to open needed part of the application to manage it. diff --git a/OsmAnd/src/net/osmand/plus/settings/ImportedSettingsItemsAdapter.java b/OsmAnd/src/net/osmand/plus/settings/ImportedSettingsItemsAdapter.java index f40aefff11..ed7681c891 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ImportedSettingsItemsAdapter.java +++ b/OsmAnd/src/net/osmand/plus/settings/ImportedSettingsItemsAdapter.java @@ -60,7 +60,7 @@ public class ImportedSettingsItemsAdapter extends listener.onItemClick(currentItem.getType()); } }); - setupSubTitle(holder.subTitle, currentItem.getItems().size()); + holder.subTitle.setText(String.format(app.getString(R.string.items_added), String.valueOf(currentItem.getItems().size()))); switch (currentItem.getType()) { case PROFILE: @@ -94,29 +94,6 @@ public class ImportedSettingsItemsAdapter extends } } - private void setupSubTitle(TextView subTitle, int count) { - int stringRes; - if (count > 100) - count %= 100; - if (count > 20) - count %= 10; - switch (count) { - case 1: - stringRes = R.string.added_one_item; - break; - case 2: - case 3: - case 4: - stringRes = R.string.added_two_items; - break; - default: - stringRes = R.string.added_five_items; - break; - } - subTitle.setText(String.format(app.getString(stringRes), String.valueOf(count))); - } - - @Override public int getItemCount() { return items.size();