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

Feature/rollercoaster #126

Merged
merged 2 commits into from
Jul 16, 2024
Merged

Feature/rollercoaster #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60a2514
feat: added roller coaster sound, minor locale fix
CodeDead Jul 16, 2024
c756bca
Merge branch 'refs/heads/development' into feature/rollercoaster
CodeDead Jul 16, 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 src/main/java/com/codedead/opal/controller/LanguageController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public static int getLanguageIndexFromLocale(final String locale) {
case "de-de" -> 1;
case "es-es" -> 2;
case "fr-fr" -> 3;
case "hi" -> 4;
case "hi-in" -> 4;
case "jp-jp" -> 5;
case "nl-nl" -> 6;
case "ru-ru" -> 7;
Expand All @@ -43,7 +43,7 @@ public static String getLocaleFromLanguageIndex(final int index) {
case 1 -> "de-DE";
case 2 -> "es-ES";
case 3 -> "fr-FR";
case 4 -> "hi";
case 4 -> "hi-in";
case 5 -> "jp-JP";
case 6 -> "nl-NL";
case 7 -> "ru-RU";
Expand Down
Binary file added src/main/resources/audio/rollercoaster.mp3
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions src/main/resources/translations/OpalApplication.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,4 @@ FastMetronome=Metronome (fast)
PlayPause=Play / Pause
PlayPauseError=Unable to play / pause!
Dolphins=Dolphins
RollerCoaster=Roller coaster
1 change: 1 addition & 0 deletions src/main/resources/translations/OpalApplication_de_DE.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,4 @@ FastMetronome=Schnelles Metronom
PlayPause=Abspielen / Pause
PlayPauseError=Abspielen / Pause konnte nicht ausgeführt werden!
Dolphins=Delfine
RollerCoaster=Achterbahn
1 change: 1 addition & 0 deletions src/main/resources/translations/OpalApplication_es_ES.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,4 @@ FastMetronome=Metronomo rápido
PlayPause=Reproducir / Pausa
PlayPauseError=¡No se puede reproducir / pausar el sonido!
Dolphins=Delfines
RollerCoaster=Montaña rusa
1 change: 1 addition & 0 deletions src/main/resources/translations/OpalApplication_fr_FR.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,4 @@ FastMetronome=Métronome rapide
PlayPause=Lecture / Pause
PlayPauseError=Impossible de lire / mettre en pause!
Dolphins=Dauphins
RollerCoaster=Montagnes russes
1 change: 1 addition & 0 deletions ...ranslations/OpalApplication_hi.properties → ...slations/OpalApplication_hi_IN.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,4 @@ FastMetronome=मेट्रोनोम (तेज़)
PlayPause=चालू करे रोके
PlayPauseError=चलाने/रोकने में असमर्थ!
Dolphins=डाल्फिन
RollerCoaster=रोलर कोस्टर
1 change: 1 addition & 0 deletions src/main/resources/translations/OpalApplication_jp_JP.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,4 @@ FastMetronome=速いメトロノーム
PlayPause=再生/一時停止
PlayPauseError=再生/一時停止できません!
Dolphins=イルカ
RollerCoaster=ローラーコースター
1 change: 1 addition & 0 deletions src/main/resources/translations/OpalApplication_nl_NL.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,4 @@ FastMetronome=Metronoom (snel)
PlayPause=Afspelen / Pauzeren
PlayPauseError=Kan niet afspelen / pauzeren!
Dolphins=Dolfijnen
RollerCoaster=Achtbaan
1 change: 1 addition & 0 deletions src/main/resources/translations/OpalApplication_ru_RU.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,4 @@ FastMetronome=Быстрый метроном
PlayPause=Воспроизведение / Пауза
PlayPauseError=Невозможно воспроизвести / приостановить воспроизведение!
Dolphins=Дельфины
RollerCoaster=Американские горки
1 change: 1 addition & 0 deletions src/main/resources/translations/OpalApplication_tr_TR.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,4 @@ FastMetronome=Hızlı metronom
PlayPause=Oynat / Duraklat
PlayPauseError=Oynatma / Duraklatma düğmesi oluşturulamıyor!
Dolphins=Yunuslar
RollerCoaster=Lunapark treni
1 change: 1 addition & 0 deletions src/main/resources/translations/OpalApplication_zh_CN.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,4 @@ FastMetronome=快节拍器
PlayPause=播放 / 暂停
PlayPauseError=无法播放 / 暂停！
Dolphins=海豚
RollerCoaster=过山车
16 changes: 10 additions & 6 deletions src/main/resources/windows/MainWindow.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,7 @@
<RowConstraints vgrow="ALWAYS"/>
<RowConstraints vgrow="ALWAYS"/>
<RowConstraints vgrow="ALWAYS"/>
<RowConstraints vgrow="ALWAYS"/>
</rowConstraints>

<columnConstraints>
Expand All @@ -430,22 +431,25 @@
<SoundPane GridPane.rowIndex="2" name="%Sleepy"
mediaKey="sleepy" mediaPath="/audio/sleepy.mp3"
image="/images/sleepy.png"/>
<SoundPane GridPane.rowIndex="3" name="%Gong"
<SoundPane GridPane.rowIndex="3" name="%RollerCoaster"
mediaKey="train" mediaPath="/audio/rollercoaster.mp3"
image="/images/train.png"/>
<SoundPane GridPane.rowIndex="4" name="%Gong"
mediaKey="gong" mediaPath="/audio/gong.mp3"
image="/images/gong.png"/>
<SoundPane GridPane.rowIndex="4" name="%BellTower"
<SoundPane GridPane.rowIndex="5" name="%BellTower"
mediaKey="belltower" mediaPath="/audio/belltower.mp3"
image="/images/belltower.png"/>
<SoundPane GridPane.rowIndex="5" name="%Space"
<SoundPane GridPane.rowIndex="6" name="%Space"
mediaKey="space" mediaPath="/audio/space.mp3"
image="/images/space.png"/>
<SoundPane GridPane.rowIndex="6" name="%Train"
<SoundPane GridPane.rowIndex="7" name="%Train"
mediaKey="train" mediaPath="/audio/train.mp3"
image="/images/train.png"/>
<SoundPane GridPane.rowIndex="7" name="%SlowMetronome"
<SoundPane GridPane.rowIndex="8" name="%SlowMetronome"
mediaKey="slowmetronome" mediaPath="/audio/metronome.mp3"
image="/images/metronome.png"/>
<SoundPane GridPane.rowIndex="8" name="%FastMetronome"
<SoundPane GridPane.rowIndex="9" name="%FastMetronome"
mediaKey="fastmetronome" mediaPath="/audio/metronomefast.mp3"
image="/images/metronome.png"/>
</GridPane>
Expand Down