mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33: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

11
commons/res/values/strings.xml
View file

@ -21,7 +21,10 @@
<string name="upload_progress_notification_title_finishing">Finishing uploading %1$s</string>
<string name="upload_failed_notification_title">Uploading %1$s failed</string>
<string name="upload_failed_notification_subtitle">Tap to view</string>
<string name="uploads_pending_notification_indicator">%d files uploading</string>
<plurals name="uploads_pending_notification_indicator">
<item quantity="one">1 file uploading</item>
<item quantity="other">%d files uploading</item>
</plurals>
<string name="title_activity_contributions">My uploads</string>
<string name="contribution_state_queued">Queued</string>
@ -36,13 +39,15 @@
<string name="menu_open_in_browser">View in Browser</string>
<string name="share_title_hint">Title</string>
<string name="share_description_hint">Description</string>
<string name="login_failed_network">Unable to login - network failure</string>
<string name="login_failed_username">Unable to login - please check your username</string>
<string name="login_failed_password">Unable to login - please heck your password</string>
<string name="login_failed_throttled">You have had too many unsuccessfull attempts. Please try again in 5 minutes
<string name="login_failed_password">Unable to login - please check your password</string>
<string name="login_failed_throttled">Too many unsuccessful attempts. Please try again in a few minutes
</string>
<string name="login_failed_blocked">Sorry, this user has been blocked on Commons</string>
<string name="login_failed_generic">Login failed</string>
<string name="share_upload_button">Upload</string>
<plurals name="contributions_subtitle">

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))