Fixed wrong format of files & folder count

diff --git a/res/values/strings.xml b/res/values/strings.xml
index a93d08d..716d3b2 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -354,6 +354,6 @@
     <string name="file_list__footer__file_and_folders">1 file, %1$d folders</string>
     <string name="file_list__footer__files">%1$d files</string>
     <string name="file_list__footer__files_and_folder">%1$d files, 1 folder</string>
     <string name="file_list__footer__file_and_folders">1 file, %1$d folders</string>
     <string name="file_list__footer__files">%1$d files</string>
     <string name="file_list__footer__files_and_folder">%1$d files, 1 folder</string>

-    <string name="file_list__footer__files_and_folders">%1$d files, %1$d folders</string>
+    <string name="file_list__footer__files_and_folders">%1$d files, %2$d folders</string>

 
 </resources>
 
 </resources>

diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index a8f7ff0..0621323 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -447,9 +447,7 @@ public class OCFileListFragment extends ExtendedListFragment {
                 output = getResources().getString(R.string.file_list__footer__folder);
 
             } else { // foldersCount > 1
                 output = getResources().getString(R.string.file_list__footer__folder);
 
             } else { // foldersCount > 1

-                output = getResources().getString(R.string.file_list__footer__folders);
-                String.format(output, foldersCount);
-
+                output = getResources().getString(R.string.file_list__footer__folders, foldersCount);

             }
 
         } else if (filesCount == 1) {
             }
 
         } else if (filesCount == 1) {


@@ -460,22 +458,19 @@ public class OCFileListFragment extends ExtendedListFragment {
                 output = getResources().getString(R.string.file_list__footer__file_and_folder);
 
             } else { // foldersCount > 1
                 output = getResources().getString(R.string.file_list__footer__file_and_folder);
 
             } else { // foldersCount > 1

-                output = getResources().getString(R.string.file_list__footer__file_and_folders);
-                String.format(output, foldersCount);
-
+                output = getResources().getString(R.string.file_list__footer__file_and_folders, foldersCount);

             }
         } else {    // filesCount > 1
             if (foldersCount <= 0) {
             }
         } else {    // filesCount > 1
             if (foldersCount <= 0) {

-                output = getResources().getString(R.string.file_list__footer__files);
-                String.format(output, filesCount);
+                output = getResources().getString(R.string.file_list__footer__files, filesCount);

 
             } else if (foldersCount == 1) {
 
             } else if (foldersCount == 1) {

-                output = getResources().getString(R.string.file_list__footer__files_and_folder);
-                String.format(output, filesCount);
+                output = getResources().getString(R.string.file_list__footer__files_and_folder, filesCount);

 
             } else { // foldersCount > 1
 
             } else { // foldersCount > 1

-                output = getResources().getString(R.string.file_list__footer__files_and_folders);
-                String.format(output, filesCount, foldersCount);
+                output = getResources().getString(
+                        R.string.file_list__footer__files_and_folders, filesCount, foldersCount
+                );

 
             }
         }
 
             }
         }