From: tobiasKaminsky <tobias@kaminsky.me>
Date: Mon, 24 Nov 2014 09:59:31 +0000 (+0100)
Subject: changed order to: file(s), folder(s)
X-Git-Tag: oc-android-1.7.0_signed~91^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/21a505cc3398df5613cc1def93171eb2502a8570?ds=inline

changed order to: file(s), folder(s)
---

diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index b5b441e9..2a5de381 100644
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -418,15 +418,7 @@ public class OCFileListFragment extends ExtendedListFragment {
         }
 
         String output = "";
-
-        if (folders == 1) {
-            output = folders.toString() + " " + getResources().getString(R.string.file_list_folder);
-        } else if (folders > 1) {
-            output = folders.toString() + " " + getResources().getString(R.string.file_list_folders);
-        }
-        if (folders > 0 && files > 0){
-            output = output + ", ";
-        }
+       
         if (files > 0){
             if (files == 1) {
                 output = output + files.toString() + " " + getResources().getString(R.string.file_list_file);
@@ -434,6 +426,15 @@ public class OCFileListFragment extends ExtendedListFragment {
                 output = output + files.toString() + " " + getResources().getString(R.string.file_list_files);
             }
         }
+        if (folders > 0 && files > 0){
+            output = output + ", ";
+        }
+        if (folders == 1) {
+            output = output + folders.toString() + " " + getResources().getString(R.string.file_list_folder);
+        } else if (folders > 1) {
+            output = output + folders.toString() + " " + getResources().getString(R.string.file_list_folders);
+        }
+        
         return output;
     }