Replaced strings in two pieces with formatted string

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 003f31f..77df027 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r

-    android:versionName="0.1.175B" xmlns:android="http://schemas.android.com/apk/res/android">\r
+    android:versionName="0.1.176B" xmlns:android="http://schemas.android.com/apk/res/android">\r

 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r
 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r

diff --git a/res/values/strings.xml b/res/values/strings.xml
index f5cece1..9d167e3 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -71,8 +71,7 @@
     <string name="common_error">Error</string>
     <string name="uploader_info_dirname">Directory name</string>
     <string name="uploader_upload_succeed">Upload was successful</string>
     <string name="common_error">Error</string>
     <string name="uploader_info_dirname">Directory name</string>
     <string name="uploader_upload_succeed">Upload was successful</string>

-    <string name="uploader_upload_failed">Upload failed: </string>
-    <string name="uploader_files_uploaded_suffix"> files uploaded</string>
+    <string name="uploader_upload_failed">Upload failed: %1$d/%2$d files uploaded</string>

     <string name="downloader_download_succeed">Download was successful</string>
     <string name="downloader_download_failed">Download could not be completed</string>
     <string name="common_choose_account">Choose account</string>
     <string name="downloader_download_succeed">Download was successful</string>
     <string name="downloader_download_failed">Download could not be completed</string>
     <string name="common_choose_account">Choose account</string>


@@ -132,8 +131,7 @@
     <string name="common_rename">Rename</string>
     <string name="common_remove">Remove</string>
     
     <string name="common_rename">Rename</string>
     <string name="common_remove">Remove</string>
     

-       <string name="confirmation_alert_prefix">"Do you really want "</string>
-       <string name="confirmation_alert_suffix">"?"</string>
+       <string name="confirmation_alert">"Do you really want %1$s ?"</string>

 
     <string name="remove_success_msg">"Successful removal"</string>
     <string name="remove_fail_msg">"Removal could not be completed"</string>
 
     <string name="remove_success_msg">"Successful removal"</string>
     <string name="remove_fail_msg">"Removal could not be completed"</string>

diff --git a/src/eu/alefzero/owncloud/files/services/FileUploader.java b/src/eu/alefzero/owncloud/files/services/FileUploader.java
index 93ee82f..8bdcedf 100644 (file)
--- a/src/eu/alefzero/owncloud/files/services/FileUploader.java
+++ b/src/eu/alefzero/owncloud/files/services/FileUploader.java
@@ -120,9 +120,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
         if (mSuccessCounter == mLocalPaths.length) {
             message = getString(R.string.uploader_upload_succeed); 
         } else {
         if (mSuccessCounter == mLocalPaths.length) {
             message = getString(R.string.uploader_upload_succeed); 
         } else {

-            message = getString(R.string.uploader_upload_failed); 
-            if (mLocalPaths.length > 1)
-                message += " (" + mSuccessCounter + " / " + mLocalPaths.length + getString(R.string.uploader_files_uploaded_suffix) + ")";
+            message = String.format(getString(R.string.uploader_upload_failed), mSuccessCounter, mLocalPaths.length); 

         }
         Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
     }
         }
         Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
     }

diff --git a/src/eu/alefzero/owncloud/ui/fragment/ConfirmationDialogFragment.java b/src/eu/alefzero/owncloud/ui/fragment/ConfirmationDialogFragment.java
index a509860..d977474 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/ConfirmationDialogFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/ConfirmationDialogFragment.java
@@ -35,7 +35,7 @@ public class ConfirmationDialogFragment extends SherlockDialogFragment {
 
         return new AlertDialog.Builder(getActivity())
                 .setIcon(android.R.drawable.ic_dialog_alert)
 
         return new AlertDialog.Builder(getActivity())
                 .setIcon(android.R.drawable.ic_dialog_alert)

-                .setMessage(getString(R.string.confirmation_alert_prefix) + confirmationTarget + getString(R.string.confirmation_alert_suffix))
+                .setMessage(String.format(getString(R.string.confirmation_alert_prefix), confirmationTarget))

                 .setPositiveButton(R.string.common_ok,
                     new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int whichButton) {
                 .setPositiveButton(R.string.common_ok,
                     new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int whichButton) {