diff --git a/res/values/strings.xml b/res/values/strings.xml --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -104,8 +104,10 @@ %1s Sending file to %1s Sending files to %1s - %1s - Sent %1$d out of %2$d files + + Sent %1$d file + Sent %1$d out of %2$d files + Received file from %1s Failed receiving file from %1s Tap to open \'%1s\' diff --git a/src/org/kde/kdeconnect/Plugins/SharePlugin/NotificationUpdateCallback.java b/src/org/kde/kdeconnect/Plugins/SharePlugin/NotificationUpdateCallback.java --- a/src/org/kde/kdeconnect/Plugins/SharePlugin/NotificationUpdateCallback.java +++ b/src/org/kde/kdeconnect/Plugins/SharePlugin/NotificationUpdateCallback.java @@ -81,31 +81,25 @@ private void updateText() { String text; - if (numFiles > 1) { - text = res.getString(R.string.outgoing_files_text, sentFiles, numFiles); - } else { - text = res.getString(R.string.outgoing_file_text, device.getName()); - } + text = res.getQuantityString(R.plurals.outgoing_files_text, numFiles, sentFiles, numFiles); builder.setContentText(text); } private void updateDone(boolean successful) { int icon; String title; String text; - int progress; + if (successful) { - progress = 1; if (numFiles > 1) { - text = res.getString(R.string.outgoing_files_text, sentFiles, numFiles); + text = res.getQuantityString(R.plurals.outgoing_files_text, numFiles, sentFiles, numFiles); } else { final String filename = toSend.get(0).getString("filename"); text = res.getString(R.string.sent_file_text, filename); } title = res.getString(R.string.sent_file_title, device.getName()); icon = android.R.drawable.stat_sys_upload_done; } else { - progress = 0; final String filename = toSend.get(sentFiles).getString("filename"); title = res.getString(R.string.sent_file_failed_title, device.getName()); text = res.getString(R.string.sent_file_failed_text, filename);