From d5e76f437b224f6b9563da22eff665751882f0a8 Mon Sep 17 00:00:00 2001
From: klmp200 <klmp200@klmp200.net>
Date: Tue, 13 Jun 2017 10:22:42 +0200
Subject: [PATCH] Internationalisation

---
 README.md                                     |  2 ++
 .../sierpinski/FractalesFXApplication.fxml    |  7 +++----
 .../sierpinski/FractalesFXApplication.sarl    | 19 ++++++++++++-------
 .../FractalesFXApplications.properties        |  2 ++
 .../FractalesFXApplications_fr.properties     |  2 ++
 .../sierpinski/gui/FXMLViewerController.sarl  |  7 +------
 6 files changed, 22 insertions(+), 17 deletions(-)
 create mode 100644 README.md
 create mode 100644 src/main/sarl/io/sarl/demos/sierpinski/FractalesFXApplications.properties
 create mode 100644 src/main/sarl/io/sarl/demos/sierpinski/FractalesFXApplications_fr.properties

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..83209e4
--- /dev/null
+++ b/README.md
@@ -0,0 +1,2 @@
+# Explanation of demo + structure
+file -> packages
\ No newline at end of file
diff --git a/src/main/sarl/io/sarl/demos/sierpinski/FractalesFXApplication.fxml b/src/main/sarl/io/sarl/demos/sierpinski/FractalesFXApplication.fxml
index 360dc7c..6cb4922 100644
--- a/src/main/sarl/io/sarl/demos/sierpinski/FractalesFXApplication.fxml
+++ b/src/main/sarl/io/sarl/demos/sierpinski/FractalesFXApplication.fxml
@@ -4,10 +4,9 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.layout.Pane?>
 
-<Pane fx:id="mainPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="608.0" prefWidth="813.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="io.sarl.demos.sierpinski.gui.FXMLViewerController">
+<Pane fx:id="mainPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="653.0" prefWidth="615.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="io.sarl.demos.sierpinski.gui.FXMLViewerController">
    <children>
-      <Canvas fx:id="drawZone" height="600.0" layoutX="199.0" layoutY="4.0" rotate="180.0" scaleX="-1.0" width="600.0" />
-      <Button layoutX="26.0" layoutY="45.0" mnemonicParsing="false" onAction="#actionSetup" text="Setup" />
-      <Button fx:id="multiplyButton" disable="true" layoutX="26.0" layoutY="89.0" mnemonicParsing="false" onAction="#actionMultiply" text="Multiply" />
+      <Canvas fx:id="drawZone" height="600.0" layoutX="8.0" layoutY="3.0" rotate="180.0" scaleX="-1.0" width="600.0" />
+      <Button fx:id="multiplyButton" layoutX="14.0" layoutY="612.0" mnemonicParsing="false" onAction="#actionMultiply" text="%DivideButtonText" />
    </children>
 </Pane>
diff --git a/src/main/sarl/io/sarl/demos/sierpinski/FractalesFXApplication.sarl b/src/main/sarl/io/sarl/demos/sierpinski/FractalesFXApplication.sarl
index e5ad2fd..1562b90 100644
--- a/src/main/sarl/io/sarl/demos/sierpinski/FractalesFXApplication.sarl
+++ b/src/main/sarl/io/sarl/demos/sierpinski/FractalesFXApplication.sarl
@@ -1,27 +1,32 @@
 package io.sarl.demos.sierpinski
 
-import javafx.application.Application
-import javafx.stage.Stage
-import javafx.fxml.FXMLLoader
+import io.sarl.demos.sierpinski.gui.FXMLViewerController
 import java.net.URL
+import java.util.ResourceBundle
+import javafx.application.Application
+import javafx.fxml.FXMLLoader
 import javafx.fxml.JavaFXBuilderFactory
 import javafx.scene.Parent
 import javafx.scene.Scene
-import io.sarl.demos.sierpinski.gui.FXMLViewerController
+import javafx.stage.Stage
 
 class FractalesFXApplications extends Application {
-	private var loader: FXMLLoader
-	
+	private var loader : FXMLLoader
+
+	private val bundle : ResourceBundle = ResourceBundle.getBundle(
+	FractalesFXApplications.getPackage.name.replaceAll("\\.", "/") + "/" + FractalesFXApplications.simpleName);
+
 	@Override
 	public def start(stage: Stage) throws Exception {
 		var location: URL = getClass().getResource("FractalesFXApplication.fxml")
 		loader = new FXMLLoader()
 		loader.setLocation(location)
 		loader.setBuilderFactory(new JavaFXBuilderFactory)
+		loader.resources = bundle
 		var root: Parent = loader.load(location.openStream) as Parent
 		var scene: Scene = new Scene(root)
 		scene.stylesheets.add(class.getResource("ViewerController.css").toExternalForm)
-		stage.setTitle("SARL Demo: Sierpinski Fractal Animation")
+		stage.setTitle(bundle.getString("TITLE"))
 		stage.setScene(scene)
 		stage.show
 	}
diff --git a/src/main/sarl/io/sarl/demos/sierpinski/FractalesFXApplications.properties b/src/main/sarl/io/sarl/demos/sierpinski/FractalesFXApplications.properties
new file mode 100644
index 0000000..994e6af
--- /dev/null
+++ b/src/main/sarl/io/sarl/demos/sierpinski/FractalesFXApplications.properties
@@ -0,0 +1,2 @@
+TITLE=SARL Demo: Sierpinski Fractals Animation
+DivideButtonText=Divide
\ No newline at end of file
diff --git a/src/main/sarl/io/sarl/demos/sierpinski/FractalesFXApplications_fr.properties b/src/main/sarl/io/sarl/demos/sierpinski/FractalesFXApplications_fr.properties
new file mode 100644
index 0000000..d5e49fc
--- /dev/null
+++ b/src/main/sarl/io/sarl/demos/sierpinski/FractalesFXApplications_fr.properties
@@ -0,0 +1,2 @@
+TITLE=SARL Démo: Animation des Fractales de Sierpinski
+DivideButtonText=Diviser
\ No newline at end of file
diff --git a/src/main/sarl/io/sarl/demos/sierpinski/gui/FXMLViewerController.sarl b/src/main/sarl/io/sarl/demos/sierpinski/gui/FXMLViewerController.sarl
index bbc2aff..bb8e97d 100644
--- a/src/main/sarl/io/sarl/demos/sierpinski/gui/FXMLViewerController.sarl
+++ b/src/main/sarl/io/sarl/demos/sierpinski/gui/FXMLViewerController.sarl
@@ -7,7 +7,6 @@ import javafx.fxml.FXML
 import javafx.scene.canvas.Canvas
 import javafx.scene.control.Button
 import io.sarl.lang.core.Event
-import javafx.^event.ActionEvent
 import io.sarl.demos.sierpinski.agents.Fractal
 import io.janusproject.Boot
 import io.sarl.demos.sierpinski.objects.Square
@@ -50,18 +49,14 @@ class FXMLViewerController implements EventListener {
 		}
 	}
 	
-	@FXML protected def actionSetup() {
+	@FXML protected def actionMultiply() {
 		if (!setuped){
-			multiplyButton.setDisable(false)
 			Launcher.main(
 				new Square(new Vector2D(0.0, 0.0),
 					600.0
 				), this )
 			setuped = true
 		}
-	}
-	
-	@FXML protected def actionMultiply() {
 		var m = new Multiply
 		m.source = new Address(ispace.spaceID, id)
 		this.ispace.emit(m)