Latest internationalisation (#71)

jarvisteach · Jan 7, 2017 · 209564b · 209564b
1 parent 55c8600
commit 209564b
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 13 deletions.
diff --git a/appJar/examples/internationalisation/ENGLISH.ini b/appJar/examples/internationalisation/ENGLISH.ini
@@ -15,17 +15,20 @@ b1: button 1
 b2: button 2
 b3: button 3
 
-[RADIOBUTTON]
-name-b1: fred
-name-b2: frog
-name-b3: free
-
 [MESSAGE]
 m1: lots of english writing
 
 [LINK]
 l1: this is a new link
 
+[RADIOBUTTON]
+name-b1: fred
+name-b2: frog
+name-b3: free
+
+[ENTRY]
+e1: entry stuff
+
 [SCALE]
 s1: scale text here....
 
@@ -35,9 +38,6 @@ t1: some text
 [METER]
 m1: meter stuff
 
-[ENTRY]
-e1: entry stuff
-
 [LISTBOX]
 fruits:
 
@@ -46,12 +46,25 @@ fruits:
     grapes
     people
 
+[OPTION]
+fruits:
+
+    bags
 
+    grapes
+    people
 
 
-# unsupported widgets
 [SPIN]
-[OPTION]
+fruits:
+
+    bags
+
+    grapes
+    people
+
+
+# unsupported widgets
 [PROPERTIES]
 
 [PIECHART]

diff --git a/appJar/examples/internationalisation/FRENCH.ini b/appJar/examples/internationalisation/FRENCH.ini
@@ -27,3 +27,12 @@ e1: le Entry
 fruits: fromage
     boison
     pain au chocolate
+
+[SPIN]
+fruits: fromage
+    boison
+    pain au chocolate
+
+[OPTION]
+fruits: fromage
+    boison
diff --git a/appJar/examples/internationalisation/testLangs.py b/appJar/examples/internationalisation/testLangs.py
@@ -17,6 +17,8 @@ def press(btn):
 app.addMessage("m1", "Default message text")
 
 app.addListBox("fruits", ["apples", "oranges", "tomatoes"])
+app.addOptionBox("fruits", ["apples", "oranges", "tomatoes"])
+app.addSpinBox("fruits", ["apples", "oranges", "tomatoes"])
 
 app.addCheckBox("b1")
 app.addCheckBox("b2")

diff --git a/docs/mkdocs/docs/pythonInternationalisation.md b/docs/mkdocs/docs/pythonInternationalisation.md
@@ -70,10 +70,21 @@ Note, changing the text of a widget through `setXXX()` method's will work, but w
 * `[SCALE]`, `[TEXTAREA]`, `[METER]`  
     These widgets have no text to change.  
 
-* The following are currently not supported:  
-    `[LISTBOX]`, `[SPIN]`, `[OPTION]`, `[PROPERTIES]`  
-    `[POPUP]`, `[PIECHART]`, `[TREE]`, `[GRID]`  
+* `[LISTBOX]`, `[SPIN]`, `[OPTION]`  
+    Each value should be on a new line  
+    Doesn't work for SpinBoxes, when generated from a range.  
+```
+[LISTBOX]
+fruits:
+    apples
+    pears
+    grapes
+    bananas
+```
+
+* The following are currently in development:  
     `[LABELFRAME]`, `[TABBEDFRAME]`, `[PAGEDWINDOW]`, `[TOGGLEFRAME]`  
+    `[PROPERTIES]`, `[POPUP]`, `[PIECHART]`, `[TREE]`, `[GRID]`  
     `[MENUBAR]`, `[STATUSBAR]`, `[TOOLBAR]`, `[TOOLTIP]`, `[TITLE]`  
     `[SOUND]` & `[IMAGE]`