feat: improve localizations

Raival-e · Raival-e · commit 40e507ffedf3 · 2025-01-09T11:09:00.000+04:00
diff --git a/app/src/main/java/com/raival/compose/file/explorer/common/extension/Extensions.kt b/app/src/main/java/com/raival/compose/file/explorer/common/extension/Extensions.kt
@@ -14,7 +14,6 @@ import android.provider.MediaStore.MediaColumns.DISPLAY_NAME
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.unit.dp
 import com.raival.compose.file.explorer.App.Companion.globalClass
-import com.raival.compose.file.explorer.R
 import java.io.File
 import java.io.FileInputStream
 import java.io.IOException
@@ -86,9 +85,6 @@ fun Long.toFormattedSize(): String {
 fun Context.isDarkTheme() = (resources.configuration.uiMode
         and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES
 
-fun plural(size: Int, custom: String = globalClass.getString(R.string.plural1)) =
-    if (size == 1) emptyString else custom
-
 @Throws(IOException::class)
 fun Uri.read(): ByteArray {
     val contentResolver = globalClass.contentResolver
diff --git a/app/src/main/java/com/raival/compose/file/explorer/common/extension/StringExt.kt b/app/src/main/java/com/raival/compose/file/explorer/common/extension/StringExt.kt
@@ -7,6 +7,7 @@ import com.raival.compose.file.explorer.App
 import kotlin.random.Random
 
 const val emptyString = ""
+const val whiteSpace = " "
 
 fun String.Companion.randomString(length: Int): String {
     val charPool: List<Char> = ('a'..'z') + ('A'..'Z') + ('0'..'9')
diff --git a/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/regular/compose/DeleteConfirmationDialog.kt b/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/regular/compose/DeleteConfirmationDialog.kt
@@ -17,7 +17,6 @@ import androidx.compose.ui.unit.dp
 import com.raival.compose.file.explorer.R
 import com.raival.compose.file.explorer.common.compose.CheckableText
 import com.raival.compose.file.explorer.common.compose.Space
-import com.raival.compose.file.explorer.common.extension.plural
 import com.raival.compose.file.explorer.screen.main.tab.regular.RegularTab
 
 @Composable
@@ -57,11 +56,7 @@ fun DeleteConfirmationDialog(tab: RegularTab) {
             text = {
                 Column(Modifier.fillMaxWidth()) {
                     Text(
-                        text = stringResource(
-                            id = R.string.delete_confirmation_message,
-                            targetFiles.size,
-                            plural(targetFiles.size)
-                        )
+                        text = stringResource(id = R.string.delete_confirmation_message)
                     )
 
                     if (!tab.showEmptyRecycleBin) {
diff --git a/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/regular/modal/DocumentHolder.kt b/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/regular/modal/DocumentHolder.kt
@@ -28,7 +28,6 @@ import com.raival.compose.file.explorer.common.extension.conditions
 import com.raival.compose.file.explorer.common.extension.drawableToBitmap
 import com.raival.compose.file.explorer.common.extension.emptyString
 import com.raival.compose.file.explorer.common.extension.isNot
-import com.raival.compose.file.explorer.common.extension.plural
 import com.raival.compose.file.explorer.common.extension.toFormattedDate
 import com.raival.compose.file.explorer.common.extension.toFormattedSize
 import com.raival.compose.file.explorer.screen.main.tab.regular.misc.FileMimeType
@@ -370,8 +369,7 @@ data class DocumentHolder(
                     append(
                         globalClass.getString(
                             R.string.folders_count,
-                            foldersCount,
-                            plural(foldersCount)
+                            foldersCount
                         )
                     )
                     if (filesCount > 0) append(", ")
@@ -380,8 +378,7 @@ data class DocumentHolder(
                     append(
                         globalClass.getString(
                             R.string.files_count,
-                            filesCount,
-                            plural(filesCount)
+                            filesCount
                         )
                     )
                 }
diff --git a/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/regular/task/RegularTabCompressTask.kt b/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/regular/task/RegularTabCompressTask.kt
@@ -27,7 +27,7 @@ class RegularTabCompressTask(
 
     override fun getSubtitle(): String = if (source.size == 1)
         source[0].getPath().trimToLastTwoSegments()
-    else globalClass.getString(R.string.files, source.size)
+    else globalClass.getString(R.string.task_subtitle, source.size)
 
     override fun execute(destination: DocumentHolder, callback: Any) {
         val taskCallback = callback as RegularTabTaskCallback
diff --git a/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/regular/task/RegularTabCopyTask.kt b/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/regular/task/RegularTabCopyTask.kt
@@ -21,7 +21,7 @@ class RegularTabCopyTask(
 
     override fun getSubtitle(): String = if (source.size == 1)
         source[0].getPath().trimToLastTwoSegments()
-    else globalClass.getString(R.string.files, source.size)
+    else globalClass.getString(R.string.task_subtitle, source.size)
 
     override fun execute(destination: DocumentHolder, callback: Any) {
         val taskCallback = callback as RegularTabTaskCallback
diff --git a/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/regular/task/RegularTabDecompressTask.kt b/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/regular/task/RegularTabDecompressTask.kt
@@ -25,7 +25,7 @@ class RegularTabDecompressTask(
 
     override fun getSubtitle(): String = if (source.size == 1)
         source[0].getPath().trimToLastTwoSegments()
-    else globalClass.getString(R.string.files, source.size)
+    else globalClass.getString(R.string.task_subtitle, source.size)
 
     override fun execute(destination: DocumentHolder, callback: Any) {
         val taskCallback = callback as RegularTabTaskCallback
diff --git a/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/regular/task/RegularTabDeleteTask.kt b/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/regular/task/RegularTabDeleteTask.kt
@@ -22,7 +22,7 @@ class RegularTabDeleteTask(
 
     override fun getSubtitle(): String = if (source.size == 1)
         source[0].getPath().trimToLastTwoSegments()
-    else globalClass.getString(R.string.files, source.size)
+    else globalClass.getString(R.string.task_subtitle, source.size)
 
     override fun execute(destination: DocumentHolder, callback: Any) {
         if (moveToRecycleBin && !destination.hasParent(globalClass.recycleBinDir)) {
diff --git a/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/regular/task/RegularTabMoveTask.kt b/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/regular/task/RegularTabMoveTask.kt
@@ -22,7 +22,7 @@ class RegularTabMoveTask(
 
     override fun getSubtitle(): String = if (source.size == 1)
         source[0].getPath().trimToLastTwoSegments()
-    else globalClass.getString(R.string.files, source.size)
+    else globalClass.getString(R.string.task_subtitle, source.size)
 
     override fun execute(destination: DocumentHolder, callback: Any) {
         val taskCallback = callback as RegularTabTaskCallback
diff --git a/app/src/main/java/com/raival/compose/file/explorer/screen/textEditor/TextEditorManager.kt b/app/src/main/java/com/raival/compose/file/explorer/screen/textEditor/TextEditorManager.kt
@@ -16,7 +16,7 @@ import com.raival.compose.file.explorer.App.Companion.globalClass
 import com.raival.compose.file.explorer.R
 import com.raival.compose.file.explorer.common.extension.emptyString
 import com.raival.compose.file.explorer.common.extension.isNot
-import com.raival.compose.file.explorer.common.extension.plural
+import com.raival.compose.file.explorer.common.extension.whiteSpace
 import com.raival.compose.file.explorer.screen.main.tab.regular.misc.FileMimeType.javaFileType
 import com.raival.compose.file.explorer.screen.main.tab.regular.misc.FileMimeType.jsonFileType
 import com.raival.compose.file.explorer.screen.main.tab.regular.misc.FileMimeType.kotlinFileType
@@ -396,45 +396,31 @@ class TextEditorManager {
 
         append(
             globalClass.getString(
-                R.string.line_column,
+                R.string.cursor_position,
                 cursor.leftLine + 1,
                 cursor.leftColumn + 1
             )
         )
+
+        append(whiteSpace)
+
         if (cursor.isSelected) {
             val selectionCount = cursor.right - cursor.left
-            append(
-                globalClass.getString(
-                    R.string.character,
-                    selectionCount,
-                    plural(selectionCount)
-                )
-            )
+            append("($selectionCount)")
         }
 
         val searcher = codeEditor.searcher
         if (searcher.hasQuery()) {
             val idx = searcher.currentMatchedPositionIndex
-            val matchText = when (val count = searcher.matchedPositionCount) {
-                0 -> {
-                    globalClass.getString(R.string.no_match)
-                }
 
-                else -> {
-                    globalClass.getString(
-                        R.string.match,
-                        count,
-                        plural(count, globalClass.getString(R.string.plural2))
-                    )
-                }
+            append(whiteSpace)
+            append(globalClass.getString(R.string.text_editor_search_result))
+
+            if (idx == -1) {
+                append("${searcher.matchedPositionCount}")
+            } else {
+                append("${idx + 1}/${searcher.matchedPositionCount}")
             }
-            append(
-                if (idx == -1) {
-                    globalClass.getString(R.string.match_text, matchText)
-                } else {
-                    globalClass.getString(R.string.match_text2, idx + 1, matchText)
-                }
-            )
         }
     }
 
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1,4 +1,5 @@
 <resources>
+  <string name="app_name">File Explorer</string>
   <string name="root_dir">Raiz</string>
   <string name="internal_storage">Armazenamento Interno</string>
   <string name="storage_permission_required">É necessário permissão de acesso ao armazenamento</string>
@@ -49,7 +50,6 @@
   <string name="dismiss">Descartar</string>
   <string name="delete_confirmation">Confirmação de Exclusão</string>
   <string name="move_to_recycle_bin">Mover para a Lixeira</string>
-  <string name="delete_confirmation_message">Deseja realmente excluir o(s) %1$d arquivo(s) selecionado(s)?</string>
   <string name="create_archive">Criar Arquivo</string>
   <string name="unable_to_create_file">Não foi possível criar o arquivo</string>
   <string name="cancel">Cancelar</string>
@@ -89,8 +89,6 @@
   <string name="search_query">Consulta de Pesquisa</string>
   <string name="tasks">Tarefas</string>
   <string name="invalid_task">Tarefa inválida</string>
-  <string name="folders_count">%1$d pasta%2$s</string>
-  <string name="files_count">%1$d arquivo%2$s</string>
   <string name="no_app_can_open_file">Nenhum app pode abrir este tipo de arquivo</string>
   <string name="failed_to_open_this_file">Falha ao abrir este arquivo</string>
   <string name="controlling_left_cursor">Controlando cursor esquerdo</string>
@@ -130,17 +128,8 @@
   <string name="ignore_changes">Ignorar alterações</string>
   <string name="save_file_msg">Este arquivo não foi salvo, deseja salvá-lo?</string>
   <string name="file_not_found">Arquivo</string>
-  <string name="line_column">"Linha %1$d, Coluna %2$d "</string>
-  <string name="character">(%1$d caractere%2$s)</string>
-  <string name="no_match">nenhuma correspondência</string>
-  <string name="plural1">s</string>
-  <string name="plural2">es</string>
-  <string name="match">%1$d correspondência%2$s</string>
-  <string name="match_text" translatable="false">(%1$s)</string>
-  <string name="match_text2">(%1$d de %2$s)</string>
   <string name="file_no_longer_exists">O arquivo não existe mais</string>
   <string name="move">Mover</string>
-  <string name="files">%1$d arquivos</string>
   <string name="preparing">Preparando…</string>
   <string name="start_moving_task">Iniciando tarefa de movimentação…</string>
   <string name="progress">Progresso: %1$d/%2$d</string>
@@ -185,4 +174,10 @@
   <string name="search_finished">Busca finalizada</string>
   <string name="show_folder_s_content_count">Mostrar contagem de conteúdo da pasta</string>
   <string name="show_hidden_files">Mostrar arquivos ocultos</string>
+  <string name="delete_confirmation_message">Você realmente deseja excluir os arquivos selecionados?</string>
+  <string name="task_subtitle">Tamanho: %1$d</string>
+  <string name="cursor_position">%1$d:%2$d</string>
+  <string name="text_editor_search_result">"resultado da pesquisa: "</string>
+  <string name="folders_count">pastas: %1$d</string>
+  <string name="files_count">arquivos: %1$d</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -51,7 +51,6 @@
     <string name="dismiss">取消</string>
     <string name="delete_confirmation">确认删除</string>
     <string name="move_to_recycle_bin">移动至回收站</string>
-    <string name="delete_confirmation_message">确认删除选中的 %1$d 个项目吗?</string>
     <string name="create_archive">创建压缩包</string>
     <string name="unable_to_create_file">无法创建文件</string>
     <string name="cancel">取消</string>
@@ -91,8 +90,6 @@
     <string name="search_query">键入要搜索的内容</string>
     <string name="tasks">任务清单</string>
     <string name="invalid_task">无效任务</string>
-    <string name="folders_count">%1$d 个文件夹%2$s</string>
-    <string name="files_count">%1$d 个文件%2$s</string>
     <string name="no_app_can_open_file">找不到可用于打开此类文件的程序</string>
     <string name="failed_to_open_this_file">打开此文件失败</string>
     <string name="controlling_left_cursor">光标左移</string>
@@ -132,16 +129,8 @@
     <string name="ignore_changes">忽略</string>
     <string name="save_file_msg">文件为未保存，你想要保存它吗?</string>
     <string name="file_not_found">文件未找到</string>
-    <string name="line_column">"行 %1$d, 列 %2$d "</string>
-    <string name="character">(共 %1$d 个字符)</string>
-    <string name="no_match">没有匹配项</string>
-    <string name="plural1" />
-    <string name="plural2" />
-    <string name="match">共 %1$d 处匹配</string>
-    <string name="match_text2">(共 %2$s 项中的第 %1$d 项)</string>
     <string name="file_no_longer_exists">文件已不存在</string>
     <string name="move">移动</string>
-    <string name="files">%1$d 个文件</string>
     <string name="preparing">准备中…</string>
     <string name="start_moving_task">开始移动…</string>
     <string name="progress">进度: %1$d/%2$d</string>
@@ -186,4 +175,10 @@
     <string name="search_finished">搜索完成</string>
     <string name="show_folder_s_content_count">显示文件夹内容计数器</string>
     <string name="show_hidden_files">显示隐藏文件</string>
+    <string name="delete_confirmation_message">您确定要删除选定的文件吗？</string>
+    <string name="task_subtitle">大小：%1$d</string>
+    <string name="cursor_position">%1$d：%2$d</string>
+    <string name="text_editor_search_result">"搜索结果："</string>
+    <string name="folders_count">文件夹：%1$d</string>
+    <string name="files_count">文件：%1$d</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -50,7 +50,6 @@
     <string name="dismiss">Dismiss</string>
     <string name="delete_confirmation">Delete Confirmation</string>
     <string name="move_to_recycle_bin">Move to Recycle Bin</string>
-    <string name="delete_confirmation_message">Do you really want to delete the %1$d selected file%2$s?</string>
     <string name="create_archive">Create Archive</string>
     <string name="unable_to_create_file">Unable to create file</string>
     <string name="cancel">Cancel</string>
@@ -90,8 +89,6 @@
     <string name="search_query">Search Query</string>
     <string name="tasks">Tasks</string>
     <string name="invalid_task">Invalid task</string>
-    <string name="folders_count">%1$d folder%2$s</string>
-    <string name="files_count">%1$d file%2$s</string>
     <string name="no_app_can_open_file">Could not find any app that can open this type of files</string>
     <string name="failed_to_open_this_file">Failed to open this file</string>
     <string name="controlling_left_cursor">Controlling left cursor</string>
@@ -131,17 +128,8 @@
     <string name="ignore_changes">Ignore changes</string>
     <string name="save_file_msg">This file has not been saved, do you want to save it?</string>
     <string name="file_not_found">File not found</string>
-    <string name="line_column">"Line %1$d, Column %2$d "</string>
-    <string name="character">(%1$d character%2$s)</string>
-    <string name="no_match">no match</string>
-    <string name="plural1">s</string>
-    <string name="plural2">es</string>
-    <string name="match">%1$d match%2$s</string>
-    <string name="match_text" translatable="false">(%1$s)</string>
-    <string name="match_text2">(%1$d of %2$s)</string>
     <string name="file_no_longer_exists">File no longer exists</string>
     <string name="move">Move</string>
-    <string name="files">%1$d files</string>
     <string name="preparing">Preparing…</string>
     <string name="start_moving_task">Start moving task…</string>
     <string name="progress">Progress: %1$d/%2$d</string>
@@ -186,4 +174,10 @@
     <string name="search_finished">Search finished</string>
     <string name="show_folder_s_content_count">Show folder\'s content count</string>
     <string name="show_hidden_files">Show hidden files</string>
+    <string name="delete_confirmation_message">Do you really want to delete the selected files?</string>
+    <string name="task_subtitle">Size: %1$d</string>
+    <string name="cursor_position">%1$d:%2$d</string>
+    <string name="text_editor_search_result">"search result: "</string>
+    <string name="folders_count">folders: %1$d</string>
+    <string name="files_count">files: %1$d</string>
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ import com.raival.compose.file.explorer.common.extension.conditions`
`28`	`28`	`import com.raival.compose.file.explorer.common.extension.drawableToBitmap`
`29`	`29`	`import com.raival.compose.file.explorer.common.extension.emptyString`
`30`	`30`	`import com.raival.compose.file.explorer.common.extension.isNot`
`31`		`-import com.raival.compose.file.explorer.common.extension.plural`
`32`	`31`	`import com.raival.compose.file.explorer.common.extension.toFormattedDate`
`33`	`32`	`import com.raival.compose.file.explorer.common.extension.toFormattedSize`
`34`	`33`	`import com.raival.compose.file.explorer.screen.main.tab.regular.misc.FileMimeType`
`@@ -370,8 +369,7 @@ data class DocumentHolder(`
`370`	`369`	`append(`
`371`	`370`	`globalClass.getString(`
`372`	`371`	`R.string.folders_count,`
`373`		`- foldersCount,`
`374`		`- plural(foldersCount)`
	`372`	`+ foldersCount`
`375`	`373`	`)`
`376`	`374`	`)`
`377`	`375`	`if (filesCount > 0) append(", ")`
`@@ -380,8 +378,7 @@ data class DocumentHolder(`
`380`	`378`	`append(`
`381`	`379`	`globalClass.getString(`
`382`	`380`	`R.string.files_count,`
`383`		`- filesCount,`
`384`		`- plural(filesCount)`
	`381`	`+ filesCount`
`385`	`382`	`)`
`386`	`383`	`)`
`387`	`384`	`}`