Browse Source

Translation improvements, no need nx version checks

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 9 months ago
parent
commit
e78f0f59d6

+ 32 - 29
app/src/main/java/com/nextcloud/utils/fileNameValidator/FileNameValidator.kt

@@ -17,7 +17,6 @@ import com.nextcloud.utils.extensions.forbiddenFilenames
 import com.nextcloud.utils.extensions.removeFileExtension
 import com.owncloud.android.R
 import com.owncloud.android.datamodel.OCFile
-import com.owncloud.android.lib.resources.status.NextcloudVersion
 import com.owncloud.android.lib.resources.status.OCCapability
 
 object FileNameValidator {
@@ -49,44 +48,48 @@ object FileNameValidator {
             }
         }
 
-        if (capability.version.isNewerOrEqual(NextcloudVersion.nextcloud_30)) {
-            checkInvalidCharacters(filename, capability, context)?.let {
-                return it
-            }
+        checkInvalidCharacters(filename, capability, context)?.let {
+            return it
+        }
 
-            capability.run {
-                val filenameVariants = setOf(filename.lowercase(), filename.removeFileExtension().lowercase())
+        capability.run {
+            val filenameVariants = setOf(filename.lowercase(), filename.removeFileExtension().lowercase())
 
-                forbiddenFilenameBaseNames().let {
-                    val forbiddenBaseNames = forbiddenFilenameBaseNames().map { it.lowercase() }
+            forbiddenFilenameBaseNames().let {
+                val forbiddenBaseNames = forbiddenFilenameBaseNames().map { it.lowercase() }
 
-                    for (forbiddenBaseName in forbiddenBaseNames) {
-                        if (forbiddenBaseName in filenameVariants) {
-                            return context.getString(
-                                R.string.file_name_validator_error_reserved_names,
-                                forbiddenBaseName
-                            )
-                        }
+                for (forbiddenBaseName in forbiddenBaseNames) {
+                    if (forbiddenBaseName in filenameVariants) {
+                        return context.getString(
+                            R.string.file_name_validator_error_reserved_names,
+                            forbiddenBaseName
+                        )
                     }
                 }
+            }
 
-                forbiddenFilenamesJson?.let {
-                    val forbiddenFilenames = forbiddenFilenames().map { it.lowercase() }
+            forbiddenFilenamesJson?.let {
+                val forbiddenFilenames = forbiddenFilenames().map { it.lowercase() }
 
-                    for (forbiddenFilename in forbiddenFilenames) {
-                        if (forbiddenFilename in filenameVariants) {
-                            return context.getString(
-                                R.string.file_name_validator_error_reserved_names,
-                                forbiddenFilename
-                            )
-                        }
+                for (forbiddenFilename in forbiddenFilenames) {
+                    if (forbiddenFilename in filenameVariants) {
+                        return context.getString(
+                            R.string.file_name_validator_error_reserved_names,
+                            forbiddenFilename
+                        )
                     }
                 }
+            }
 
-                forbiddenFilenameExtensionJson?.let {
-                    for (forbiddenExtension in forbiddenFilenameExtension()) {
-                        if (filename.endsWith(forbiddenExtension, ignoreCase = true)) {
-                            return context.getString(
+            forbiddenFilenameExtensionJson?.let {
+                for (forbiddenExtension in forbiddenFilenameExtension()) {
+                    if (filename.endsWith(forbiddenExtension, ignoreCase = true)) {
+                        return if (forbiddenExtension == StringConstants.SPACE) {
+                            context.getString(
+                                R.string.file_name_validator_error_forbidden_space_character_extensions,
+                            )
+                        } else {
+                            context.getString(
                                 R.string.file_name_validator_error_forbidden_file_extensions,
                                 forbiddenExtension
                             )

+ 2 - 1
app/src/main/res/values/strings.xml

@@ -1237,11 +1237,12 @@
     <string name="unified_search_fragment_permission_needed">Permissions are required to open search result otherwise it will redirected to web…</string>
     <string name="file_name_validator_current_path_is_invalid">Current folder name is invalid, please rename the folder. Redirecting to root</string>
     <string name="file_name_validator_rename_before_move_or_copy">%s. Please rename the file before moving or copying</string>
-    <string name="file_name_validator_upload_content_error">Some contents cannot able to uploaded due to contains reserved names or invalid character</string>
+    <string name="file_name_validator_upload_content_error">Some content cannot be uploaded since it contains reserved names or invalid characters</string>
     <string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">Folder path contains reserved names or invalid character</string>
     <string name="file_name_validator_error_invalid_character">Name contains an invalid character: %s</string>
     <string name="file_name_validator_error_reserved_names">%s is a forbidden name</string>
     <string name="file_name_validator_error_forbidden_file_extensions">%s is a forbidden file extension</string>
+    <string name="file_name_validator_error_forbidden_space_character_extensions"> A space character is not allowed in file names</string>
     <string name="sync">Sync</string>
     <string name="please_select_a_server">Please select a server…</string>
 </resources>