Skip to content

Commit

Permalink
IDE-257 Formula Editor - missing a "Confirm" button (#5008)
Browse files Browse the repository at this point in the history
* IDE-257 Change formula editor compute button string to 'Confirm'

* IDE-257 Change string literal name formula_editor_compute to formula_editor_confirm; change all strings in English for the confirm button in the formula editor

* IDE-257 Add test for confirm button string in formula editor
  • Loading branch information
astrokit authored Sep 4, 2024
1 parent ddee76f commit 7ff2dd1
Show file tree
Hide file tree
Showing 77 changed files with 82 additions and 76 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,12 @@ public void addColorTest() {
onView(withId(R.id.brick_set_variable_edit_text)).check(matches(withText("'#0074CD' ")));
}

@Test
public void testConfirmButtonString() {
onView(withId(R.id.brick_set_variable_edit_text)).perform(click());
onView(withId(R.id.formula_editor_keyboard_compute)).check(matches(withText(R.string.formula_editor_confirm)));
}

@After
public void tearDown() throws IOException {
baseActivityTestRule.finishActivity();
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/main/res/layout/formula_editor_keyboard.xml
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,6 @@
style="@style/FormulaEditorComputeButton"
android:layout_marginBottom="@dimen/key_margin"
android:layout_span="2"
android:text="@string/formula_editor_compute" />
android:text="@string/formula_editor_confirm" />
</TableRow>
</TableLayout>
2 changes: 1 addition & 1 deletion catroid/src/main/res/values-af/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1747,7 +1747,7 @@ needs read and write access to it. You can always change permissions through you
<string formatted="false" name="formula_editor_object_background_name">background name</string>
<string formatted="false" name="formula_editor_object_number_of_backgrounds">number of backgrounds</string>
<string formatted="false" name="formula_editor_object_distance_to">distance to touch position</string>
<string formatted="false" name="formula_editor_compute">Compute</string>
<string formatted="false" name="formula_editor_confirm">Confirm</string>
<string formatted="false" name="formula_editor_object">Properties</string>
<string formatted="false" name="formula_editor_functions">Functions</string>
<string formatted="false" name="formula_editor_logic">Logic</string>
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1912,7 +1912,7 @@
<string formatted="false" name="formula_editor_object_background_name">إسم خلفية الشاشة</string>
<string formatted="false" name="formula_editor_object_number_of_backgrounds">عدد الخلفيات</string>
<string formatted="false" name="formula_editor_object_distance_to">المسافة إلى</string>
<string formatted="false" name="formula_editor_compute">النتيجة</string>
<string formatted="false" name="formula_editor_confirm">النتيجة</string>
<string formatted="false" name="formula_editor_object">الكائن</string>
<string formatted="false" name="formula_editor_functions">الدوال</string>
<string formatted="false" name="formula_editor_logic">المنطق</string>
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/main/res/values-az/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1747,7 +1747,7 @@ needs read and write access to it. You can always change permissions through you
<string formatted="false" name="formula_editor_object_background_name">background name</string>
<string formatted="false" name="formula_editor_object_number_of_backgrounds">number of backgrounds</string>
<string formatted="false" name="formula_editor_object_distance_to">distance to touch position</string>
<string formatted="false" name="formula_editor_compute">Compute</string>
<string formatted="false" name="formula_editor_confirm">Confirm</string>
<string formatted="false" name="formula_editor_object">Properties</string>
<string formatted="false" name="formula_editor_functions">Functions</string>
<string formatted="false" name="formula_editor_logic">Logic</string>
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/main/res/values-bg/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1748,7 +1748,7 @@ needs read and write access to it. You can always change permissions through you
<string formatted="false" name="formula_editor_object_background_name">background name</string>
<string formatted="false" name="formula_editor_object_number_of_backgrounds">number of backgrounds</string>
<string formatted="false" name="formula_editor_object_distance_to">distance to touch position</string>
<string formatted="false" name="formula_editor_compute">Compute</string>
<string formatted="false" name="formula_editor_confirm">Confirm</string>
<string formatted="false" name="formula_editor_object">Properties</string>
<string formatted="false" name="formula_editor_functions">Functions</string>
<string formatted="false" name="formula_editor_logic">Logic</string>
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/main/res/values-bn/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1706,7 +1706,7 @@
<string formatted="false" name="formula_editor_object_background_name">ব্যাকগ্রাউন্ড নাম</string>
<string formatted="false" name="formula_editor_object_number_of_backgrounds">পটভূমি সংখ্যা</string>
<string formatted="false" name="formula_editor_object_distance_to">স্পর্শ অবস্থান থেকে দূরত্ব</string>
<string formatted="false" name="formula_editor_compute">গণনা করা</string>
<string formatted="false" name="formula_editor_confirm">গণনা করা</string>
<string formatted="false" name="formula_editor_object">বিশিষ্টতাসমূহ</string>
<string formatted="false" name="formula_editor_functions">ক্রিয়াকলাপ</string>
<string formatted="false" name="formula_editor_logic">যুক্তিবিদ্যা</string>
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/main/res/values-bs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1771,7 +1771,7 @@ needs read and write access to it. You can always change permissions through you
<string formatted="false" name="formula_editor_object_background_name">naziv pozadine</string>
<string formatted="false" name="formula_editor_object_number_of_backgrounds">number of backgrounds</string>
<string formatted="false" name="formula_editor_object_distance_to">udaljenost od pozicije dodira</string>
<string formatted="false" name="formula_editor_compute">Izračunaj</string>
<string formatted="false" name="formula_editor_confirm">Izračunaj</string>
<string formatted="false" name="formula_editor_object">Objekat</string>
<string formatted="false" name="formula_editor_functions">Funkcije</string>
<string formatted="false" name="formula_editor_logic">Logika</string>
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/main/res/values-ca/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1747,7 +1747,7 @@ needs read and write access to it. You can always change permissions through you
<string formatted="false" name="formula_editor_object_background_name">background name</string>
<string formatted="false" name="formula_editor_object_number_of_backgrounds">number of backgrounds</string>
<string formatted="false" name="formula_editor_object_distance_to">distance to touch position</string>
<string formatted="false" name="formula_editor_compute">Compute</string>
<string formatted="false" name="formula_editor_confirm">Confirm</string>
<string formatted="false" name="formula_editor_object">Properties</string>
<string formatted="false" name="formula_editor_functions">Functions</string>
<string formatted="false" name="formula_editor_logic">Logic</string>
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/main/res/values-chr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1747,7 +1747,7 @@ needs read and write access to it. You can always change permissions through you
<string formatted="false" name="formula_editor_object_background_name">background name</string>
<string formatted="false" name="formula_editor_object_number_of_backgrounds">number of backgrounds</string>
<string formatted="false" name="formula_editor_object_distance_to">distance to touch position</string>
<string formatted="false" name="formula_editor_compute">Compute</string>
<string formatted="false" name="formula_editor_confirm">Confirm</string>
<string formatted="false" name="formula_editor_object">Properties</string>
<string formatted="false" name="formula_editor_functions">Functions</string>
<string formatted="false" name="formula_editor_logic">Logic</string>
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1832,7 +1832,7 @@ needs read and write access to it. You can always change permissions through you
<string formatted="false" name="formula_editor_object_background_name">název_pozadí</string>
<string formatted="false" name="formula_editor_object_number_of_backgrounds">number of backgrounds</string>
<string formatted="false" name="formula_editor_object_distance_to">vzdálenost k</string>
<string formatted="false" name="formula_editor_compute">Výpočetní výkon</string>
<string formatted="false" name="formula_editor_confirm">Výpočetní výkon</string>
<string formatted="false" name="formula_editor_object">Objekt</string>
<string formatted="false" name="formula_editor_functions">Funkce</string>
<string formatted="false" name="formula_editor_logic">Logika</string>
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/main/res/values-da/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1747,7 +1747,7 @@ needs read and write access to it. You can always change permissions through you
<string formatted="false" name="formula_editor_object_background_name">background name</string>
<string formatted="false" name="formula_editor_object_number_of_backgrounds">number of backgrounds</string>
<string formatted="false" name="formula_editor_object_distance_to">distance to touch position</string>
<string formatted="false" name="formula_editor_compute">Udfør</string>
<string formatted="false" name="formula_editor_confirm">Udfør</string>
<string formatted="false" name="formula_editor_object">Objekt</string>
<string formatted="false" name="formula_editor_functions">Functions</string>
<string formatted="false" name="formula_editor_logic">Logik</string>
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1713,7 +1713,7 @@
<string formatted="false" name="formula_editor_object_background_name">Hintergrundname</string>
<string formatted="false" name="formula_editor_object_number_of_backgrounds">Anzahl der Hintergründe</string>
<string formatted="false" name="formula_editor_object_distance_to">Entfernung zu</string>
<string formatted="false" name="formula_editor_compute">Berechnen</string>
<string formatted="false" name="formula_editor_confirm">Berechnen</string>
<string formatted="false" name="formula_editor_object">Eigenschaften</string>
<string formatted="false" name="formula_editor_functions">Funktionen</string>
<string formatted="false" name="formula_editor_logic">Logik</string>
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/main/res/values-el/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1742,7 +1742,7 @@ needs read and write access to it. You can always change permissions through you
<string formatted="false" name="formula_editor_object_background_name">background name</string>
<string formatted="false" name="formula_editor_object_number_of_backgrounds">number of backgrounds</string>
<string formatted="false" name="formula_editor_object_distance_to">distance to touch position</string>
<string formatted="false" name="formula_editor_compute">Compute</string>
<string formatted="false" name="formula_editor_confirm">Confirm</string>
<string formatted="false" name="formula_editor_object">Αντικείμενο</string>
<string formatted="false" name="formula_editor_functions">Functions</string>
<string formatted="false" name="formula_editor_logic">Logic</string>
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/main/res/values-en-rAU/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1747,7 +1747,7 @@ needs read and write access to it. You can always change permissions through you
<string formatted="false" name="formula_editor_object_background_name">background name</string>
<string formatted="false" name="formula_editor_object_number_of_backgrounds">number of backgrounds</string>
<string formatted="false" name="formula_editor_object_distance_to">distance to touch position</string>
<string formatted="false" name="formula_editor_compute">Compute</string>
<string formatted="false" name="formula_editor_confirm">Confirm</string>
<string formatted="false" name="formula_editor_object">Properties</string>
<string formatted="false" name="formula_editor_functions">Functions</string>
<string formatted="false" name="formula_editor_logic">Logic</string>
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/main/res/values-en-rCA/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1747,7 +1747,7 @@ needs read and write access to it. You can always change permissions through you
<string formatted="false" name="formula_editor_object_background_name">background name</string>
<string formatted="false" name="formula_editor_object_number_of_backgrounds">number of backgrounds</string>
<string formatted="false" name="formula_editor_object_distance_to">distance to touch position</string>
<string formatted="false" name="formula_editor_compute">Compute</string>
<string formatted="false" name="formula_editor_confirm">Confirm</string>
<string formatted="false" name="formula_editor_object">Properties</string>
<string formatted="false" name="formula_editor_functions">Functions</string>
<string formatted="false" name="formula_editor_logic">Logic</string>
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/main/res/values-en-rGB/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1747,7 +1747,7 @@ needs read and write access to it. You can always change permissions through you
<string formatted="false" name="formula_editor_object_background_name">background name</string>
<string formatted="false" name="formula_editor_object_number_of_backgrounds">number of backgrounds</string>
<string formatted="false" name="formula_editor_object_distance_to">distance to touch position</string>
<string formatted="false" name="formula_editor_compute">Compute</string>
<string formatted="false" name="formula_editor_confirm">Confirm</string>
<string formatted="false" name="formula_editor_object">Object</string>
<string formatted="false" name="formula_editor_functions">Functions</string>
<string formatted="false" name="formula_editor_logic">Logic</string>
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1730,7 +1730,7 @@ necesita acceso de lectura y escritura a ella. Siempre puedes cambiar los permis
<string formatted="false" name="formula_editor_object_background_name">nombre_fondo</string>
<string formatted="false" name="formula_editor_object_number_of_backgrounds">número de fondos</string>
<string formatted="false" name="formula_editor_object_distance_to">distancia a</string>
<string formatted="false" name="formula_editor_compute">Calcular</string>
<string formatted="false" name="formula_editor_confirm">Calcular</string>
<string formatted="false" name="formula_editor_object">Objeto</string>
<string formatted="false" name="formula_editor_functions">Funciones</string>
<string formatted="false" name="formula_editor_logic">Lógica</string>
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/main/res/values-eu-rES/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1747,7 +1747,7 @@ needs read and write access to it. You can always change permissions through you
<string formatted="false" name="formula_editor_object_background_name">background name</string>
<string formatted="false" name="formula_editor_object_number_of_backgrounds">number of backgrounds</string>
<string formatted="false" name="formula_editor_object_distance_to">distance to touch position</string>
<string formatted="false" name="formula_editor_compute">Compute</string>
<string formatted="false" name="formula_editor_confirm">Confirm</string>
<string formatted="false" name="formula_editor_object">Properties</string>
<string formatted="false" name="formula_editor_functions">Functions</string>
<string formatted="false" name="formula_editor_logic">Logic</string>
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/main/res/values-fa-rIR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1727,7 +1727,7 @@
<string formatted="false" name="formula_editor_object_background_name">نام پس زمینه</string>
<string formatted="false" name="formula_editor_object_number_of_backgrounds">تعداد پس زمینه</string>
<string formatted="false" name="formula_editor_object_distance_to">فاصله تا موقعیت لمس</string>
<string formatted="false" name="formula_editor_compute">محاسبه</string>
<string formatted="false" name="formula_editor_confirm">محاسبه</string>
<string formatted="false" name="formula_editor_object">شی</string>
<string formatted="false" name="formula_editor_functions">توابع</string>
<string formatted="false" name="formula_editor_logic">منطق</string>
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/main/res/values-fa/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1669,7 +1669,7 @@
<string formatted="false" name="formula_editor_object_background_name">نام پس زمینه</string>
<string formatted="false" name="formula_editor_object_number_of_backgrounds">تعداد پس زمینه ها</string>
<string formatted="false" name="formula_editor_object_distance_to">فاصله تا موقعیت لمس</string>
<string formatted="false" name="formula_editor_compute">محاسبه کن</string>
<string formatted="false" name="formula_editor_confirm">محاسبه کن</string>
<string formatted="false" name="formula_editor_object">خواص</string>
<string formatted="false" name="formula_editor_functions">توابع </string>
<string formatted="false" name="formula_editor_logic">منطق</string>
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/main/res/values-fi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1747,7 +1747,7 @@ needs read and write access to it. You can always change permissions through you
<string formatted="false" name="formula_editor_object_background_name">background name</string>
<string formatted="false" name="formula_editor_object_number_of_backgrounds">number of backgrounds</string>
<string formatted="false" name="formula_editor_object_distance_to">distance to touch position</string>
<string formatted="false" name="formula_editor_compute">Compute</string>
<string formatted="false" name="formula_editor_confirm">Confirm</string>
<string formatted="false" name="formula_editor_object">Properties</string>
<string formatted="false" name="formula_editor_functions">Functions</string>
<string formatted="false" name="formula_editor_logic">Logic</string>
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1739,7 +1739,7 @@ doit avoir accès en lecture et en écriture à la mémoire locale. Vous pouvez
<string formatted="false" name="formula_editor_object_background_name">nom de l\'arrière-plan</string>
<string formatted="false" name="formula_editor_object_number_of_backgrounds">nombre de fonds</string>
<string formatted="false" name="formula_editor_object_distance_to">distance à la position tactile</string>
<string formatted="false" name="formula_editor_compute">Calculer</string>
<string formatted="false" name="formula_editor_confirm">Calculer</string>
<string formatted="false" name="formula_editor_object">Objet</string>
<string formatted="false" name="formula_editor_functions">Fonctions</string>
<string formatted="false" name="formula_editor_logic">Logique</string>
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/main/res/values-gl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1747,7 +1747,7 @@ needs read and write access to it. You can always change permissions through you
<string formatted="false" name="formula_editor_object_background_name">background name</string>
<string formatted="false" name="formula_editor_object_number_of_backgrounds">number of backgrounds</string>
<string formatted="false" name="formula_editor_object_distance_to">distance to touch position</string>
<string formatted="false" name="formula_editor_compute">Compute</string>
<string formatted="false" name="formula_editor_confirm">Confirm</string>
<string formatted="false" name="formula_editor_object">Obxecto</string>
<string formatted="false" name="formula_editor_functions">Functions</string>
<string formatted="false" name="formula_editor_logic">Logic</string>
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/main/res/values-gu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1747,7 +1747,7 @@ needs read and write access to it. You can always change permissions through you
<string formatted="false" name="formula_editor_object_background_name">background name</string>
<string formatted="false" name="formula_editor_object_number_of_backgrounds">number of backgrounds</string>
<string formatted="false" name="formula_editor_object_distance_to">distance to touch position</string>
<string formatted="false" name="formula_editor_compute">Compute</string>
<string formatted="false" name="formula_editor_confirm">Confirm</string>
<string formatted="false" name="formula_editor_object">Properties</string>
<string formatted="false" name="formula_editor_functions">Functions</string>
<string formatted="false" name="formula_editor_logic">Logic</string>
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/main/res/values-ha/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1747,7 +1747,7 @@ needs read and write access to it. You can always change permissions through you
<string formatted="false" name="formula_editor_object_background_name">background name</string>
<string formatted="false" name="formula_editor_object_number_of_backgrounds">number of backgrounds</string>
<string formatted="false" name="formula_editor_object_distance_to">distance to touch position</string>
<string formatted="false" name="formula_editor_compute">Compute</string>
<string formatted="false" name="formula_editor_confirm">Confirm</string>
<string formatted="false" name="formula_editor_object">Properties</string>
<string formatted="false" name="formula_editor_functions">Functions</string>
<string formatted="false" name="formula_editor_logic">Logic</string>
Expand Down
Loading

0 comments on commit 7ff2dd1

Please sign in to comment.