diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt index dd63f1a065..dbb891852d 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt @@ -9,6 +9,8 @@ import dagger.android.support.DaggerFragment import info.nightscout.androidaps.R import info.nightscout.androidaps.database.AppRepository import info.nightscout.androidaps.database.entities.UserEntry.Action +import info.nightscout.androidaps.database.entities.UserEntry.Sources +import info.nightscout.androidaps.database.entities.UserEntry.ValueWithUnit import info.nightscout.androidaps.databinding.MaintenanceFragmentBinding import info.nightscout.androidaps.events.EventNewBG import info.nightscout.androidaps.interfaces.DatabaseHelperInterface diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt index 42006090c5..7582878236 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt @@ -293,7 +293,6 @@ class LocalProfilePlugin @Inject constructor( fun cloneProfile() { val p = profiles[currentProfileIndex].deepClone() - val sourceName = p.name p.name = p.name + " copy" profiles.add(p) currentProfileIndex = profiles.size - 1 diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt index 8a9ddc8723..4b760770fd 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt @@ -182,7 +182,7 @@ class TreatmentsCareportalFragment : DaggerFragment() { binding.remove.setOnClickListener { v: View -> val therapyEvent = v.tag as TherapyEvent activity?.let { activity -> - val text = resourceHelper.gs(R.string.eventtype) + ": " + translator.translate(therapyEvent.type.text) + "\n" + + val text = resourceHelper.gs(R.string.eventtype) + ": " + translator.translate(therapyEvent.type) + "\n" + resourceHelper.gs(R.string.notes_label) + ": " + (therapyEvent.note ?: "") + "\n" + resourceHelper.gs(R.string.date) + ": " + dateUtil.dateAndTimeString(therapyEvent.timestamp) diff --git a/core/src/main/java/info/nightscout/androidaps/utils/Translator.kt b/core/src/main/java/info/nightscout/androidaps/utils/Translator.kt index d4be0cee83..586c6189b0 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/Translator.kt +++ b/core/src/main/java/info/nightscout/androidaps/utils/Translator.kt @@ -154,14 +154,14 @@ class Translator @Inject internal constructor( } fun translate(source: Sources): String = when(source) { - Sources.Automation -> resourceHelper.gs(R.string.automation) - Sources.Loop -> resourceHelper.gs(R.string.loop) - Sources.NSClient -> resourceHelper.gs(R.string.ns) - Sources.Pump -> resourceHelper.gs(R.string.pump) - Sources.SMS -> resourceHelper.gs(R.string.smb_shortname) - Sources.Wear -> resourceHelper.gs(R.string.wear) - Sources.Unknown -> resourceHelper.gs(R.string.unknown) + Sources.Automation -> resourceHelper.gs(R.string.automation) + Sources.Loop -> resourceHelper.gs(R.string.loop) + Sources.NSClient -> resourceHelper.gs(R.string.ns) + Sources.Pump -> resourceHelper.gs(R.string.pump) + Sources.SMS -> resourceHelper.gs(R.string.smb_shortname) + Sources.Wear -> resourceHelper.gs(R.string.wear) + Sources.Unknown -> resourceHelper.gs(R.string.unknown) - else -> source.name - } + else -> source.name + } } \ No newline at end of file diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 0de20486a8..9001f6f958 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -481,7 +481,6 @@ No Unit Export User Entries to Excel (csv) "%1$s;%2$s;%3$s;%4$s;%5$s;%6$s;%7$s;%8$s;%9$s;%10$s;%11$s;%12$s;%13$s;%14$s;%15$s;%16$s;%17$s" - L!DujFNpR?D5TY9EH1DJ %1$d day