Merge remote-tracking branch 'origin/master'

This commit is contained in:
law39 2020-05-01 13:46:13 +01:00
commit 3574bfca8e

View file

@ -148,7 +148,6 @@ public class AddWordController extends SharedCodeController {
Application.dictionary.add(dictionaryEntry); Application.dictionary.add(dictionaryEntry);
Application.practiceList.add(dictionaryEntry); Application.practiceList.add(dictionaryEntry);
//Resets values to blank for next word to be entered //Resets values to blank for next word to be entered
english.clear(); english.clear();
welsh.clear(); welsh.clear();
@ -258,6 +257,7 @@ public class AddWordController extends SharedCodeController {
public void addCharŷ(ActionEvent actionEvent) { public void addCharŷ(ActionEvent actionEvent) {
welsh.appendText("ŷ"); welsh.appendText("ŷ");
} }
// äëïöüẅÿ // äëïöüẅÿ
public void addCharä(ActionEvent actionEvent) { public void addCharä(ActionEvent actionEvent) {
welsh.appendText("ä"); welsh.appendText("ä");
@ -280,7 +280,8 @@ public class AddWordController extends SharedCodeController {
public void addCharÿ(ActionEvent actionEvent) { public void addCharÿ(ActionEvent actionEvent) {
welsh.appendText("ÿ"); welsh.appendText("ÿ");
} }
// áéíóúẃý
// áéíóúẃý
public void addChará(ActionEvent actionEvent) { public void addChará(ActionEvent actionEvent) {
welsh.appendText("á"); welsh.appendText("á");
} }