From 55cf344983e49967ae43f2ccdc19d296ce18dfe6 Mon Sep 17 00:00:00 2001 From: Olivier Lacan Date: Sat, 19 May 2018 02:59:53 -0400 Subject: [PATCH 01/15] Fix typos --- .../articles/2015-01-01-try-ruby-version-4.html.markdown | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/articles/2015-01-01-try-ruby-version-4.html.markdown b/source/articles/2015-01-01-try-ruby-version-4.html.markdown index ce06736e..2578ef3c 100644 --- a/source/articles/2015-01-01-try-ruby-version-4.html.markdown +++ b/source/articles/2015-01-01-try-ruby-version-4.html.markdown @@ -12,11 +12,11 @@ the lucky stiff', a.k.a. \_Why. You can read more about him on Wikipedia. \_Why doesn't exist anymore, but TryRuby lives on. It was first recreated by Andrew McElroy -and David Miani. Next Eric Allam and Nick Walsh took over (Codeschool/EnvyLabs, +and David Miani. Next Eric Allam and Nick Walsh took over (Envy Labs/Code School, available via TryRuby.org). ### Why_ -This fourth iteration of TryRuby was created for several reasons. +This fourth iteration of TryRuby was created for several reasons. - The lesson content was getting a bit dated. For instance the stuff about reading and writing disk files does not really belong in an entry level course these days. Writing blog software @@ -24,7 +24,7 @@ This fourth iteration of TryRuby was created for several reasons. - Lesson content also missed some important information (like __if__ statements) - All previous TryRuby versions consisted of an irb interpreter with a web front-end. Even though some security measures have been taken (isolating and restricting the irb process - and whitelisting input), this still sounds like a bad idea from a security perspective! + and whitelisting input), this still sounds like a bad idea from a security perspective! TryRubyR4 runs inside the web browser ### Changes @@ -39,7 +39,7 @@ I had to make some alterations to the TryRuby lesson content. Also updated some - Removed mousehole stuff - Improved the feedback given to the user based on the program's output a bit - Added support for lesson content in multiple languages. The Spanish, Brazilian Portuguese, - Japanese and Dutch translations are available. + Japanese and Dutch translations are available. __If YOU would like to add a translation to TryRuby you are most welcome !__ - Added explanation of if/else statements - Changed the subject of the "Class" tutorials from building a blog (so last decade) to making an From af1de1571c667c0f7e222702bf5b61c997d71833 Mon Sep 17 00:00:00 2001 From: Olivier Lacan Date: Sat, 19 May 2018 03:14:24 -0400 Subject: [PATCH 02/15] Update README with translation instructions --- README.md | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 690c20bd..edf7e6fe 100644 --- a/README.md +++ b/README.md @@ -5,18 +5,31 @@ where you can learn the Ruby language. Starting from zero knowledge about programming you can learn the basics of Ruby in 56 short lessons. ## Credits -Try Ruby version 1 by _why the lucky stiff_ -Try Ruby version 2 by _Andrew McElroy & David Miani_ -Try Ruby version 3 by _Eric Allam & Nick Walsh_ -Try Ruby version 4 by _Ivo Herweijer_ +Try Ruby version 1 by _why the lucky stiff_ +Try Ruby version 2 by _Andrew McElroy & David Miani_ +Try Ruby version 3 by _Eric Allam & Nick Walsh_ +Try Ruby version 4 by _Ivo Herweijer_ This website is partially based on OpalRb.com by _Adam Beynon_. ### Translations -Spanish translation by _Jesus Gabriel y Galan_ & _Pablo García_ -Dutch translation by _Ivo Herweijer_ +Spanish translation by _Jesus Gabriel y Galan_ & _Pablo García_ +Dutch translation by _Ivo Herweijer_ Brazilian Portuguese translation by [_Ricardo da Verdade Silva_](https://github.com/ricardovsilva)
Japanese translation by _Koji Shimada_ & _Masayoshi Takahashi_ +French translation by _Olivier Lacan_ + +To add a translation: +- duplicate the `translations/en` directory and name the new directory + with the appropriate [ISO 639-1 code][iso] for the language new + language. +- translate all Markdown files within your new translation directory. +- duplicate `source/try_ruby_en.json`, replace `en` with your new + language code, and translate all lesson titles inside the file. +- add a reference to your Markdown translation directory and JSON file + inside of `collector.rb` so that they can be loaded. +- submit a Pull Request with a branch named after your translation + language. ## Preparing Clone this repo, and use bundler to get dependencies: @@ -71,3 +84,5 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +[iso]: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes From 058a19be3ad7f38c24803a5269687ecf96f0e64a Mon Sep 17 00:00:00 2001 From: Olivier Lacan Date: Sat, 19 May 2018 03:14:41 -0400 Subject: [PATCH 03/15] Add French to language list --- source/index.html.markdown | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/index.html.markdown b/source/index.html.markdown index f229022d..e8a85a10 100644 --- a/source/index.html.markdown +++ b/source/index.html.markdown @@ -15,10 +15,11 @@ description: Learn to program in Ruby in 30 minutes From 14441f067999ee9b79f78087fefec5dd19add0b2 Mon Sep 17 00:00:00 2001 From: Olivier Lacan Date: Sat, 19 May 2018 03:15:06 -0400 Subject: [PATCH 04/15] Add label to language switcher button Icons without labels are harder to discover and use. --- source/index.html.markdown | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/index.html.markdown b/source/index.html.markdown index e8a85a10..4d37992f 100644 --- a/source/index.html.markdown +++ b/source/index.html.markdown @@ -8,10 +8,10 @@ description: Learn to program in Ruby in 30 minutes
-
- +
+
-
+