Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added support for translations to fetch from server for repeat group … #2843

Merged
merged 7 commits into from
Sep 30, 2024
Merged

Added support for translations to fetch from server for repeat group … #2843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
806d70a
Added support for translations to fetch from server for repeat group …
devanshhooda Sep 11, 2024
509c317
Updated the translation strings
devanshhooda Sep 12, 2024
9f72403
Making code more readable
devanshhooda Sep 12, 2024
7eae6d6
Updated the DialogTests as per the new text expectations
devanshhooda Sep 13, 2024
d734ac6
Removed comments from self-explanatory code as per suggestions
devanshhooda Sep 16, 2024
e0fe2c5
Removed extra variable usage
devanshhooda Sep 16, 2024
6b935e7
Merged with master branch
devanshhooda Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/assets/locales/android_translatable_strings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,8 +896,8 @@ repeat.dialog.go.back=Go Back
repeat.dialog.leave=Do Not Add
repeat.dialog.exit=Do Not Add. I'm Finished.
repeat.dialog.add=Add Group
repeat.dialog.add.another=Add another "${0}" group?
repeat.dialog.add.new=Add a new "${0}" group?
repeat.dialog.add.another=Add another ${0}?
repeat.dialog.add.new=Add a new ${0}?
lookup.table.missing.error=Unable to find lookup table "${0}". Make sure it exists and this user has access to it.

ethiopian_months=Mäskäräm,T’ïk’ïmt,Hïdar,Tahsas,T’ïr,Yäkatit,Mägabit,Miyaziya,Gïnbot,Säne,Hämle,Nähäse,P’agume
Expand Down
8 changes: 5 additions & 3 deletions app/instrumentation-tests/src/org/commcare/androidTests/DialogTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package org.commcare.androidTests

import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.action.ViewActions.click
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.espresso.matcher.ViewMatchers.withText
import androidx.test.ext.junit.runners.AndroidJUnit4
Expand Down Expand Up @@ -44,15 +45,16 @@ class DialogTests: BaseTest() {
onView(withId(R.id.nav_btn_next))
.perform(click())

withText("Add a new \"Error on add\" group?").isDisplayed()
onView(withId(R.id.choice_dialog_panel_2)).check(matches(withText("Add a new Error on add?")))

InstrumentationUtility.rotateLeft()
//TODO Expect dialog to not persist due to a activity lifecycle bug in our dialog framework.
withText("Add a new \"Error on add\" group?").doesNotExist()
withText(R.id.choice_dialog_panel_2).doesNotExist()

InstrumentationUtility.rotatePortrait()
onView(withId(R.id.nav_btn_next))
.perform(click())
onView(withText("ADD GROUP"))
onView(withId(R.id.choice_dialog_panel_2))
.perform(click())

checkDialogExistence_withRotation("Error Occurred")
Expand Down
18 changes: 10 additions & 8 deletions app/src/org/commcare/activities/FormEntryActivityUIController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import org.javarosa.core.model.data.InvalidData;
import org.javarosa.core.services.Logger;
import org.javarosa.core.services.locale.Localization;
import org.javarosa.form.api.FormEntryCaption;
import org.javarosa.form.api.FormEntryController;
import org.javarosa.form.api.FormEntryPrompt;
import org.javarosa.xpath.XPathException;
Expand Down Expand Up @@ -493,24 +494,25 @@ private void createRepeatDialog() {
final boolean backExitsForm = !details.relevantBeforeCurrentScreen;
final boolean nextExitsForm = details.relevantAfterCurrentScreen == 0;

final FormEntryCaption repeatCaptionPrompt = FormEntryActivity.mFormController.getCaptionPrompt();

// Assign title and text strings based on the current state
String backText = Localization.get("repeat.dialog.go.back");
String addAnotherText = Localization.get("repeat.dialog.add");
String title, skipText;

boolean hasRepetitions = FormEntryActivity.mFormController.getLastRepeatCount() > 0;
final String addAnotherText = repeatCaptionPrompt.getRepeatText(hasRepetitions ? "add" : "add-empty");

String skipText;

if (!nextExitsForm) {
skipText = Localization.get("repeat.dialog.leave");
} else {
skipText = Localization.get("repeat.dialog.exit");
}
if (FormEntryActivity.mFormController.getLastRepeatCount() > 0) {
title = Localization.get("repeat.dialog.add.another", FormEntryActivity.mFormController.getLastGroupText());
} else {
title = Localization.get("repeat.dialog.add.new", FormEntryActivity.mFormController.getLastGroupText());
}

// Create the choice dialog
ContextThemeWrapper wrapper = new ContextThemeWrapper(activity, R.style.DialogBaseTheme);
final PaneledChoiceDialog dialog = new HorizontalPaneledChoiceDialog(wrapper, title);
final PaneledChoiceDialog dialog = new HorizontalPaneledChoiceDialog(wrapper, addAnotherText);

// Panel 1: Back option
View.OnClickListener backListener = v -> {
Expand Down
Loading