From 843239e7208f74772df44bfbbd10380b23c60ca1 Mon Sep 17 00:00:00 2001 From: Suleyman Poyraz <22801690+Zaryob@users.noreply.github.com> Date: Wed, 8 Sep 2021 15:45:19 +0300 Subject: [PATCH 1/8] Added Turkish in Readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f978afb4a7..392c8e63d2 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,8 @@ Status [![Translation Status of Sonic Pi: ru](https://hosted.weblate.org/widgets/sonic-pi/ru/svg-badge.svg)](https://hosted.weblate.org/engage/sonic-pi/) | Russian | :white_check_mark: | :white_check_mark: [![Translation Status of Sonic Pi: zh_Hans](https://hosted.weblate.org/widgets/sonic-pi/zh_Hans/svg-badge.svg)](https://hosted.weblate.org/engage/sonic-pi/) | Simplified Chinese | :white_check_mark: | :red_circle: [![Translation Status of Sonic Pi: es](https://hosted.weblate.org/widgets/sonic-pi/es/svg-badge.svg)](https://hosted.weblate.org/engage/sonic-pi/) | Spanish | :white_check_mark: | :white_check_mark: -[![Translation Status of Sonic Pi: si](https://hosted.weblate.org/widgets/sonic-pi/si/svg-badge.svg)](https://hosted.weblate.org/engage/sonic-pi/) | sinhalese| :white_check_mark: | :red_circle: +[![Translation Status of Sonic Pi: si](https://hosted.weblate.org/widgets/sonic-pi/si/svg-badge.svg)](https://hosted.weblate.org/engage/sonic-pi/) | sinhalese | :white_check_mark: | :red_circle: +[![Translation Status of Sonic Pi: tr_TR](https://hosted.weblate.org/widgets/sonic-pi/tr_TR/svg-badge.svg)](https://hosted.weblate.org/engage/sonic-pi/) | Turkish | :white_check_mark: | :red_circle: Would you like to contribute a translation too? If so, please take a look at our [translation docs](https://github.com/samaaron/sonic-pi/blob/main/TRANSLATION.md) to get started. From 5a8f3e0172c832917679ec30253e33816ef52a5e Mon Sep 17 00:00:00 2001 From: Sam Aaron Date: Tue, 21 Sep 2021 12:54:39 +0100 Subject: [PATCH 2/8] CI - remove qt mirror to see if that improves things (assuming that the install qt action has been updated since this was required). --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 979c4a7d78..69a6b985be 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,7 +74,6 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: - extra: '--b http://mirrors.ocf.berkeley.edu/qt/' cached: ${{ steps.cache-qt2.outputs.cache-hit }} # Latest Erlang on Ubuntu From c3813f05c90a978aa2a71412f9fb47a1c8b06b41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C4=B1van=C3=A7=20G=C3=BC=C3=A7k=C4=B1ran?= Date: Wed, 6 Oct 2021 15:10:13 +0300 Subject: [PATCH 3/8] Update scale.rb commented out unused variables --- app/server/ruby/lib/sonicpi/scale.rb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/server/ruby/lib/sonicpi/scale.rb b/app/server/ruby/lib/sonicpi/scale.rb index 746294ef79..e5c3600eac 100644 --- a/app/server/ruby/lib/sonicpi/scale.rb +++ b/app/server/ruby/lib/sonicpi/scale.rb @@ -46,25 +46,26 @@ class InvalidDegreeError < ArgumentError; end ; # Basic "besli" cargah_beslisi = cargah_dortlusu + [tanini] buselik_beslisi = buselik_dortlusu + [tanini] - kurdi_beslisi = kurdi_dortlusu + [tanini] rast_beslisi = rast_dortlusu + [tanini] huseyni_beslisi = [buyuk_mucenneb, kucuk_mucenneb, tanini, tanini] hicaz_beslisi = hicaz_dortlusu + [tanini] # Other "dortlu" and "besli" - saba_dortlusu = [buyuk_mucenneb, kucuk_mucenneb, kucuk_mucenneb] segah_dortlusu = [kucuk_mucenneb, tanini, buyuk_mucenneb] tam_segah_beslisi = segah_dortlusu + [tanini] eksik_segah_beslisi = segah_dortlusu + [kucuk_mucenneb] mustear_dortlusu = [tanini, kucuk_mucenneb, buyuk_mucenneb] - tam_mustear_beslisi = mustear_dortlusu + [tanini] - eksik_mustear_beslisi = mustear_dortlusu + [kucuk_mucenneb] huzzam_beslisi = [kucuk_mucenneb, tanini, kucuk_mucenneb, artik_ikili] nikriz_beslisi = [tanini, kucuk_mucenneb, artik_ikili, kucuk_mucenneb] - pencgah_beslisi = [tanini, tanini, buyuk_mucenneb, kucuk_mucenneb] tam_ferahnak_beslisi = [kucuk_mucenneb, tanini, tanini, buyuk_mucenneb] eksik_ferahnak_beslisi = [kucuk_mucenneb, tanini, tanini, bakiyye] nisabur_dortlusu = [buyuk_mucenneb, kucuk_mucenneb, tanini] - nisabur_beslisi = nisabur_dortlusu + [bakiyye] + # These intervals are included in Turkish makams but not included in the scales provided, commented out for brevity. + # kurdi_beslisi = kurdi_dortlusu + [tanini] + # saba_dortlusu = [buyuk_mucenneb, kucuk_mucenneb, kucuk_mucenneb] + # tam_mustear_beslisi = mustear_dortlusu + [tanini] + # eksik_mustear_beslisi = mustear_dortlusu + [kucuk_mucenneb] + # pencgah_beslisi = [tanini, tanini, buyuk_mucenneb, kucuk_mucenneb] + # nisabur_beslisi = nisabur_dortlusu + [bakiyye] { diatonic: ionian_sequence, ionian: ionian_sequence, @@ -330,4 +331,4 @@ def inspect to_s end end -end \ No newline at end of file +end From db3e86c0db3ef549cb5f1bfc2ade421072229323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C4=B1van=C3=A7=20G=C3=BC=C3=A7k=C4=B1ran?= Date: Wed, 6 Oct 2021 15:12:38 +0300 Subject: [PATCH 4/8] Update scale.rb changed comment text --- app/server/ruby/lib/sonicpi/scale.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/server/ruby/lib/sonicpi/scale.rb b/app/server/ruby/lib/sonicpi/scale.rb index e5c3600eac..7769492453 100644 --- a/app/server/ruby/lib/sonicpi/scale.rb +++ b/app/server/ruby/lib/sonicpi/scale.rb @@ -59,7 +59,7 @@ class InvalidDegreeError < ArgumentError; end ; tam_ferahnak_beslisi = [kucuk_mucenneb, tanini, tanini, buyuk_mucenneb] eksik_ferahnak_beslisi = [kucuk_mucenneb, tanini, tanini, bakiyye] nisabur_dortlusu = [buyuk_mucenneb, kucuk_mucenneb, tanini] - # These intervals are included in Turkish makams but not included in the scales provided, commented out for brevity. + # currently unused, but can be used to extend other scales # kurdi_beslisi = kurdi_dortlusu + [tanini] # saba_dortlusu = [buyuk_mucenneb, kucuk_mucenneb, kucuk_mucenneb] # tam_mustear_beslisi = mustear_dortlusu + [tanini] From 10a0b5ec291deeefb06e785d22e52a6abb05cff2 Mon Sep 17 00:00:00 2001 From: Mukul Kolpe Date: Mon, 11 Oct 2021 21:48:14 +0530 Subject: [PATCH 5/8] corrected a typo in Tutorial Time-State section --- etc/doc/tutorial/10-State.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/doc/tutorial/10-State.md b/etc/doc/tutorial/10-State.md index ed34e40075..f3e7632615 100644 --- a/etc/doc/tutorial/10-State.md +++ b/etc/doc/tutorial/10-State.md @@ -19,6 +19,6 @@ might sound complex and difficult (in fact, in the UK, programming with multiple threads and shared memory is typically a university level subject). However, as you'll see, just like playing your first note, *Sonic Pi makes it incredibly simple to share state across threads* -whilst still keeping your programs *thread-safe and deterministic.*. +whilst still keeping your programs *thread-safe and deterministic.* Meet `get` and `set`... From cac106cdbdc5887264d2c2609258606afaee800f Mon Sep 17 00:00:00 2001 From: Mukul Kolpe Date: Tue, 12 Oct 2021 01:23:47 +0530 Subject: [PATCH 6/8] Corrected a typo in Tutorial Time-State section --- etc/doc/tutorial/10-State.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/doc/tutorial/10-State.md b/etc/doc/tutorial/10-State.md index f3e7632615..0d2641d93e 100644 --- a/etc/doc/tutorial/10-State.md +++ b/etc/doc/tutorial/10-State.md @@ -19,6 +19,6 @@ might sound complex and difficult (in fact, in the UK, programming with multiple threads and shared memory is typically a university level subject). However, as you'll see, just like playing your first note, *Sonic Pi makes it incredibly simple to share state across threads* -whilst still keeping your programs *thread-safe and deterministic.* +whilst still keeping your programs *thread-safe and deterministic*. Meet `get` and `set`... From 60b7f664a212e51045c8f0b3521f4ddd7f133be0 Mon Sep 17 00:00:00 2001 From: Owen Niblock Date: Tue, 12 Oct 2021 10:37:56 +0100 Subject: [PATCH 7/8] adds .idea to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 707a52a399..d6f72edd30 100644 --- a/.gitignore +++ b/.gitignore @@ -125,6 +125,7 @@ book/ ## IntelliJ IDEA *.iml +.idea ## i18n auto-generated files From 254d068cc560181180a3788385b6aeee9f9c2ca6 Mon Sep 17 00:00:00 2001 From: Owen Niblock Date: Tue, 12 Oct 2021 10:38:35 +0100 Subject: [PATCH 8/8] fixes path in test docs when running 'rake test' --- TESTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TESTING.md b/TESTING.md index 4b3523d173..95023d1cad 100644 --- a/TESTING.md +++ b/TESTING.md @@ -10,7 +10,7 @@ Sonic Pi doesn't have a database, so the tests are quite a lot simpler than your average web app. ``` -$ cd app/server/sonicpi/test +$ cd app/server/ruby/test $ rake test ```