caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

carbs_short for translation

Browse source
This commit is contained in:
Milos Kozak 2022-11-30 16:45:11 +01:00
parent 0ff8161cda
commit 6b72ac1284
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt
View file

@ -5,8 +5,8 @@ import android.content.Context
import android.view.Gravity import android.view.Gravity
import android.widget.TableRow import android.widget.TableRow
import android.widget.TextView import android.widget.TextView
import info.nightscout.core.main.R
import info.nightscout.database.entities.TotalDailyDose import info.nightscout.database.entities.TotalDailyDose
import info.nightscout.implementation.R
import info.nightscout.shared.interfaces.ResourceHelper import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.utils.DateUtil import info.nightscout.shared.utils.DateUtil
@ -27,7 +27,7 @@ fun TotalDailyDose.Companion.toTableRowHeader(context: Context, rh: ResourceHelp
header.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 3; weight = 1f }; text = rh.gs(R.string.basal) }) header.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 3; weight = 1f }; text = rh.gs(R.string.basal) })
header.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 4; weight = 1f }; text = rh.gs(R.string.basalpct) }) header.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 4; weight = 1f }; text = rh.gs(R.string.basalpct) })
if (includeCarbs) if (includeCarbs)
header.addView(TextView(context).apply { layoutParams = lp.apply { column = 5; weight = 1f }; text = rh.gs(R.string.carbs) }) header.addView(TextView(context).apply { layoutParams = lp.apply { column = 5; weight = 1f }; text = rh.gs(R.string.carbs_short) })
} }
fun TotalDailyDose.toTableRow(context: Context, rh: ResourceHelper, dateUtil: DateUtil, includeCarbs: Boolean): TableRow = fun TotalDailyDose.toTableRow(context: Context, rh: ResourceHelper, dateUtil: DateUtil, includeCarbs: Boolean): TableRow =

1
implementation/src/main/res/values/strings.xml
View file

@ -27,5 +27,6 @@
<string name="detailed_14_days">Detailed 14 days</string> <string name="detailed_14_days">Detailed 14 days</string>
<string name="day_tir">Day TIR</string> <string name="day_tir">Day TIR</string>
<string name="night_tir">Night TIR</string> <string name="night_tir">Night TIR</string>
<string name="carbs_short" comment="max 6 characters">Carbs</string>
</resources> </resources>

2
plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
View file

@ -396,7 +396,7 @@ class IobCobCalculatorPlugin @Inject constructor(
{ {
synchronized(this) { synchronized(this) {
aapsLogger.debug(LTag.AUTOSENS, "Running newHistoryData") aapsLogger.debug(LTag.AUTOSENS, "Running newHistoryData")
repository.clearCachedData(MidnightTime.calc(event.oldDataTimestamp)) repository.clearCachedTddData(MidnightTime.calc(event.oldDataTimestamp))
newHistoryData( newHistoryData(
event.oldDataTimestamp, event.oldDataTimestamp,
event.reloadBgData, event.reloadBgData,