ProfessionalUwU/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make some error messages localizable (#9811)

Browse Source 
* Make error message of 3 exceptions localizable.

* Revert unnecessary file handle exception change.
This commit is contained in:
Mekanik 2023-08-06 06:50:43 -07:00 committed by GitHub
parent 26b3eb696c
commit 8f395d98e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/presentation/util/ExceptionFormatter.kt
View File

@ -3,6 +3,7 @@ package eu.kanade.presentation.util
import android.content.Context import android.content.Context
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.network.HttpException import eu.kanade.tachiyomi.network.HttpException
import eu.kanade.tachiyomi.source.online.LicensedMangaChaptersException
import tachiyomi.data.source.NoResultsException import tachiyomi.data.source.NoResultsException
import tachiyomi.domain.source.model.SourceNotInstalledException import tachiyomi.domain.source.model.SourceNotInstalledException
@ -13,6 +14,7 @@ val Throwable.formattedMessage: String
is NoResultsException -> return getString(R.string.no_results_found) is NoResultsException -> return getString(R.string.no_results_found)
is SourceNotInstalledException -> return getString(R.string.loader_not_implemented_error) is SourceNotInstalledException -> return getString(R.string.loader_not_implemented_error)
is HttpException -> return "$message: ${getString(R.string.http_error_hint)}" is HttpException -> return "$message: ${getString(R.string.http_error_hint)}"
is LicensedMangaChaptersException -> return getString(R.string.licensed_manga_chapters_error)
} }
return when (val className = this::class.simpleName) { return when (val className = this::class.simpleName) {
"Exception", "IOException" -> message ?: className "Exception", "IOException" -> message ?: className

4
app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt
View File

@ -106,10 +106,10 @@ class BackupManager(
UniFile.fromUri(context, uri) UniFile.fromUri(context, uri)
} }
) )
?: throw Exception("Couldn't create backup file") ?: throw Exception(context.getString(R.string.create_backup_file_error))
if (!file.isFile) { if (!file.isFile) {
throw IllegalStateException("Failed to get handle on file") throw IllegalStateException("Failed to get handle on a backup file")
} }
val byteArray = parser.encodeToByteArray(BackupSerializer, backup) val byteArray = parser.encodeToByteArray(BackupSerializer, backup)

2
i18n/src/main/res/values/strings.xml
View File

@ -495,6 +495,7 @@
<string name="creating_backup_error">Backup failed</string> <string name="creating_backup_error">Backup failed</string>
<string name="missing_storage_permission">Storage permissions not granted</string> <string name="missing_storage_permission">Storage permissions not granted</string>
<string name="empty_backup_error">No library entries to back up</string> <string name="empty_backup_error">No library entries to back up</string>
<string name="create_backup_file_error">Couldn\'t create a backup file</string>
<string name="restore_miui_warning">Backup/restore may not function properly if MIUI Optimization is disabled.</string> <string name="restore_miui_warning">Backup/restore may not function properly if MIUI Optimization is disabled.</string>
<string name="restore_in_progress">Restore is already in progress</string> <string name="restore_in_progress">Restore is already in progress</string>
<string name="restoring_backup">Restoring backup</string> <string name="restoring_backup">Restoring backup</string>
@ -608,6 +609,7 @@
<string name="no_results_found">No results found</string> <string name="no_results_found">No results found</string>
<!-- Do not translate "WebView" --> <!-- Do not translate "WebView" -->
<string name="http_error_hint">Check website in WebView</string> <string name="http_error_hint">Check website in WebView</string>
<string name="licensed_manga_chapters_error">Licensed - No chapters to show</string>
<string name="local_source">Local source</string> <string name="local_source">Local source</string>
<string name="other_source">Other</string> <string name="other_source">Other</string>
<string name="last_used_source">Last used</string> <string name="last_used_source">Last used</string>

4
source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt
View File

@ -215,7 +215,7 @@ abstract class HttpSource : CatalogueSource {
chapterListParse(response) chapterListParse(response)
} }
} else { } else {
Observable.error(Exception("Licensed - No chapters to show")) Observable.error(LicensedMangaChaptersException())
} }
} }
@ -404,3 +404,5 @@ abstract class HttpSource : CatalogueSource {
*/ */
override fun getFilterList() = FilterList() override fun getFilterList() = FilterList()
} }
class LicensedMangaChaptersException : Exception("Licensed - No chapters to show")