i18n the main buttons, albeit the gps dropdown doesn't work. Add i18n todos
authorAndy Allan <gravitystorm@gmail.com>
Mon, 21 Feb 2011 18:11:57 +0000 (18:11 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 9 Mar 2011 11:01:08 +0000 (11:01 +0000)
TODO.txt
l10n/locale/en_GB/p2_main.properties
l10n/locale/fr_FR/p2_main.properties
l10n/map/LocalizationMap.mxml
potlatch2.mxml

index f83d732..62a67dc 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -69,6 +69,11 @@ Potlatch 2: main outstanding issues
 == Reverse Button ==
 * Doesn't look like a button
 
+== l10n ==
+* Fix the en_US / default locale problem
+* Fix the gps_data / my_tracks issue
+* Choose locale via loaderInfo
+
 Requested enhancements
 ----------------------
 
index 3ab3593..5c086f2 100644 (file)
@@ -2,3 +2,10 @@
 
 main.undo = Undo
 main.redo = Redo
+main.background = Background
+main.map_style = Map Style
+main.gps_data = GPS Data
+main.my_tracks = My Tracks
+main.help = Help
+main.options = Options
+main.save = Save
index 9c49558..cb419df 100644 (file)
@@ -2,3 +2,10 @@
 
 main.undo = Défaire
 main.redo = Refaire
+main.background = Arrière-plan
+main.map_style = Style de Carte
+main.gps_data = GPS Informations
+main.my_tracks = Mes Pistes
+main.help = Assistance
+main.options = Options
+main.save = Enregistrer
\ No newline at end of file
index b9a3d75..eac1654 100644 (file)
   </SmartResourceInjector>
 
   <SmartResourceInjector bundleName="p2_main" target="{potlatch2}">
+    <ResourceProxy property="bgButton.label" key="main.background" />
+    <ResourceProxy property="styleButton.label" key="main.map_style" />
+    <ResourceProxy property="gpsData.label" key="main.gps_data" />
+    <ResourceProxy property="myTracks.label" key="main.my_tracks" />
     <ResourceProxy property="undo.label" key="main.undo" />
     <ResourceProxy property="redo.label" key="main.redo" />
+    <ResourceProxy property="helpButton.label" key="main.help" />
+    <ResourceProxy property="optionsButton.label" key="main.options" />
+    <ResourceProxy property="saveButton.label" key="main.save" />
   </SmartResourceInjector>
 
 </LocaleMap>
\ No newline at end of file
index 200408a..e30be2b 100644 (file)
@@ -34,8 +34,8 @@
                    itemClick="if (event.index==0) { trackLoader.load(); } else { new MyGpxDialog().init(); }">
                        <mx:dataProvider>
                                <mx:Array>
-                                       <mx:Object label="GPS data" />
-                                       <mx:Object label="My tracks" />
+                                       <mx:Object label="GPS data" id="gpsData" />
+                                       <mx:Object label="My tracks" id="myTracks" />
                                </mx:Array>
                        </mx:dataProvider>
                </mx:PopUpMenuButton>
@@ -46,8 +46,8 @@
         <mx:Button id="redo" label="Redo" click="MainUndoStack.getGlobalStack().redo();" styleName="appBarButton"
             enabled="{MainUndoStack.getGlobalStack().canRedo()}"/>
         <mx:Spacer width="100%"/>
-        <mx:Button label="Help" click="new HelpDialog().init();" styleName="appBarButton" />
-        <mx:Button label="Options" click="new OptionsDialog().init();" styleName="appBarButton" /> 
+        <mx:Button id="helpButton" label="Help" click="new HelpDialog().init();" styleName="appBarButton" />
+        <mx:Button id="optionsButton" label="Options" click="new OptionsDialog().init();" styleName="appBarButton" />
         <mx:Button label="Save" icon="@Embed('embedded/upload.svg')" disabledIcon="@Embed('embedded/upload_disabled.svg')" styleName="appBarButton"
                        click="SaveManager.saveChanges();" id="saveButton" enabled="false"/>
     </mx:ApplicationControlBar>