Merge remote-tracking branch 'upstream/master' into Automatic_Reader_Background

This commit is contained in:
Jay 2019-03-31 18:37:23 -07:00
commit 1e49b4543f
8 changed files with 26 additions and 19 deletions

View file

@ -38,8 +38,8 @@ android {
minSdkVersion 16
targetSdkVersion 27
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
versionCode 39
versionName "0.8.1"
versionCode 40
versionName "0.8.2"
buildConfigField "String", "COMMIT_COUNT", "\"${getCommitCount()}\""
buildConfigField "String", "COMMIT_SHA", "\"${getGitSha()}\""

View file

@ -29,9 +29,9 @@ class SettingsGeneralController : SettingsController() {
listPreference {
key = Keys.lang
titleRes = R.string.pref_language
entryValues = arrayOf("", "ar", "bg", "bn", "de", "en-US", "en-GB", "es", "fr", "hi",
"hu", "in", "it", "ja", "ko", "lv", "ms", "nl", "pl", "pt", "pt-BR", "ro",
"ru", "tr", "vi")
entryValues = arrayOf("", "ar", "bg", "bn", "ca", "cs", "de", "el", "en-US", "en-GB",
"es", "fr", "hi", "hu", "in", "it", "ja", "ko", "lv", "ms", "nb-rNO", "nl", "pl", "pt",
"pt-BR", "ro", "ru", "sr", "sv", "th", "tr", "uk", "vi", "zh-rCN")
entries = entryValues.map { value ->
val locale = LocaleHelper.getLocaleFromString(value.toString())
locale?.getDisplayName(locale)?.capitalize() ?:

View file

@ -51,7 +51,12 @@ fun syncChaptersWithSource(db: DatabaseHelper,
toAdd.add(sourceChapter)
} else {
//this forces metadata update for the main viewable things in the chapter list
if (source is HttpSource) {
source.prepareNewChapter(sourceChapter, manga)
}
ChapterRecognition.parseChapterNumber(sourceChapter, manga)
if (shouldUpdateDbChapter(dbChapter, sourceChapter)) {
dbChapter.scanlator = sourceChapter.scanlator
dbChapter.name = sourceChapter.name

View file

@ -1,5 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<changelog bulletedList="true">
<changelogversion versionName="v0.8.2" changeDate="">
<changelogtext>Updated Cloudflare.</changelogtext>
<changelogtext>Fixed crashes with some translations.</changelogtext>
</changelogversion>
<changelogversion versionName="v0.8.1" changeDate="">
<changelogtext>Fixed latest Cloudflare changes.</changelogtext>
<changelogtext>Bundled SQLite for better performance and new features.</changelogtext>

View file

@ -402,7 +402,7 @@
<string name="invalid_combination">Le défaut ne peut pas être selectionné avec des autres catégories</string>
<string name="delete_downloads_for_manga">Supprimer les chapitres téléchargés ?</string>
<string name="notification_new_chapters_text">Pour %1$s chapitres</string>
<string name="notification_new_chapters_text">Pour %1$d chapitres</string>
<string name="track">Suivi</string>
<string name="action_sort_total">Nombre de chapitres</string>
<string name="short_recent_updates">Actualisations</string>
@ -522,4 +522,4 @@ Assurez-vous que vous êtes connecté à des sources qui le demande avant de com
<string name="migrating">En cours de déplacement…</string>
<string name="darkblue_theme">Bleu foncé</string>
</resources>
</resources>

View file

@ -14,7 +14,7 @@
<string name="label_recent_updates">पुस्तकालय अद्यतन</string>
<string name="label_latest_updates">नवीनतम अद्यतन</string>
<string name="label_categories">श्रेणियाँ</string>
<string name="label_selected">श्रेणियाँ</string>
<string name="label_selected">श्रेणियाँ %1$d</string>
<string name="label_backup">बैकअप</string>
@ -475,4 +475,4 @@
<string name="transition_pages_error">पृष्ठों को लोड करने में विफल है: %1$s</string>
<string name="darkblue_theme">गहरा नीला</string>
</resources>
</resources>

View file

@ -366,16 +366,13 @@
<string name="color_filter_r_value">R</string>
<string name="pref_download_new_categories">Categorias para incluir na transferência</string>
<string name="pref_backup_directory">Pasta de Backups</string>
<string name="dialog_restoring_backup">A restaurar backup...
\n%1$ adicionado a biblioteca</string>
<string name="dialog_restoring_source_not_found">A restaurar backup...
\n%1$ Fonte não encontrada</string>
<string name="dialog_restoring_backup">A restaurar backup…\n%1$s adicionado a biblioteca</string>
<string name="dialog_restoring_source_not_found">A restaurar backup…\n%1$s Fonte não encontrada</string>
<string name="backup_created">Backup criado</string>
<string name="restore_completed">Restauro completo</string>
<string name="error_opening_log">Não foi possivel abrir o registo</string>
<string name="restore_completed_content">Restauro levou %1$.
\n%2$ erros encontrados.</string>
<string name="file_saved">Ficheiro salvo em %1$</string>
<string name="restore_completed_content">Restauro levou %1$s.\n%2$s erros encontrados.</string>
<string name="file_saved">Ficheiro salvo em %1$s</string>
<string name="backup_choice">O que pretende fazer backup\?</string>
<string name="pref_refresh_library_metadata">Refrescar metadata da biblioteca</string>
<string name="pref_backup_slots">Máximo de backups automáticos</string>
@ -384,4 +381,4 @@
<string name="ext_trust">Confiar</string>
<string name="ext_untrusted">Não confiar</string>
<string name="download_custom">Transferir personalizado</string>
</resources>
</resources>

View file

@ -242,7 +242,7 @@
<string name="backup_created">Copie de rezervă creată</string>
<string name="restore_completed">Restaurare completă</string>
<string name="error_opening_log">Nu s-a putut deschide log</string>
<string name="restore_completed_content">Restaurarea a durat %$s.
<string name="restore_completed_content">Restaurarea a durat %1$s.
\n%2$s erori găsite.</string>
<string name="backup_restore_content">Restaurare folosește sursa pentru a aduce datele, cost suplimentar aplicabil. De asemenea verificați dacă sunteți autentificați în sursele ce au nevoie înainte de a incepe restaurarea.</string>
<string name="file_saved">Fișier salvat in %1$s</string>
@ -395,7 +395,7 @@
<string name="downloading">Descărcare…</string>
<string name="download_progress">Descărcat %1$d%%</string>
<string name="chapter_progress">Pagina: %1$d</string>
<string name="chapter_subtitle">Capitolul %1$d</string>
<string name="chapter_subtitle">Capitolul %1$s</string>
<string name="no_next_chapter">Capitolul următor nu a fost găsit</string>
<string name="no_previous_chapter">Capitolul precedent nu a fost găsit</string>
<string name="decode_image_error">Imaginea nu a putu fi decodată</string>