Add lots of ids in order to permit translations.
authorAndy Allan <andy@gravitystorm.co.uk>
Sat, 26 Nov 2011 13:00:54 +0000 (13:00 +0000)
committerAndy Allan <andy@gravitystorm.co.uk>
Sat, 26 Nov 2011 13:00:54 +0000 (13:00 +0000)
net/systemeD/potlatch2/BackgroundSelector.mxml
net/systemeD/potlatch2/StyleSelector.mxml
net/systemeD/potlatch2/help/HelpDialog.mxml
net/systemeD/potlatch2/options/OptionsDialog.mxml
net/systemeD/potlatch2/save/OAuthPanel.mxml
net/systemeD/potlatch2/save/SaveDialog.mxml

index 78d4b91..4b339d0 100644 (file)
@@ -18,7 +18,7 @@
        </mx:HBox>
 
        <mx:HBox>
-       <mx:Button label="Edit..." click="FlexGlobals.topLevelApplication.bgButton.close(); new BackgroundDialog().init('Background imagery',background,Imagery.instance());" />
+       <mx:Button id="editLabel" label="Edit..." click="FlexGlobals.topLevelApplication.bgButton.close(); new BackgroundDialog().init('Background imagery',background,Imagery.instance());" />
        <mx:Button label="Vector file..." click="FlexGlobals.topLevelApplication.bgButton.close(); new VectorSourceDialog().init();" />
        </mx:HBox>
 
index 7ac5c6b..057e6f8 100644 (file)
@@ -11,7 +11,7 @@
                dataProvider="{Stylesheets.instance().getCollection()}"
                rowCount="{Stylesheets.instance().getCollection().length}" />
 
