Merge branch 'develop'

Esri · Apr 26, 2013 · 419c767 · 419c767
2 parents a60533e + a9c84dc
commit 419c767
Show file tree

Hide file tree

Showing 54 changed files with 1,462 additions and 578 deletions.
diff --git a/README.md b/README.md
@@ -18,18 +18,22 @@ This is the source code for the ArcGIS Viewer for Flex (a.k.a Flex Viewer). Lear
 
 ## Instructions (Getting Started)
 
-See http://links.esri.com/flexviewer-gettingstarted-developers for more details.
-
-1. In Adobe Flash Builder 4.6, go to "File" -> "Import Flash Builder project..."
-2. Keeping "File" option selected, click "Browse..." button.
-3. Select flexviewer-3.1-src.zip downloaded in step 1, e.g. "C:\Documents and Settings\jack\My Documents\flexviewer-3.1-src.zip".
-4. "Extract new project to:" textbox will be automatically set to location where the project source will reside, e.g. "C:\Documents and Settings\jack\Adobe Flash Builder 4.6\FlexViewer.
-5. Click "Finish" button. Project will be created and displayed in the Package Explorer window of Adobe Flash Builder, e.g. in this case FlexViewer.
-6. If prompted to upgrade the project (because it was created with a previous version of Flash Builder), click "OK"
-7. If prompted to choose Flex SDK version, select "Flex 4.6.0" or higher
-8. If needed, download API Library from http://links.esri.com/flex-api/latest-download.
-9. Go to "Project" -> "Properties" -> "Flex Build Path".
-10. Click "Add SWC" and navigate to the agslib-3.[*]-[YYYY-MM-DD].swc file.
+There are three different ways of getting the source code from the GitHub web site: clone, [fork] (https://help.github.com/articles/fork-a-repo) and download zip.  See http://links.esri.com/flexviewer-gettingstarted-developers for more details.
+
+Once you have the source code on your own machine, you need to import it into Adobe Flash Builder.
+
+1. In Adobe Flash Builder 4.6 or 4.7, go to "File" -> "Import Flash Builder project...", then depending on whether you have a zip file or not, follow step 2 or 3.
+2. If you downloaded the zip file:
+  1. Keep "File" option selected, click "Browse..." button. Select the downloaded flexviewer-3.[*]-src.zip file, for example "C:\Documents and Settings\jack\My Documents\flexviewer-3.[*]-src.zip".
+  2. "Extract new project to:" textbox will be automatically set to location where the project source will reside, e.g. "C:\Documents and Settings\jack\Adobe Flash Builder 4.7\FlexViewer.
+3. If you cloned and/or forked the repo:
+  1. Select "Project folder", click "Browse..." button and navigate to your local repo, for example C:\Users\jack\Documents\GitHub\arcgis-viewer-flex.
+4. Click "Finish" button. Project will be created and displayed in the Package Explorer window of Adobe Flash Builder, e.g. in this case FlexViewer.
+5. If prompted to upgrade the project (because it was created with a previous version of Flash Builder), click "OK"
+6. If prompted to choose Flex SDK version, select "Flex 4.6.0" or higher.
+7. Download API Library from http://links.esri.com/flex-api/latest-download. Unzip it.
+8. Go to "Project" -> "Properties" -> "Flex Build Path".
+9. Click "Add SWC" and navigate to the agslib-3.[*]-[YYYY-MM-DD].swc API library file.
 
 Optionally:
 

diff --git a/build.properties b/build.properties
@@ -10,3 +10,6 @@ fb.debug.dir=bin-debug
 
 # The name of the Flex Viewer project in the workspace set in local.properties
 fb.workspace.project.name=FlexViewer
+
+# Locales to create resource modules for
+locale.modules=ar,da_DK,de_DE,en_US,es_ES,et_EE,fr_FR,he_IL,it_IT,ja_JP,ko_KR,lt_LT,lv_LV,nb_NO,nl_NL,pl_PL,pt_BR,pt_PT,ro_RO,ru_RU,sv_SE,zh_CN
diff --git a/build.xml b/build.xml
@@ -28,7 +28,7 @@
             description="Runs Flash Builder"/>
 
     <target name="full-build"
-            depends="clean,backup-actionScriptProperties,update-actionScriptProperties,run-flash-builder,restore-actionScriptProperties,check-fb-result,build-all-resoure-modules,update-index.html,copy-index.html,copy-version.xml"
+            depends="clean,backup-actionScriptProperties,update-actionScriptProperties,run-flash-builder,restore-actionScriptProperties,check-fb-result,build-all-resource-modules,update-index.html,copy-index.html,copy-version.xml"
             description="Runs a full build"/>
 
     <target name="clean" description="Deletes dist directory">
@@ -82,76 +82,26 @@
         </fail>
     </target>
 
-    <target name="build-all-resoure-modules" depends="get-bundles">
-        <antcall target="build-resoure-module">
-            <param name="LOCALE" value="ar"/>
-        </antcall>
-        <antcall target="build-resoure-module">
-            <param name="LOCALE" value="da_DK"/>
-        </antcall>
-        <antcall target="build-resoure-module">
-            <param name="LOCALE" value="de_DE"/>
-        </antcall>
-        <antcall target="build-resoure-module">
-            <param name="LOCALE" value="en_US"/>
-        </antcall>
-        <antcall target="build-resoure-module">
-            <param name="LOCALE" value="es_ES"/>
-        </antcall>
-        <antcall target="build-resoure-module">
-            <param name="LOCALE" value="et_EE"/>
-        </antcall>
-        <antcall target="build-resoure-module">
-            <param name="LOCALE" value="fr_FR"/>
-        </antcall>
-        <antcall target="build-resoure-module">
-            <param name="LOCALE" value="he_IL"/>
-        </antcall>
-        <antcall target="build-resoure-module">
-            <param name="LOCALE" value="it_IT"/>
-        </antcall>
-        <antcall target="build-resoure-module">
-            <param name="LOCALE" value="ja_JP"/>
-        </antcall>
-        <antcall target="build-resoure-module">
-            <param name="LOCALE" value="ko_KR"/>
-        </antcall>
-        <antcall target="build-resoure-module">
-            <param name="LOCALE" value="lt_LT"/>
-        </antcall>
-        <antcall target="build-resoure-module">
-            <param name="LOCALE" value="lv_LV"/>
-        </antcall>
-        <antcall target="build-resoure-module">
-            <param name="LOCALE" value="nb_NO"/>
-        </antcall>
-        <antcall target="build-resoure-module">
-            <param name="LOCALE" value="nl_NL"/>
-        </antcall>
-        <antcall target="build-resoure-module">
-            <param name="LOCALE" value="pl_PL"/>
-        </antcall>
-        <antcall target="build-resoure-module">
-            <param name="LOCALE" value="pt_BR"/>
-        </antcall>
-        <antcall target="build-resoure-module">
-            <param name="LOCALE" value="pt_PT"/>
-        </antcall>
-        <antcall target="build-resoure-module">
-            <param name="LOCALE" value="ro_RO"/>
-        </antcall>
-        <antcall target="build-resoure-module">
-            <param name="LOCALE" value="ru_RU"/>
-        </antcall>
-        <antcall target="build-resoure-module">
-            <param name="LOCALE" value="sv_SE"/>
-        </antcall>
-        <antcall target="build-resoure-module">
-            <param name="LOCALE" value="zh_CN"/>
-        </antcall>
+    <target name="build-all-resource-modules" depends="get-bundles">
+        <script language="javascript">
+            <![CDATA[
+                var locales = project.getProperty("locale.modules");
+                locales = locales.split(",");
+
+                for each (var locale in locales)
+                {
+                    var antCall = project.createTask("antcall");
+                    antCall.setTarget("build-resource-module");
+                    var param = antCall.createParam();
+                    param.setName("LOCALE");
+                    param.setValue(locale);
+                    antCall.perform();
+                }
+            ]]>
+        </script>
     </target>
 
-    <target name="build-resoure-module">
+    <target name="build-resource-module">
         <java jar="${env.FLEX_HOME}/lib/mxmlc.jar"
               failonerror="true"
               maxmemory="1024m"

diff --git a/locale/ar/ViewerStrings.properties b/locale/ar/ViewerStrings.properties
@@ -1,7 +1,7 @@
 
 
 contextMenuText=حول ArcGIS Viewer for Flex...
-aboutText=هذا التطبيق يستخدم الإصدار 3.2 من ArcGIS Viewer for Flex.
+aboutText=هذا التطبيق يستخدم ArcGIS Viewer 3.3 لـ Flex.
 aboutLearnMoreBtn=تعلم المزيد
 aboutCloseBtn=إغلاق
 
@@ -20,22 +20,25 @@ locateExampleValueX=31.1311
 locateExampleValueY=29.9761
 
 
+yesLabel=نعم
+noLabel=لا
 clearLabel=مسح
 deleteLabel=حذف
 loadingLabel=جاري التحميل...
 okLabel=موافق
+cancelLabel=إلغاء
 errorLabel=خطأ
 problemLabel=مشكلة
 noFeatures=لم يتم العثور على معالم.
 resultsLabel=النتائج
 saveLabel=حفظ
 
 
-unitsFeet=قدم
+unitsFeet=أقدام
 unitsFeetAbbr=ق
-unitsKilometers=كيلومتر
+unitsKilometers=كيلومترات
 unitsKilometersAbbr=كم
-unitsMeters=متر
+unitsMeters=أمتار
 unitsMetersAbbr=م
 unitsMiles=أميال
 unitsMilesAbbr=ميل
@@ -69,7 +72,7 @@ tocMapLayerDescriptionLabel=الوصف
 tocMapLayerDownloadLabel=تحميل
 
 
-incorrectLayerTypeText={0} ليس نوع طبقة معتمد. استخدم "arcims" أو "bing" أو "csv" أو "dynamic" أو "feature" أو "georss" أو "image" أو "kml" أو "osm" أو  "tiled" أو "wms" أو "wmts" بدلاً منه.
+incorrectLayerTypeText={0} ليس نوع طبقة معتمد. استخدم "arcims" أو "bing" أو "csv" أو "dynamic" أو "feature" أو "georss" أو "image" أو "kml" أو "osm" أو  "tiled" أو "webtiled" أو "wms" أو "wmts" بدلاً منه.
 
 
 missingConfigFileText=تعذر العثور على {0}
@@ -107,7 +110,7 @@ cannotRunTaskExecutionTypeUnknownError=يتعذر تشغيل المهمة: نو
 layerDataRetrievalError=تعذر إرجاع بيانات الطبقة.
 couldNotDeleteFeature=تعذر حذف المعلم
 couldNotUpdateFeatureError=تعذر تحديث المعلم، استعادة القيمة القديمة
-cannotDisplayResult=لا يمكن عرض النتيجة على الخريطة.
+cannotDisplayResult=يتعذر عرض النتيجة على الخريطة.
 uploadSecurityError=تمت مواجهة خطأ أمان أثناء تحميل الملف: {0}
 uploadIOError=تمت مواجهة خطأ IO أثناء تحميل الملف: {0}
 uploadUnknownError=حدث خطأ غير معروف أثناء تحميل الملف.
@@ -345,6 +348,7 @@ byURL=تبعًا لعنوان URL
 fileURL=عنوان URL للملف
 uploadFile=تحميل الملف
 or=أو
+format=تنسيق
 
 
 zoomLabel=تقريب إلى

diff --git a/locale/da_DK/ViewerStrings.properties b/locale/da_DK/ViewerStrings.properties
@@ -1,7 +1,7 @@
 
 
 contextMenuText=Om ArcGIS Viewer for Flex...
-aboutText=Denne applikation bruger ArcGIS Viewer for Flex version 3.2.
+aboutText=Denne applikation bruger ArcGIS Viewer 3.3 for Flex.
 aboutLearnMoreBtn=Lær mere
 aboutCloseBtn=Luk
 
@@ -20,10 +20,13 @@ locateExampleValueX=12.5683
 locateExampleValueY=55.6761
 
 
+yesLabel=Ja
+noLabel=Nej
 clearLabel=Ryd
 deleteLabel=Slet
 loadingLabel=Indlæser...
 okLabel=OK
+cancelLabel=Annullér
 errorLabel=Fejl
 problemLabel=Problem
 noFeatures=Ingen objekte fundet.
@@ -69,7 +72,7 @@ tocMapLayerDescriptionLabel=Beskrivelse
 tocMapLayerDownloadLabel=Download
 
 
-incorrectLayerTypeText={0} er ikke en understøttet lagtype.  Brug "arcims", "bing", "csv", "dynamic", "feature", "georss", "image", "kml", "osm", "tiled", "wms" eller "wmts" i stedet for.
+incorrectLayerTypeText={0} er ikke en understøttet lagtype.  Brug "arcims", "bing", "csv", "dynamic", "feature", "georss", "image", "kml", "osm", "tiled", "webtiled", "wms" eller "wmts" i stedet for.
 
 
 missingConfigFileText=Kunne ikke finde {0}
@@ -345,6 +348,7 @@ byURL=Vha. URL
 fileURL=Fil-URL
 uploadFile=Overfør fil
 or=eller
+format=Formatér
 
 
 zoomLabel=Zoom til

diff --git a/locale/de_DE/ViewerStrings.properties b/locale/de_DE/ViewerStrings.properties
@@ -1,7 +1,7 @@
 
 
 contextMenuText=Info zu ArcGIS Viewer for Flex...
-aboutText=Diese Anwendung verwendet die Version 3.2 von ArcGIS Viewer for Flex.
+aboutText=Diese Anwendung verwendet ArcGIS Viewer 3.3 for Flex.
 aboutLearnMoreBtn=Weitere Informationen
 aboutCloseBtn=Schließen
 
@@ -20,10 +20,13 @@ locateExampleValueX=13.376
 locateExampleValueY=52.519
 
 
+yesLabel=Ja
+noLabel=Nein
 clearLabel=Inhalt löschen
 deleteLabel=Löschen
 loadingLabel=Wird geladen…
 okLabel=OK
+cancelLabel=Abbrechen
 errorLabel=Fehler
 problemLabel=Problem
 noFeatures=Keine Features gefunden.
@@ -69,7 +72,7 @@ tocMapLayerDescriptionLabel=Beschreibung
 tocMapLayerDownloadLabel=Herunterladen
 
 
-incorrectLayerTypeText={0} ist kein unterstützter Layer-Typ. Verwenden Sie stattdessen "arcims", "bing", "csv", "dynamic", "feature", "georss", "image", "kml", "osm", "tiled", "wms" oder "wmts".
+incorrectLayerTypeText={0} ist kein unterstützter Layer-Typ. Verwenden Sie stattdessen "arcims", "bing", "csv", "dynamic", "feature", "georss", "image", "kml", "osm", "tiled", "webtiled", "wms" oder "wmts".
 
 
 missingConfigFileText={0} konnte nicht gefunden werden
@@ -345,6 +348,7 @@ byURL=Über die URL
 fileURL=Datei-URL
 uploadFile=Datei hochladen
 or=oder
+format=Format
 
 
 zoomLabel=Zoomen auf

diff --git a/locale/en_US/ViewerStrings.properties b/locale/en_US/ViewerStrings.properties
@@ -1,7 +1,7 @@
 # -- UI related messages for the context menu on the map, in addition to messages from the api --
 #
 contextMenuText=About ArcGIS Viewer for Flex...
-aboutText=This application is using ArcGIS Viewer for Flex version 3.2.
+aboutText=This application is using ArcGIS Viewer for Flex version 3.3.
 aboutLearnMoreBtn=Learn more
 aboutCloseBtn=Close
 
@@ -20,10 +20,13 @@ locateExampleValueX=-77.03655
 locateExampleValueY=38.89767
 
 # -- Generic strings --
+yesLabel=Yes
+noLabel=No
 clearLabel=Clear
 deleteLabel=Delete
 loadingLabel=Loading...
 okLabel=OK
+cancelLabel=Cancel
 errorLabel=Error
 problemLabel=Problem
 noFeatures=No features found.
@@ -345,6 +348,7 @@ byURL=By URL
 fileURL=File URL
 uploadFile=Upload file
 or=or
+format=Format
 
 ########## Popups
 zoomLabel=Zoom to

diff --git a/locale/es_ES/ViewerStrings.properties b/locale/es_ES/ViewerStrings.properties
@@ -1,7 +1,7 @@
 
 
 contextMenuText=Acerca de ArcGIS Viewer for Flex...
-aboutText=Esta aplicación utiliza ArcGIS Viewer for Flex versión 3.2.
+aboutText=Esta aplicación utiliza ArcGIS Viewer 3.3 for Flex.
 aboutLearnMoreBtn=Más información
 aboutCloseBtn=Cerrar
 
@@ -20,10 +20,13 @@ locateExampleValueX=-3.7139
 locateExampleValueY=40.4181
 
 
+yesLabel=Sí
+noLabel=No
 clearLabel=Borrar
 deleteLabel=Eliminar
 loadingLabel=Cargando...
 okLabel=Aceptar
+cancelLabel=Cancelar
 errorLabel=Error
 problemLabel=Problema
 noFeatures=No se encontraron entidades.
@@ -69,7 +72,7 @@ tocMapLayerDescriptionLabel=Descripción
 tocMapLayerDownloadLabel=Descargar
 
 
-incorrectLayerTypeText={0} no es un tipo de capa admitido. Utilice "arcims", "bing", "csv", "dynamic", "feature", "georss", "image", "kml", "osm", "tiled", "wms" o "wmts" en su lugar.
+incorrectLayerTypeText={0} no es un tipo de capa admitido. Utilice "arcims", "bing", "csv", "dynamic", "feature", "georss", "image", "kml", "osm", "tiled", "webtiled", "wms" o "wmts" en su lugar.
 
 
 missingConfigFileText=No se pudo encontrar {0}
@@ -345,6 +348,7 @@ byURL=Por dirección URL
 fileURL=Dirección URL de archivo
 uploadFile=Cargar archivo
 or=o
+format=Formato
 
 
 zoomLabel=Acercar a