Skip to content

Commit

Permalink
change enroll_in to new_enrollment
Browse files Browse the repository at this point in the history
Signed-off-by: Pablo <[email protected]>
  • Loading branch information
Balcan committed Feb 8, 2024
1 parent 1cba0fd commit 1924feb
Show file tree
Hide file tree
Showing 20 changed files with 10 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -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

Expand Down Expand Up @@ -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
)
}
}

Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,6 @@
<string name="add_note">أضف ملاحظة</string>
<string name="revert">العودة</string>
<string name="activated">نشط</string>
<string name="enroll_in">تسجيل في %s</string>
<string name="missing_mandatory_fields_title">بعض الحقول الإلزامية مفقودة</string>
<string name="missing_mandatory_fields_text">بعض الحقول الإلزامية مفقودة. إذا كنت تريد الرجوع الآن ، فسيتم حذف جميع المعلومات المحفوظة.</string>
<string name="missing_mandatory_fields_text_not_delete">بعض الحقول الإلزامية مفقودة. إذا كنت تريد العودة ، يرجى ملؤها.</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-b+uz+Latn/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,6 @@
<string name="add_note">Izoh qoldirish</string>
<string name="revert">Qaytish</string>
<string name="activated">Faollashtirildi</string>
<string name="enroll_in">Qayd qilingan %s</string>
<string name="missing_mandatory_fields_title">Majburiy maydonlar qoldirib ketilgan</string>
<string name="missing_mandatory_fields_text">Baʼzi majburiy maydonlar qoldirib ketilgan. Аgar hozir orqaga qaytsangiz, barcha saqlangan maʼlumotlar oʼchib ketadi.</string>
<string name="missing_mandatory_fields_text_not_delete">Baʼzi majburiy maydonlar qoldirib ketilgan. Аgar orqaga qaytmoqchi boʼlsangiz, Iltimos, ularni toʼldiring.</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,6 @@
<string name="add_note">Přidat poznámku</string>
<string name="revert">Vrátit zpět</string>
<string name="activated">Aktivováno</string>
<string name="enroll_in">Zapsat do %s</string>
<string name="missing_mandatory_fields_title">Chybí povinná pole</string>
<string name="missing_mandatory_fields_text">Některá povinná pole chybí. Pokud se chcete vrátit zpět, budou všechny uložené informace odstraněny.</string>
<string name="missing_mandatory_fields_text_not_delete">Některá povinná pole chybí. Pokud se chcete vrátit, vyplňte je prosím.</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@
<string name="add_note">Añadir nota</string>
<string name="revert">Deshacer</string>
<string name="activated">Activado</string>
<string name="enroll_in">Enrolar en %s</string>
<string name="missing_mandatory_fields_title">Los campos obligatorios no pueden estar vacios</string>
<string name="missing_mandatory_fields_text">Algunos campos obligatorios están vacíos. Si desea ir atrás ahora, toda la información guardada se borrará.</string>
<string name="missing_mandatory_fields_text_not_delete">Faltan campos obligatorios. Rellénelos para ir atrás. </string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,6 @@
<string name="add_note">Ajouter une note</string>
<string name="revert">Annuler</string>
<string name="activated">Activé</string>
<string name="enroll_in">S´inscrire à %s</string>
<string name="missing_mandatory_fields_title">Les champs obligatoires sont manquant</string>
<string name="missing_mandatory_fields_text">Certains des champs obligatoires sont manquant. Si vous voulez retourner, tout l´information sera supprimer</string>
<string name="missing_mandatory_fields_text_not_delete">Certains champs obligatoires sont vides. Si vous voulez retourner, veuillez les renseigner. </string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-id/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,6 @@
<string name="add_note">Tambah catatan</string>
<string name="revert">Kembali</string>
<string name="activated">Diaktifkan</string>
<string name="enroll_in">Mendaftar %s</string>
<string name="missing_mandatory_fields_title">Bidang wajib tidak ada</string>
<string name="missing_mandatory_fields_text">Beberapa bidang wajib tidak ada. Jika Anda ingin kembali sekarang, semua informasi yang disimpan akan dihapus.</string>
<string name="missing_mandatory_fields_text_not_delete">Beberapa bidang wajib tidak ada. Jika Anda ingin kembali, silakan isi.</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-km/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@
<string name="add_note">បន្ថែមការកត់ចំណាំ</string>
<string name="revert">ត្រលប់ក្រោយ</string>
<string name="activated">បានដាក់អោយដំណើរការ</string>
<string name="enroll_in">ចុះឈ្មោះក្នុង %s</string>
<string name="missing_mandatory_fields_title">ទិន្នន័យចាំបាច់មិនមាន</string>
<string name="missing_mandatory_fields_text">ឈ្មោះទិន្នន័យចាំបាច់ខ្លះមិនមាន, ប្រសិនបើអ្នកចង់ត្រឡប់ទៅវិញ រាល់ពត៏មាននិងត្រូវលុយចោល</string>
<string name="missing_mandatory_fields_go_back">លុប ហើយត្រឡប់ទៅវិញ</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-lo/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@
<string name="add_note">ຂຽນບັນທຶກລົງ</string>
<string name="revert">ກັບຄືນສູ່ສະພາບເດີມ</string>
<string name="activated">ເປີດການນໍາໃຊ້ແລ້ວ</string>
<string name="enroll_in">ຂື້ນທະບຽນມີ %s</string>
<string name="missing_mandatory_fields_title">ຫ້ອງປ້ອນຂໍ້ມູນທີ່ຈໍາເປັນ ບໍ່ເຫັນ</string>
<string name="missing_mandatory_fields_text">ຫ້ອງປ້ອນຂໍ້ມູນຈໍານວນໜື່ງບໍ່ເຫັນ. ຖ້າທ່ານຕ້ອງການກັບຄືນດຽວນີ້, ຂໍ້ມູນທັງໝົດທີ່ໄດ້ບັນທຶກແລ້ວຈະຖືກລືບ</string>
<string name="missing_mandatory_fields_events">ບາງຊ່ອງຂໍ້ມູນຈຳເປັນຕ້ອງດຳເນີນການຂອງທ່ານ.\n ທ່ານຕ້ອງການກວດສອບແບບຟອມຫຼືບໍ?</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-nb/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,6 @@
<string name="add_note">Legg til notat</string>
<string name="revert">Reverser</string>
<string name="activated">Aktivert</string>
<string name="enroll_in">Registrer i %s</string>
<string name="missing_mandatory_fields_title">Obligatoriske felter mangler</string>
<string name="missing_mandatory_fields_text">Noen obligatoriske felt mangler. Hvis du vil gå tilbake nå, all lagret informasjon vil bli slettet.</string>
<string name="missing_mandatory_fields_text_not_delete">Noen obligatoriske felt mangler. Hvis du vil gå tilbake, vennligst fyll inn dem.</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-nl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@
<string name="add_note">Notitie toevoegen</string>
<string name="revert">Terugdraaien</string>
<string name="activated">Geactiveerd</string>
<string name="enroll_in">Schrijf je in bij %s</string>
<string name="missing_mandatory_fields_title">Verplichte velden ontbreken</string>
<string name="missing_mandatory_fields_text">Sommige verplichte velden ontbreken. Als u nu terug wilt gaan, wordt alle opgeslagen informatie verwijderd.</string>
<string name="missing_mandatory_fields_text_not_delete">Sommige verplichte velden ontbreken. Als je terug wilt gaan, vul ze dan in.</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-pt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,6 @@
<string name="add_note">Adicionar uma nota</string>
<string name="revert">Reverter</string>
<string name="activated">Ativado</string>
<string name="enroll_in">Inscreva-se %s</string>
<string name="missing_mandatory_fields_title">Faltam campos obrigatórios</string>
<string name="missing_mandatory_fields_text">Alguns campos obrigatórios estão ausentes. Se você quiser voltar agora, todas as informações salvas serão excluídas.</string>
<string name="missing_mandatory_fields_text_not_delete">Alguns campos obrigatórios estão ausentes. Se você quiser voltar, por favor preencha-os. </string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-sv/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@
<string name="add_note">Lägg till anteckning</string>
<string name="revert">Återställ</string>
<string name="activated">Aktiverad</string>
<string name="enroll_in">Registreras %s</string>
<string name="missing_mandatory_fields_title">Obligatoriska fält saknas</string>
<string name="missing_mandatory_fields_text">Några obligatoriska fält saknas. Om du vill gå tillbaka nu raderas alla sparade uppgifter.</string>
<string name="missing_mandatory_fields_go_back">Ta bort och gå tillbaka</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-uk/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,6 @@
<string name="add_note">Додати нотатку</string>
<string name="revert">Повернути</string>
<string name="activated">Активовано</string>
<string name="enroll_in">Реєстрація в %s</string>
<string name="missing_mandatory_fields_title">Не заповнено обов\'язкові поля</string>
<string name="missing_mandatory_fields_text">Деякі обов’язкові поля не заповнено. Якщо Ви хочете повернутися зараз, уся збережена інформація буде видалена.</string>
<string name="missing_mandatory_fields_text_not_delete">Деякі обов’язкові поля не заповнено. Якщо Ви хочете повернутися, заповніть їх. </string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-uz/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,6 @@
<string name="add_note">Изоҳ қолдириш</string>
<string name="revert">Қайтиш</string>
<string name="activated">Фаоллаштирилди</string>
<string name="enroll_in">Қайд қилинган %s</string>
<string name="missing_mandatory_fields_title">Мажбурий майдонлар қолдириб кетилган</string>
<string name="missing_mandatory_fields_text">Баъзи мажбурий майдонлар қолдириб кетилган. Агар ҳозир орқага қайтсангиз, барча сақланган маълумотлар ўчиб кетади.</string>
<string name="missing_mandatory_fields_text_not_delete">Баъзи мажбурий майдонлар қолдириб кетилган. Агар орқага қайтмоқчи бўлсангиз, Илтимос, уларни тўлдиринг.</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-vi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,6 @@
<string name="add_note">Thêm ghi chú</string>
<string name="revert">Hoàn tác</string>
<string name="activated">Đã hoạt động</string>
<string name="enroll_in">Đăng ký vào %s</string>
<string name="missing_mandatory_fields_title">Thiếu trường dữ liệu bắt buộc</string>
<string name="missing_mandatory_fields_text">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.</string>
<string name="missing_mandatory_fields_text_not_delete">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</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-zh-rCN/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,6 @@
<string name="add_note">添加笔记</string>
<string name="revert">反转</string>
<string name="activated">激活</string>
<string name="enroll_in">注册 %s</string>
<string name="missing_mandatory_fields_title">强制字段缺失</string>
<string name="missing_mandatory_fields_text">有些强制字段缺失,如果你后退,所有保存的信息将被删除。</string>
<string name="missing_mandatory_fields_text_not_delete">有些强制字段缺失,如果你后退,请填充他们</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-zh/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@
<string name="add_note">添加笔记</string>
<string name="revert">反转</string>
<string name="activated">激活</string>
<string name="enroll_in">注册 %s</string>
<string name="missing_mandatory_fields_title">强制字段缺失</string>
<string name="missing_mandatory_fields_text">有些强制字段缺失,如果你后退,所有保存的信息将被删除。</string>
<string name="missing_mandatory_fields_text_not_delete">有些强制字段缺失,如果你后退,请填充他们</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,6 @@
<string name="add_note">Add note</string>
<string name="revert">Revert</string>
<string name="activated">Activated</string>
<string name="enroll_in">Enroll in %s</string>
<string name="missing_mandatory_fields_title">Mandatory fields are missing</string>
<string name="missing_mandatory_fields_text">Some mandatory fields are missing. If you want to go back now, all saved information will be deleted.</string>
<string name="missing_mandatory_fields_text_not_delete">Some mandatory fields are missing. If you want to go back, please fill them.</string>
Expand Down
1 change: 1 addition & 0 deletions commons/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -255,5 +255,6 @@
<string name="edition_enrollment_is_no_open_V2">This data is not editable because the %s is completed or cancelled</string>
<string name="enrollment_completed_V2">%s completed</string>
<string name="enrollment_cancelled_V2">%s cancelled</string>
<string name="new_enrollment">New %s</string>

</resources>

0 comments on commit 1924feb

Please sign in to comment.