github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

String Formatting Fixes (#3118)

Browse source 
String Formatting Fixes
This commit is contained in:
MCAxiaz 2020-05-08 18:44:01 -07:00 committed by GitHub
parent 40776bdc8d
commit a20874f6a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt
View file

@ -94,8 +94,9 @@ internal class DownloadNotifier(private val context: Context) {
)
}
val downloadingProgressText = context.getString(R.string.chapter_downloading_progress)
.format(download.downloadedImages, download.pages!!.size)
val downloadingProgressText = context.getString(
R.string.chapter_downloading_progress, download.downloadedImages, download.pages!!.size
)
if (preferences.hideNotificationContent()) {
setContentTitle(downloadingProgressText)

5
app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryHolder.kt
View file

@ -58,8 +58,9 @@ class HistoryHolder(
// Set chapter number + timestamp
val formattedNumber = adapter.decimalFormat.format(chapter.chapter_number.toDouble())
manga_subtitle.text = itemView.context.getString(R.string.recent_manga_time)
.format(formattedNumber, Date(history.last_read).toTimestampString())
manga_subtitle.text = itemView.context.getString(
R.string.recent_manga_time, formattedNumber, Date(history.last_read).toTimestampString()
)
// Set cover
GlideApp.with(itemView.context).clear(cover)

2
app/src/main/java/eu/kanade/tachiyomi/widget/preference/TrackLogoutDialog.kt
View file

@ -19,7 +19,7 @@ class TrackLogoutDialog(bundle: Bundle? = null) : DialogController(bundle) {
override fun onCreateDialog(savedViewState: Bundle?): Dialog {
return MaterialDialog(activity!!)
.title(R.string.logout_title, service.name)
.title(text = activity!!.getString(R.string.logout_title, service.name))
.positiveButton(R.string.logout) {
service.logout()
(targetController as? Listener)?.trackLogoutDialogClosed(service)