-       <mx:Button label="Edit..." click="FlexGlobals.topLevelApplication.styleButton.close(); new BackgroundDialog().init('Map style',mapStyle,Stylesheets.instance());" />
+       <mx:Button id="editButton" label="Edit..." click="FlexGlobals.topLevelApplication.styleButton.close(); new BackgroundDialog().init('Map style',mapStyle,Stylesheets.instance());" />
 
        <fx:Script><![CDATA[
                import net.systemeD.halcyon.*;
index 45f2972..24f4917 100644 (file)
         </mx:GridRow>
         <mx:GridRow width="100%">
           <mx:GridItem width="100%">
-            <mx:Text condenseWhite="true" width="100%">
+            <mx:Text id="whyOpenStreetMap" condenseWhite="true" width="100%">
               <mx:htmlText>
                 <![CDATA[
                   <p><b>Why OpenStreetMap?</b> OSM is a mapping service in which all data is constantly updated and edited by everyday people like you. The obvious benefit is that it's free to use, but it has also become a major player in crisis mapping (e.g. use of OSM data to coordinate earthquake relief efforts in Haiti). Accuracy of this data is critical, and we hope you are able to volunteer some of your time!</p>
         </mx:GridRow>
         <mx:GridRow width="100%">
           <mx:GridItem width="100%">
-            <mx:Text condenseWhite="true" width="100%">
+            <mx:Text condenseWhite="true" width="100%" id="activeMembers">
               <mx:htmlText>
                 <![CDATA[
                   <p><b>+ For active OpenStreetMap members</b>, please sign in to OSM before editing</b></p>
       </mx:Grid>
     </mx:VBox>
 
-    <mx:VBox label="Introduction" width="100%" height="100%" hide="introvideo.stopPlaying()" removedFromStage="introvideo.stopPlaying()">
+    <mx:VBox id="introduction" label="Introduction" width="100%" height="100%" hide="introvideo.stopPlaying()" removedFromStage="introvideo.stopPlaying()">
                <help:VideoPlayer width="640" height="369" id="introvideo"
                        file="help/introduction.mp4" 
                        previewImage="help/introduction.jpg" />
        </mx:VBox>
 
-    <mx:VBox label="Controls" width="100%" height="100%">
-      <mx:Label text="Interface Controls" textAlign="center" width="100%" styleName="helpPageHeader"/>
+    <mx:VBox id="Controls" label="Controls" width="100%" height="100%">
+      <mx:Label id="interfaceControls" text="Interface Controls" textAlign="center" width="100%" styleName="helpPageHeader"/>
       <mx:Grid width="100%">
         <mx:GridRow width="100%">
           <mx:GridItem>
-            <mx:Label width="100%" text="Background" styleName="helpHeaderText" />
+            <mx:Label id="background" width="100%" text="Background" styleName="helpHeaderText" />
           </mx:GridItem>
           <mx:GridItem width="100%">
-            <mx:Text condenseWhite="true" width="100%">
+            <mx:Text id="mapBackground" condenseWhite="true" width="100%">
               <mx:htmlText>
                 <![CDATA[
                   <p>Choose your map background from one of the items in the list or add your own vector file.</p>
         </mx:GridRow>
         <mx:GridRow width="100%">
           <mx:GridItem>
-            <mx:Label width="100%" text="Map Style" styleName="helpHeaderText" />
+            <mx:Label id="mapStyle" width="100%" text="Map Style" styleName="helpHeaderText" />
           </mx:GridItem>
           <mx:GridItem width="100%">
-            <mx:Text condenseWhite="true" width="100%">
+            <mx:Text id="colourStyle" condenseWhite="true" width="100%">
               <mx:htmlText>
                 <![CDATA[
                   <p>Choose the style in which you wish to view the map. Colours and overall style vary and also includes other options like wireframe.</p>
         </mx:GridRow>
         <mx:GridRow width="100%">
           <mx:GridItem>
-            <mx:Label width="100%" text="GPS" styleName="helpHeaderText" />
+            <mx:Label id="gps" width="100%" text="GPS" styleName="helpHeaderText" />
           </mx:GridItem>
           <mx:GridItem width="100%">
-            <mx:Text condenseWhite="true" width="100%">
+            <mx:Text id="createOsmMap" condenseWhite="true" width="100%">
               <mx:htmlText>
                 <![CDATA[
                   <p>Create OSM map data using other people's GPS tracks as a background</p>
         </mx:GridRow>
         <mx:GridRow width="100%">
           <mx:GridItem>
-            <mx:Label width="100%" text="MyGPX" styleName="helpHeaderText" />
+            <mx:Label id="myGpx" width="100%" text="MyGPX" styleName="helpHeaderText" />
           </mx:GridItem>
           <mx:GridItem width="100%">
-            <mx:Text condenseWhite="true" width="100%">
+            <mx:Text id="displayGps" condenseWhite="true" width="100%">
               <mx:htmlText>
                 <![CDATA[
                   <p>Display GPS traces that you've previously uploaded to OpenStreetMap.</p>
         </mx:GridRow>
         <mx:GridRow width="100%">
           <mx:GridItem>
-            <mx:Label width="100%" text="Undo / Redo" styleName="helpHeaderText" />
+            <mx:Label id="undoRedo" width="100%" text="Undo / Redo" styleName="helpHeaderText" />
           </mx:GridItem>
           <mx:GridItem width="100%">
-            <mx:Text condenseWhite="true" width="100%">
+            <mx:Text id="madeMistake" condenseWhite="true" width="100%">
               <mx:htmlText>
                 <![CDATA[
                   <p>Made a mistake? Just hit undo and/or redo to correct your edits.</p>
         </mx:GridRow>
         <mx:GridRow width="100%">
           <mx:GridItem>
-            <mx:Label width="100%" text="Help" styleName="helpHeaderText" />
+            <mx:Label id="help" width="100%" text="Help" styleName="helpHeaderText" />
           </mx:GridItem>
           <mx:GridItem width="100%">
-            <mx:Text condenseWhite="true" width="100%">
+            <mx:Text id="guideInfomation" condenseWhite="true" width="100%">
               <mx:htmlText>
                 <![CDATA[
                   <p>Brings up this guide in case you need any information as you begin editing.</p>
         </mx:GridRow>
         <mx:GridRow width="100%">
           <mx:GridItem>
-            <mx:Label width="100%" text="Save" styleName="helpHeaderText" />
+            <mx:Label id="save" width="100%" text="Save" styleName="helpHeaderText" />
           </mx:GridItem>
           <mx:GridItem width="100%">
             <mx:Text id="saveText" condenseWhite="true" width="100%" htmlText="{getSaveText()}" initialize="applyTextStyle(saveText)" />
       </mx:Grid>
     </mx:VBox>
     <mx:VBox label="Adding">
-      <mx:Label text="Adding Features" textAlign="center" width="100%" styleName="helpPageHeader" />
+      <mx:Label id="addingFeatures" text="Adding Features" textAlign="center" width="100%" styleName="helpPageHeader" />
       <mx:Text condenseWhite="true" width="100%" id="addingFeaturesText" initialize="applyTextStyle(addingFeaturesText)">
         <mx:htmlText>
           <![CDATA[
         </mx:htmlText>
       </mx:Text>
     </mx:VBox>
-    <mx:VBox label="Edit (Beg.)">
-      <mx:Label text="Editing Features (Beginner)" textAlign="center" width="100%" styleName="helpPageHeader" />
-      <mx:Text condenseWhite="true" width="100%" height="100%">
+    <mx:VBox id="editBeg" label="Edit (Beg.)">
+      <mx:Label id="editingFeatures" text="Editing Features (Beginner)" textAlign="center" width="100%" styleName="helpPageHeader" />
+      <mx:Text id="editingFeaturesText" condenseWhite="true" width="100%" height="100%">
         <mx:htmlText>
           <![CDATA[
             <p><b>To add a point to an existing way</b>, select the way and shift+click at the desired location.</p>
         </mx:htmlText>
       </mx:Text>
     </mx:VBox>
-    <mx:VBox label="Edit (Adv.)">
-      <mx:Label text="Editing Features (Advanced)" textAlign="center" width="100%" styleName="helpPageHeader" />
-      <mx:Text condenseWhite="true" width="100%" height="100%">
+    <mx:VBox id="editAdv" label="Edit (Adv.)">
+      <mx:Label id="editingFeaturesAdv" text="Editing Features (Advanced)" textAlign="center" width="100%" styleName="helpPageHeader" />
+      <mx:Text id="editingFeaturesAdvText" condenseWhite="true" width="100%" height="100%">
         <mx:htmlText>
           <![CDATA[
             <p><b>To split a way</b>, select the point at which you want to cut, and click the Scissor tool or press X on your keyboard. (Hint: Add a node first in order to cut between nodes.)</p>
         </mx:htmlText>
       </mx:Text>
     </mx:VBox>
-    <mx:VBox label="Tag">
-    <mx:Label text="Tagging Features" textAlign="center" width="100%" styleName="helpPageHeader" />
+    <mx:VBox id="tag" label="Tag">
+    <mx:Label id="taggingFeatures" text="Tagging Features" textAlign="center" width="100%" styleName="helpPageHeader" />
       <mx:Text condenseWhite="true" width="100%" height="100%" id="taggingFeaturesText" initialize="applyTextStyle(taggingFeaturesText)">
         <mx:htmlText>
           <![CDATA[
       </mx:Text>
     </mx:VBox>
     <mx:VBox label="Shortcuts" id="shortcuts">
-      <mx:Label text="Keyboard Shortcuts" textAlign="center" width="100%" styleName="helpPageHeader" />
+      <mx:Label text="Keyboard Shortcuts" textAlign="center" width="100%" styleName="helpPageHeader" id="keyboardShortcuts" />
       <mx:HBox id="shortcuts1" width="100%"/>
       <mx:HBox id="shortcuts2" width="100%">
         <mx:HBox id="shortcuts2a" width="100%" />
index 6e3fdb2..ab17648 100644 (file)
@@ -90,7 +90,7 @@
 
   <mx:ControlBar>
     <mx:Spacer width="100%"/>
-    <mx:Button label="Ok" click="PopUpManager.removePopUp(this);" styleName="titleWindowButton" />
+    <mx:Button id="ok" label="Ok" click="PopUpManager.removePopUp(this);" styleName="titleWindowButton" />
   </mx:ControlBar>
 
 </mx:TitleWindow>
index cf5f663..f345701 100644 (file)
@@ -21,7 +21,7 @@
            <mx:LinkButton id="link"
                label="http://oauth.dev.openstreetmap.org/oauth/authorize?somekey"
                click="openURL(authoriseURL); tryAccessButton.enabled=true;"/>
-           <mx:Text width="100%">
+           <mx:Text id="authorized" width="100%">
              <mx:text>Once you've authorised the access click the 'Try Access' button below</mx:text> <!-- ' -->
            </mx:Text>
            <mx:Text styleName="failText" visible="false" id="deniedLabel">
@@ -34,7 +34,7 @@
        </mx:VBox>
        
        <mx:VBox id="permFailPanel" width="100%" height="100%">
-         <mx:Text styleName="failText" width="100%" condenseWhite="true">
+         <mx:Text id="permFail" styleName="failText" width="100%" condenseWhite="true">
            <mx:htmlText><![CDATA[
              <p>The server refused this application's credentials -- an authorisation link
              could not be obtained.
@@ -47,7 +47,7 @@
        </mx:VBox>
        
        <mx:VBox id="tempFailPanel" width="100%" height="100%">
-         <mx:Text width="100%">
+         <mx:Text id="tempFail" width="100%">
            <mx:text>
              There was a problem contacting the server to get authorisation.
              This may be a temporary error, try again later.
@@ -63,7 +63,7 @@
                indeterminate="true"/>
         <mx:Spacer width="100%"/>
 
-           <mx:Button label="Cancel" click="PopUpManager.removePopUp(this);" styleName="titleWindowButton" />
+           <mx:Button id="cancelButton" label="Cancel" click="PopUpManager.removePopUp(this);" styleName="titleWindowButton" />
            <mx:Button id="tryAccessButton" label="Try Access" click="getAccessToken()" enabled="false" styleName="titleWindowButton" />
        </mx:ControlBar>
        
index d587f4b..0dda019 100644 (file)
     <mx:VBox width="100%" height="100%" verticalGap="0">
       <mx:ViewStack id="tagStack" width="100%" height="100%">
         <mx:VBox width="100%" height="100%" label="Simple">
-          <mx:Text width="100%">
+          <mx:Text id="editDescription" width="100%">
             <mx:text>
                Please enter a description of your edits. This will be used to give other
                mappers an idea of what changes you are making.
             </mx:text>
           </mx:Text>
-          <mx:Label text="Comment:"/>
+          <mx:Label id="commentLabel" text="Comment:"/>
           <mx:TextArea id="comment" maxChars="255" width="100%" height="100%" change="commentChanged(event);" textInput="monitorEnter(event);" />
         </mx:VBox>