Improvements

iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift

@@ -55,7 +55,7 @@ extension NCCreateFormUploadConflictDelegate {
     @objc var serverUrl: String?
     @objc weak var delegate: NCCreateFormUploadConflictDelegate?
     @objc var alwaysNewFileNameNumber: Bool = false
-    @objc var hideLabelNewFiles: Bool = false
+    @objc var nowLabelNewFiles: Bool = false
     
     var metadatasConflictNewFiles = [String]()
     var metadatasConflictAlreadyExistingFiles = [String]()
@@ -382,8 +382,10 @@ extension NCCreateFormUploadConflict: UITableViewDataSource {
                 cell.switchNewFile.isHidden = true
             }
             
-            // Hide Detail new file
-            cell.labelDetailNewFile.isHidden = hideLabelNewFiles
+            // Detail new file: Now
+            if nowLabelNewFiles {
+                cell.labelDetailNewFile.text = NSLocalizedString("_now_", comment: "")
+            }
             
             return cell
         }

iOSClient/Main/Create cloud/NCCreateFormUploadDocuments.swift

@@ -274,7 +274,7 @@ import NCCommunication
                 guard let metadata = CCUtility.createMetadata(withAccount: appDelegate.activeAccount, date: Date(), directory: false, ocId: "", serverUrl: serverUrl, fileName: String(describing: fileNameForm), etag: "", size: 0, status: 0, url: appDelegate.activeUrl, contentType: "") else { return }
                 
                 guard let conflictViewController = UIStoryboard(name: "NCCreateFormUploadConflict", bundle: nil).instantiateInitialViewController() as? NCCreateFormUploadConflict else { return }
-                conflictViewController.hideLabelNewFiles = true
+                conflictViewController.nowLabelNewFiles = true
                 conflictViewController.alwaysNewFileNameNumber = true
                 conflictViewController.serverUrl = serverUrl
                 conflictViewController.metadatasUploadInConflict = [metadata]

iOSClient/Main/Create cloud/NCCreateFormUploadScanDocument.swift

@@ -413,7 +413,7 @@ class NCCreateFormUploadScanDocument: XLFormViewController, NCSelectDelegate, NC
             guard let metadata = CCUtility.createMetadata(withAccount: appDelegate.activeAccount, date: Date(), directory: false, ocId: ocId, serverUrl: serverUrl, fileName: fileNameSave, etag: "", size: 0, status: 0, url: appDelegate.activeUrl, contentType: "") else { return }
             
             guard let conflictViewController = UIStoryboard(name: "NCCreateFormUploadConflict", bundle: nil).instantiateInitialViewController() as? NCCreateFormUploadConflict else { return }
-            conflictViewController.hideLabelNewFiles = true
+            conflictViewController.nowLabelNewFiles = true
             conflictViewController.serverUrl = self.serverUrl
             conflictViewController.metadatasUploadInConflict = [metadata]
             conflictViewController.delegate = self

iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -131,6 +131,7 @@
 "_file_conflict_new_"       = "New files";
 "_file_conflict_exists_"    = "Already existing files";
 "_file_not_rewite_doc_"     = "It is not possible to overwrite a document but only to create a new one";
+"_now_"                     = "Now";
 "_move_or_copy_"            = "Move or copy";
 "_copy_"                    = "Copy";