Merge pull request #67 from nafundi/feature/no-geo-hints

We should not add default hints into forms
XLSForm · May 23, 2016 · 2c7421a · 2c7421a
2 parents e33e260 + 0ea97dc
commit 2c7421a
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 15 deletions.
diff --git a/pyxform/question_type_dictionary.py b/pyxform/question_type_dictionary.py
@@ -381,26 +381,23 @@ def generate_new_dict():
             },
             "bind": {
                 "type": "geopoint"
-            },
-            "hint": "GPS coordinates can only be collected when outside."
+            }
         },
         "geoshape": {
             "control": {
                 "tag": "input"
             },
             "bind": {
                 "type": "geoshape"
-            },
-            "hint": "GPS coordinates can only be collected when outside."
+            }
         },
         "geotrace": {
             "control": {
                 "tag": "input"
             },
             "bind": {
                 "type": "geotrace"
-            },
-            "hint": "GPS coordinates can only be collected when outside."
+            }
         },
         "select multiple from": {
             "control": {
@@ -542,8 +539,7 @@ def generate_new_dict():
             },
             "bind": {
                 "type": "geopoint"
-            },
-            "hint": "GPS coordinates can only be collected when outside."
+            }
         },
         "q date": {
             "control": {

diff --git a/pyxform/tests/example_xls/spec_test_expected_output.xml b/pyxform/tests/example_xls/spec_test_expected_output.xml
@@ -850,7 +850,6 @@
       </input>
       <input ref="/xlsform_spec_test/everything/geopoint_test">
         <label ref="jr:itext('/xlsform_spec_test/everything/geopoint_test:label')"/>
-        <hint>GPS coordinates can only be collected when outside.</hint>
       </input>
       <input ref="/xlsform_spec_test/everything/barcode_test">
         <label ref="jr:itext('/xlsform_spec_test/everything/barcode_test:label')"/>

diff --git a/pyxform/tests/test_expected_output/attribute_columns_test.xml b/pyxform/tests/test_expected_output/attribute_columns_test.xml
@@ -904,7 +904,6 @@
       </input>
       <input bodyAttribute="test" bodyAttribute2="test" ref="/attribute_columns_test/everything/geopoint_test">
         <label ref="jr:itext('/attribute_columns_test/everything/geopoint_test:label')"/>
-        <hint>GPS coordinates can only be collected when outside.</hint>
       </input>
       <input bodyAttribute="test" bodyAttribute2="test" ref="/attribute_columns_test/everything/barcode_test">
         <label ref="jr:itext('/attribute_columns_test/everything/barcode_test:label')"/>

diff --git a/pyxform/tests/test_expected_output/flat_xlsform_test.xml b/pyxform/tests/test_expected_output/flat_xlsform_test.xml
@@ -876,7 +876,6 @@
       </input>
       <input ref="/flat_xlsform_test/geopoint_test">
         <label ref="jr:itext('/flat_xlsform_test/geopoint_test:label')"/>
-        <hint>GPS coordinates can only be collected when outside.</hint>
       </input>
       <input ref="/flat_xlsform_test/barcode_test">
         <label ref="jr:itext('/flat_xlsform_test/barcode_test:label')"/>

diff --git a/pyxform/tests/test_expected_output/xlsform_spec_test.xml b/pyxform/tests/test_expected_output/xlsform_spec_test.xml
@@ -903,7 +903,6 @@
       </input>
       <input ref="/xlsform_spec_test/everything/geopoint_test">
         <label ref="jr:itext('/xlsform_spec_test/everything/geopoint_test:label')"/>
-        <hint>GPS coordinates can only be collected when outside.</hint>
       </input>
       <input ref="/xlsform_spec_test/everything/barcode_test">
         <label ref="jr:itext('/xlsform_spec_test/everything/barcode_test:label')"/>

diff --git a/pyxform/tests/test_output/attribute_columns_test.xml b/pyxform/tests/test_output/attribute_columns_test.xml
@@ -904,7 +904,6 @@
       </input>
       <input bodyAttribute="test" bodyAttribute2="test" ref="/attribute_columns_test/everything/geopoint_test">
         <label ref="jr:itext('/attribute_columns_test/everything/geopoint_test:label')"/>
-        <hint>GPS coordinates can only be collected when outside.</hint>
       </input>
       <input bodyAttribute="test" bodyAttribute2="test" ref="/attribute_columns_test/everything/barcode_test">
         <label ref="jr:itext('/attribute_columns_test/everything/barcode_test:label')"/>

diff --git a/pyxform/tests/test_output/flat_xlsform_test.xml b/pyxform/tests/test_output/flat_xlsform_test.xml
@@ -876,7 +876,6 @@
       </input>
       <input ref="/flat_xlsform_test/geopoint_test">
         <label ref="jr:itext('/flat_xlsform_test/geopoint_test:label')"/>
-        <hint>GPS coordinates can only be collected when outside.</hint>
       </input>
       <input ref="/flat_xlsform_test/barcode_test">
         <label ref="jr:itext('/flat_xlsform_test/barcode_test:label')"/>

diff --git a/pyxform/tests/test_output/xlsform_spec_test.xml b/pyxform/tests/test_output/xlsform_spec_test.xml
@@ -903,7 +903,6 @@
       </input>
       <input ref="/xlsform_spec_test/everything/geopoint_test">
         <label ref="jr:itext('/xlsform_spec_test/everything/geopoint_test:label')"/>
-        <hint>GPS coordinates can only be collected when outside.</hint>
       </input>
       <input ref="/xlsform_spec_test/everything/barcode_test">
         <label ref="jr:itext('/xlsform_spec_test/everything/barcode_test:label')"/>