diff --git a/app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentActivity.kt b/app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentActivity.kt index 2f6914d8afc..4c59902c0dc 100644 --- a/app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentActivity.kt +++ b/app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentActivity.kt @@ -43,6 +43,7 @@ import org.hisp.dhis.android.core.common.FeatureType import org.hisp.dhis.android.core.enrollment.EnrollmentStatus import java.io.File import javax.inject.Inject +import org.dhis2.commons.resources.ResourceManager class EnrollmentActivity : ActivityGlobalAbstract(), EnrollmentView { @@ -51,6 +52,9 @@ class EnrollmentActivity : ActivityGlobalAbstract(), EnrollmentView { private var forRelationship: Boolean = false private lateinit var formView: FormView + @Inject + lateinit var resourceManager: ResourceManager + @Inject lateinit var presenter: EnrollmentPresenterImpl @@ -343,7 +347,11 @@ class EnrollmentActivity : ActivityGlobalAbstract(), EnrollmentView { binding.title.visibility = View.VISIBLE binding.teiDataHeader.root.visibility = View.GONE binding.title.text = - String.format(getString(R.string.enroll_in), presenter.getProgram()?.displayName()) + resourceManager.formatWithEnrollmentLabel( + programUid = presenter.getProgram()?.uid()!!, + R.string.new_enrollment, + 1 + ) } } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 75e1768d298..c3a66acee46 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -253,7 +253,6 @@ أضف ملاحظة العودة نشط - تسجيل في %s بعض الحقول الإلزامية مفقودة بعض الحقول الإلزامية مفقودة. إذا كنت تريد الرجوع الآن ، فسيتم حذف جميع المعلومات المحفوظة. بعض الحقول الإلزامية مفقودة. إذا كنت تريد العودة ، يرجى ملؤها. diff --git a/app/src/main/res/values-b+uz+Latn/strings.xml b/app/src/main/res/values-b+uz+Latn/strings.xml index bfce10938c1..fab2baaa3e2 100644 --- a/app/src/main/res/values-b+uz+Latn/strings.xml +++ b/app/src/main/res/values-b+uz+Latn/strings.xml @@ -224,7 +224,6 @@ Izoh qoldirish Qaytish Faollashtirildi - Qayd qilingan %s Majburiy maydonlar qoldirib ketilgan Baʼzi majburiy maydonlar qoldirib ketilgan. Аgar hozir orqaga qaytsangiz, barcha saqlangan maʼlumotlar oʼchib ketadi. Baʼzi majburiy maydonlar qoldirib ketilgan. Аgar orqaga qaytmoqchi boʼlsangiz, Iltimos, ularni toʼldiring. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 057ed32f32c..3d588b9d24f 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -249,7 +249,6 @@ Přidat poznámku Vrátit zpět Aktivováno - Zapsat do %s Chybí povinná pole Některá povinná pole chybí. Pokud se chcete vrátit zpět, budou všechny uložené informace odstraněny. Některá povinná pole chybí. Pokud se chcete vrátit, vyplňte je prosím. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index e9d1b826962..fc1c87863c7 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -247,7 +247,6 @@ Añadir nota Deshacer Activado - Enrolar en %s Los campos obligatorios no pueden estar vacios Algunos campos obligatorios están vacíos. Si desea ir atrás ahora, toda la información guardada se borrará. Faltan campos obligatorios. Rellénelos para ir atrás. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 127ffbea9e1..c92313a5c52 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -245,7 +245,6 @@ Ajouter une note Annuler Activé - S´inscrire à %s Les champs obligatoires sont manquant Certains des champs obligatoires sont manquant. Si vous voulez retourner, tout l´information sera supprimer Certains champs obligatoires sont vides. Si vous voulez retourner, veuillez les renseigner. diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 65c55b830d9..9e6cd75a9d8 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -240,7 +240,6 @@ Tambah catatan Kembali Diaktifkan - Mendaftar %s Bidang wajib tidak ada Beberapa bidang wajib tidak ada. Jika Anda ingin kembali sekarang, semua informasi yang disimpan akan dihapus. Beberapa bidang wajib tidak ada. Jika Anda ingin kembali, silakan isi. diff --git a/app/src/main/res/values-km/strings.xml b/app/src/main/res/values-km/strings.xml index def272d7ef1..da9175e9b38 100644 --- a/app/src/main/res/values-km/strings.xml +++ b/app/src/main/res/values-km/strings.xml @@ -164,7 +164,6 @@ បន្ថែមការកត់ចំណាំ ត្រលប់ក្រោយ បានដាក់អោយដំណើរការ - ចុះឈ្មោះក្នុង %s ទិន្នន័យចាំបាច់មិនមាន ឈ្មោះទិន្នន័យចាំបាច់ខ្លះមិនមាន, ប្រសិនបើអ្នកចង់ត្រឡប់ទៅវិញ រាល់ពត៏មាននិងត្រូវលុយចោល លុប ហើយត្រឡប់ទៅវិញ diff --git a/app/src/main/res/values-lo/strings.xml b/app/src/main/res/values-lo/strings.xml index 6553f84c6c6..80d45163d4e 100644 --- a/app/src/main/res/values-lo/strings.xml +++ b/app/src/main/res/values-lo/strings.xml @@ -235,7 +235,6 @@ ຂຽນບັນທຶກລົງ ກັບຄືນສູ່ສະພາບເດີມ ເປີດການນໍາໃຊ້ແລ້ວ - ຂື້ນທະບຽນມີ %s ຫ້ອງປ້ອນຂໍ້ມູນທີ່ຈໍາເປັນ ບໍ່ເຫັນ ຫ້ອງປ້ອນຂໍ້ມູນຈໍານວນໜື່ງບໍ່ເຫັນ. ຖ້າທ່ານຕ້ອງການກັບຄືນດຽວນີ້, ຂໍ້ມູນທັງໝົດທີ່ໄດ້ບັນທຶກແລ້ວຈະຖືກລືບ ບາງຊ່ອງຂໍ້ມູນຈຳເປັນຕ້ອງດຳເນີນການຂອງທ່ານ.\n ທ່ານຕ້ອງການກວດສອບແບບຟອມຫຼືບໍ? diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 727a28ebc57..3c875e068be 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -240,7 +240,6 @@ Legg til notat Reverser Aktivert - Registrer i %s Obligatoriske felter mangler Noen obligatoriske felt mangler. Hvis du vil gå tilbake nå, all lagret informasjon vil bli slettet. Noen obligatoriske felt mangler. Hvis du vil gå tilbake, vennligst fyll inn dem. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 677b0330a43..6b218a2df46 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -248,7 +248,6 @@ Notitie toevoegen Terugdraaien Geactiveerd - Schrijf je in bij %s Verplichte velden ontbreken Sommige verplichte velden ontbreken. Als u nu terug wilt gaan, wordt alle opgeslagen informatie verwijderd. Sommige verplichte velden ontbreken. Als je terug wilt gaan, vul ze dan in. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 94c0e152fcd..badcfde7eff 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -242,7 +242,6 @@ Adicionar uma nota Reverter Ativado - Inscreva-se %s Faltam campos obrigatórios Alguns campos obrigatórios estão ausentes. Se você quiser voltar agora, todas as informações salvas serão excluídas. Alguns campos obrigatórios estão ausentes. Se você quiser voltar, por favor preencha-os. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 740daf29699..1d94e3fde06 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -161,7 +161,6 @@ Lägg till anteckning Återställ Aktiverad - Registreras %s Obligatoriska fält saknas Några obligatoriska fält saknas. Om du vill gå tillbaka nu raderas alla sparade uppgifter. Ta bort och gå tillbaka diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 3c5938482bd..13c16a76da1 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -249,7 +249,6 @@ Додати нотатку Повернути Активовано - Реєстрація в %s Не заповнено обов\'язкові поля Деякі обов’язкові поля не заповнено. Якщо Ви хочете повернутися зараз, уся збережена інформація буде видалена. Деякі обов’язкові поля не заповнено. Якщо Ви хочете повернутися, заповніть їх. diff --git a/app/src/main/res/values-uz/strings.xml b/app/src/main/res/values-uz/strings.xml index e7e03793e77..f62da2150ff 100644 --- a/app/src/main/res/values-uz/strings.xml +++ b/app/src/main/res/values-uz/strings.xml @@ -240,7 +240,6 @@ Изоҳ қолдириш Қайтиш Фаоллаштирилди - Қайд қилинган %s Мажбурий майдонлар қолдириб кетилган Баъзи мажбурий майдонлар қолдириб кетилган. Агар ҳозир орқага қайтсангиз, барча сақланган маълумотлар ўчиб кетади. Баъзи мажбурий майдонлар қолдириб кетилган. Агар орқага қайтмоқчи бўлсангиз, Илтимос, уларни тўлдиринг. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 9ed5dc280e7..e8a2de6c745 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -241,7 +241,6 @@ Thêm ghi chú Hoàn tác Đã hoạt động - Đăng ký vào %s Thiếu trường dữ liệu bắt buộc Một số trường bắt buộc bị thiếu. Nếu bạn muốn quay lại, tất cả các thông tin đã lưu sẽ bị xóa. Một số trường bắt buộc nhập bị thiếu. Nếu bạn muốn quay lại, vui lòng nhập giá trị cho chúng diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 42d68095e1a..85d1521076c 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -239,7 +239,6 @@ 添加笔记 反转 激活 - 注册 %s 强制字段缺失 有些强制字段缺失,如果你后退,所有保存的信息将被删除。 有些强制字段缺失,如果你后退,请填充他们 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 26d6aaa4a8b..bbb173b0c5c 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -243,7 +243,6 @@ 添加笔记 反转 激活 - 注册 %s 强制字段缺失 有些强制字段缺失,如果你后退,所有保存的信息将被删除。 有些强制字段缺失,如果你后退,请填充他们 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ee6ce9e024a..0450af35a17 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -262,7 +262,6 @@ Add note Revert Activated - Enroll in %s Mandatory fields are missing Some mandatory fields are missing. If you want to go back now, all saved information will be deleted. Some mandatory fields are missing. If you want to go back, please fill them. diff --git a/commons/src/main/res/values/strings.xml b/commons/src/main/res/values/strings.xml index 0f1d4d42835..76c1bee76a6 100644 --- a/commons/src/main/res/values/strings.xml +++ b/commons/src/main/res/values/strings.xml @@ -255,5 +255,6 @@ This data is not editable because the %s is completed or cancelled %s completed %s cancelled + New %s