mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-28 05:13:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Minor string resource fixups

Browse source
This commit is contained in:
YuviPanda 2013-03-02 04:51:07 +05:30
parent 74c7928997
commit 63177ec529
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
commons/src/main/java/org/wikimedia/commons/UploadService.java
View file

@ -67,7 +67,6 @@ public class UploadService extends HandlerService<Contribution> {
Log.d("Commons", String.format("Uploaded %d of %d", transferred, total));
if(!notificationTitleChanged) {
curProgressNotification.setContentTitle(notificationProgressTitle);
Log.d("Commons", String.format("%d uploads left", toUpload));
notificationTitleChanged = true;
contribution.setState(Contribution.STATE_IN_PROGRESS);
}
@ -124,7 +123,7 @@ public class UploadService extends HandlerService<Contribution> {
contribution.save();
toUpload++;
if (curProgressNotification != null && toUpload != 1) {
curProgressNotification.setContentText(String.format(getString(R.string.uploads_pending_notification_indicator), toUpload));
curProgressNotification.setContentText(getResources().getQuantityString(R.plurals.uploads_pending_notification_indicator, toUpload, toUpload));
Log.d("Commons", String.format("%d uploads left", toUpload));
notificationManager.notify(NOTIFICATION_UPLOAD_IN_PROGRESS, curProgressNotification.build());
}
@ -178,7 +177,7 @@ public class UploadService extends HandlerService<Contribution> {
.setLargeIcon(BitmapFactory.decodeResource(getResources(), R.drawable.ic_launcher))
.setAutoCancel(true)
.setContentTitle(String.format(getString(R.string.upload_progress_notification_title_start), contribution.getFilename()))
.setContentText(String.format(getString(R.string.uploads_pending_notification_indicator), toUpload))
.setContentText(getResources().getQuantityString(R.plurals.uploads_pending_notification_indicator, toUpload, toUpload))
.setOngoing(true)
.setProgress(100, 0, true)
.setContentIntent(PendingIntent.getActivity(getApplicationContext(), 0, new Intent(this, ContributionsActivity.class), 0))