diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 91812b9..224fe3a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,14 @@ -Contributing -============ +#Contributing 1. Fork the repo, develop and test your code changes, add docs, add "constructions". 2. Make sure that your commit messages clearly describe the changes. 3. Send a pull request. + +## Editing the Messages_.properties file +Translations are based on editing the `Messages_.properties` file for two-digit language codes. Each of the language codes are listed in [Java's Supported Locales](https://www.oracle.com/java/technologies/javase/jdk8-jre8-suported-locales.html). + +To add your language follow the instructions above to include your `Messages_.properties` file in the pull request (where `` is the code for your language.) + +Use either the `source/Messages.properties` file or the `source/Playground.txt` file as a template. + +More explicit instructions are in the [wiki](https://github.com/joshicola/geometry_playground_java/wiki/Instructions#languages). \ No newline at end of file diff --git a/README.md b/README.md index 72fa6e5..91d6cf0 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,14 @@ # Geometry Playground +Geometry Playground is a free ruler and compass Java application for multiple geometries. -Geometry Playground is a free ruler and compass Java application for multiple geometries. (You will need [Java 1.50](https://www.oracle.com/java/technologies/javase-downloads.html) or greater to run it.) To download Geometry Playground, follow the link below. Locate the `Playground.jar` in the download directory. Double-clicking the Playground.jar file will run Geometry Playground if the file is both set to "executable" and associated with a Java Runtime Executable. Alternatively, running the following command from a terminal prompt will do the same: `java -jar Playground.jar`. +Follow the [instructions](https://github.com/joshicola/geometry_playground_java/wiki/Instructions#installation-and-launch) to download and launch Geometry Playground. -
+## Language Translations +Geometry Playground has been translated into [10 Languages](https://github.com/joshicola/geometry_playground_java/wiki/Instructions#languages). To have it in your own language follow the [contributors guide](CONTRIBUTING.md) for changes to the `source/Messages.properties` file. -[Geometry Playground](https://github.com/joshicola/geometry_playground_java/releases/latest/download/Playground.jar)
-[幾何学プレイグランド](https://github.com/joshicola/geometry_playground_java/releases/latest/download/Playground.jar)
-[Parque Geométrico](https://github.com/joshicola/geometry_playground_java/releases/latest/download/Playground.jar)
-[भूमिती अंगण](https://github.com/joshicola/geometry_playground_java/releases/latest/download/Playground.jar)
-[La Géométrie, une aire de jeux](https://github.com/joshicola/geometry_playground_java/releases/latest/download/Playground.jar)
-[الهندسة، مساحة ألعاب](https://github.com/joshicola/geometry_playground_java/releases/latest/download/Playground.jar)
-[기하 놀이마당](https://github.com/joshicola/geometry_playground_java/releases/latest/download/Playground.jar)
-[Геометрическая Игравая Плошадка](https://github.com/joshicola/geometry_playground_java/releases/latest/download/Playground.jar)
-[Geometria Játszótér](https://github.com/joshicola/geometry_playground_java/releases/latest/download/Playground.jar)
-[几何园地](https://github.com/joshicola/geometry_playground_java/releases/latest/download/Playground.jar) -
-Instructions for Geometry Playground are probably not needed, but here is the general idea: +## Basic Instructions for Use +Barebones basic instructions for Geometry Playground are listed below: 1. Choose a geometry by selecting a tab. 2. Using the menus, choose what you want to do. You probably want to begin with the **Construct** menu. @@ -24,12 +16,54 @@ Instructions for Geometry Playground are probably not needed, but here is the ge The command to "move stuff around" can be found in the **Manipulate** menu: **Transform** is the command. +More in-depth instructions can be found in the accompanying [wiki pages](https://github.com/joshicola/geometry_playground_java/wiki/Instructions#instructions-for-use). + +## Sample Constructions There are some [**constructions**](Constructions) of some traditional Euclidean constructions and their counterparts in other geometries. These [**constructions**](Constructions) are integrated into this repository. +## Contributing For contributing improvements to Geometry Playground or additional [**constructions**](Constructions), please submit a pull request. +## References +Geometry Playground was featured in the Mathematical Association of America's Loci +Heath, Daniel and Joshua Jacobs,“Geometry Playground”, Loci (September 2010), DOI: [10.4169/loci003567](http://dx.doi.org/10.4169/loci003567). + +## Credits The original Java version of Geometry Playground is written by [D. Heath](https://github.com/deejHeath) and [J. Jacobs](https://github.com/joshicola). +Language translations have been performed by many individuals including: +* Arabic: + * Feryal Alayont + * Rachid Benkahlti +* Chinese: + * Yachuan Yu + * Xioquian Zhang + * Qiang Zheng +* French: + * Guillaume Lajoie +* Hungarian: + * Laszlo Miklos Lovasz +* Italian: + * Jeffrey Weeks +* Japanese: + * Daniel J. Heath + * Yumiko Heath + * Hideto Tsutsui +* Korean: + * Hyun-Jong Song + * Matthew Kim +* Marathi: + * Ajit Datar +* Russian: + * Natalya Manko + * Daniil Perebeynos +* Spanish: + * Erlinda Cano + * Laura Matrajt + +
+
+
-Last updated 2021/03/28. +Last updated 2022/03/18.
diff --git a/ToDo.md b/ToDo.md new file mode 100644 index 0000000..3c09b3e --- /dev/null +++ b/ToDo.md @@ -0,0 +1,3 @@ +# Get things done + +Done! \ No newline at end of file diff --git a/source/GeoPlayground.java b/source/GeoPlayground.java index 15929fa..695b889 100755 --- a/source/GeoPlayground.java +++ b/source/GeoPlayground.java @@ -777,7 +777,7 @@ else if (n==9 || n==7 || n==5 || n==-5) // if type=CircIntCirc01, CircIntLine1, } } if (e.getSource()==aboutMI) { - BareBonesBrowserLaunch.openURL("https://students.washington.edu/josher/mediawiki/"); + BareBonesBrowserLaunch.openURL("https://github.com/joshicola/geometry_playground_java/wiki/Instructions"); } for (int i=0;i<7;i++) if (e.getSource()==digitMI[i]) { digitMI[digits-1].setText(""); diff --git a/source/Messages.properties b/source/Messages.properties index bf39531..ecb5f67 100644 --- a/source/Messages.properties +++ b/source/Messages.properties @@ -1,5 +1,5 @@ //Translators: More complete explanations of what the following lines of text are associated with, -// please look at http://students.washington.edu/josher/mediawiki/index.php?title=Instructions. +// please look at https://github.com/joshicola/geometry_playground_java/wiki/Instructions#languages. // // Only the text on the right needs to be translated. diff --git a/source/Messages_hu.properties b/source/Messages_hu.properties index 8995067..d3f6942 100644 --- a/source/Messages_hu.properties +++ b/source/Messages_hu.properties @@ -1,5 +1,5 @@ //Translators: More complete explanations of what the following lines of text are associated with, -// please look at http://students.washington.edu/josher/mediawiki/index.php?title=Instructions. +// please look at https://github.com/joshicola/geometry_playground_java/wiki/Instructions#languages. // // Only the text on the right needs to be translated. diff --git a/source/Messages_it.properties b/source/Messages_it.properties index 627e54b..955a870 100644 --- a/source/Messages_it.properties +++ b/source/Messages_it.properties @@ -1,5 +1,5 @@ //Translators: More complete explanations of what the following lines of text are associated with, -// please look at http://students.washington.edu/josher/mediawiki/index.php?title=Instructions. +// please look at https://github.com/joshicola/geometry_playground_java/wiki/Instructions#languages. // // Only the text on the right needs to be translated. diff --git a/source/Playground.txt b/source/Playground.txt index 55e97d5..b76051e 100644 --- a/source/Playground.txt +++ b/source/Playground.txt @@ -1,5 +1,5 @@ //Translators: More complete explanations of what the following lines of text are associated with, -// please look at http://students.washington.edu/josher/mediawiki/index.php?title=Instructions. +// please look at https://github.com/joshicola/geometry_playground_java/wiki/Instructions#languages. // // Only the text on the right needs to be translated.