Skip to content

Commit

Permalink
Merge pull request #126 from CodeDead/feature/rollercoaster
Browse files Browse the repository at this point in the history
Feature/rollercoaster
  • Loading branch information
CodeDead authored Jul 16, 2024
2 parents 95710d6 + c756bca commit 27acefc
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 8 deletions.
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
Binary file not shown.
1 change: 1 addition & 0 deletions src/main/resources/translations/OpalApplication.properties
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
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
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,4 @@ FastMetronome=मेट्रोनोम (तेज़)
PlayPause=चालू करे रोके
PlayPauseError=चलाने/रोकने में असमर्थ!
Dolphins=डाल्फिन
RollerCoaster=रोलर कोस्टर
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,4 @@ FastMetronome=速いメトロノーム
PlayPause=再生/一時停止
PlayPauseError=再生/一時停止できません!
Dolphins=イルカ
RollerCoaster=ローラーコースター
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
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,4 @@ FastMetronome=Быстрый метроном
PlayPause=Воспроизведение / Пауза
PlayPauseError=Невозможно воспроизвести / приостановить воспроизведение!
Dolphins=Дельфины
RollerCoaster=Американские горки
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
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
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

0 comments on commit 27acefc

Please sign in to comment.