diff options
| -rw-r--r-- | iOSClient/Create/CCCreateCloud.swift | 4 | ||||
| -rw-r--r-- | iOSClient/Settings/NCManageAutoUploadFileName.swift | 4 | ||||
| -rwxr-xr-x | iOSClient/Supporting Files/en.lproj/Localizable.strings | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/iOSClient/Create/CCCreateCloud.swift b/iOSClient/Create/CCCreateCloud.swift index a279bc33c..60a70d911 100644 --- a/iOSClient/Create/CCCreateCloud.swift +++ b/iOSClient/Create/CCCreateCloud.swift @@ -380,7 +380,7 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate { case 3: return " " + NSLocalizedString("_rename_filename_", comment: "") case 4: - return NSLocalizedString("_preview_filename_", comment: "") + return String(format: NSLocalizedString("_preview_filename_", comment: ""), "MM,MMM,DD,YY,YYYY and HH,hh,mm,ss,ampm") default: return "" } @@ -473,7 +473,7 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate { returnString = CCUtility.createFileName(asset.value(forKey: "filename"), fileDate: asset.creationDate, fileType: asset.mediaType, keyFileName: nil, keyFileNameType: k_keyFileNameType) } - return NSLocalizedString("_preview_filename_", comment: "") + ":" + "\n\n" + returnString + return String(format: NSLocalizedString("_preview_filename_", comment: ""), "MM,MMM,DD,YY,YYYY and HH,hh,mm,ss,ampm") + ":" + "\n\n" + returnString } @objc func changeDestinationFolder(_ sender: XLFormRowDescriptor) { diff --git a/iOSClient/Settings/NCManageAutoUploadFileName.swift b/iOSClient/Settings/NCManageAutoUploadFileName.swift index 129395885..7812db6ca 100644 --- a/iOSClient/Settings/NCManageAutoUploadFileName.swift +++ b/iOSClient/Settings/NCManageAutoUploadFileName.swift @@ -160,7 +160,7 @@ class NCManageAutoUploadFileName: XLFormViewController { case 1: return " " + NSLocalizedString("_rename_filename_", comment: "") case 2: - return NSLocalizedString("_preview_filename_", comment: "") + return String(format: NSLocalizedString("_preview_filename_", comment: ""), "MM,MMM,DD,YY,YYYY and HH,hh,mm,ss,ampm") default: return "" } @@ -212,6 +212,6 @@ class NCManageAutoUploadFileName: XLFormViewController { returnString = CCUtility.createFileName("IMG_0001.JPG", fileDate: dateExample, fileType: PHAssetMediaType.image, keyFileName: nil, keyFileNameType: k_keyFileNameAutoUploadType) } - return NSLocalizedString("_preview_filename_", comment: "") + ":" + "\n\n" + returnString + return String(format: NSLocalizedString("_preview_filename_", comment: ""), "MM,MMM,DD,YY,YYYY and HH,hh,mm,ss,ampm") + ":" + "\n\n" + returnString } } diff --git a/iOSClient/Supporting Files/en.lproj/Localizable.strings b/iOSClient/Supporting Files/en.lproj/Localizable.strings index b6e65c589..7e5b08909 100755 --- a/iOSClient/Supporting Files/en.lproj/Localizable.strings +++ b/iOSClient/Supporting Files/en.lproj/Localizable.strings @@ -463,7 +463,7 @@ "_use_folder_photos_" = "Use the Photos folder as destination"; "_rename_filename_" = "Rename"; "_filename_" = "Filename"; -"_preview_filename_" = "Example preview of filename. You can use the mask MM,MMM,DD,YY,YYYY and HH,hh,mm,ss,ampm for date/time"; +"_preview_filename_" = "Example preview of filename. You can use the mask %@ for date/time"; "_forbidden_characters_" = "Invalid character in filename"; "_add_filenametype_" = "Specify type in filename"; "_filenametype_photo_video_" = "Photo/Video"; |