better error messages with no location results

Author: samuelcolvin

src/components/contractors/Contractors.js

@@ -124,6 +124,24 @@ class Contractors extends Component {
       this.state.contractor_response.location.pretty
     )
 
+    let error_message = null
+    if (this.state.contractor_response && this.state.contractor_response.count === 0) {
+      const location_error = (
+        this.state.contractor_response &&
+        this.state.contractor_response.location &&
+        this.state.contractor_response.location.error
+      )
+      // location error can be 'rate_limited' pr 'no_results'
+      if (location_error === 'rate_limited') {
+        error_message = this.props.root.get_text('no_tutors_found_rate_limited')
+      } else if (location_error === 'no_results') {
+        error_message = this.props.root.get_text('no_tutors_found_no_loc', {location: this.state.location_str})
+      } else if (location_pretty) {
+        error_message = this.props.root.get_text('no_tutors_found_loc', {location: location_pretty})
+      } else {
+        error_message = this.props.root.get_text('no_tutors_found')
+      }
+    }
     let description = ''
     if (con_count) {
       const description_prefix = []
@@ -164,11 +182,9 @@ class Contractors extends Component {
         <DisplayComponent
           contractors={this.state.contractor_response ? this.state.contractor_response.results : []}
           root={this.props.root}/>
-        <If v={this.state.contractor_response && this.state.contractor_response.count === 0}>
+        <If v={error_message}>
           <div className="tcs-no-contractors">
-            {this.props.root.get_text(
-              this.state.location_str === null ? 'no_tutors_found' : 'no_tutors_found_loc', {location_pretty}
-            )}
+            {error_message}
           </div>
         </If>
 

src/index.js

@@ -42,8 +42,10 @@ const STRINGS = {
   review_hours: '({hours} hours)',
   previous: 'Previous',
   next: 'Next',
-  no_tutors_found: 'No more tutors found',
-  no_tutors_found_loc: 'No more tutors found near "{location_pretty}"',
+  no_tutors_found: 'No tutors found.',
+  no_tutors_found_loc: 'No more tutors found near "{location}".',
+  no_tutors_found_no_loc: 'No more tutors, unable to locate "{location}".',
+  no_tutors_found_rate_limited: 'Too many location lookups, no results.',
   distance_away: '{distance}km away',
 }
 

src/tests/utils.js

@@ -118,14 +118,16 @@ export const STRINGS = {
   grecaptcha_missing: 'This captcha is required',
   required: ' (Required)',
   subject_filter_placeholder: 'Select a subject...',
-  subject_filter_summary_single: '{subject}: showing 1 result',
-  subject_filter_summary_plural: '{subject}: showing {count} results',
+  filter_summary_single: '{prefix}: showing 1 result',
+  filter_summary_plural: '{prefix}: showing {count} results',
   location_input_placeholder: 'Enter your address or zip/postal code...',
   view_profile: 'View Profile',
   review_hours: '({hours} hours)',
   previous: 'Previous',
   next: 'Next',
-  no_tutors_found: 'No more tutors found',
-  no_tutors_found_loc: 'No more tutors found near this location',
+  no_tutors_found: 'No tutors found.',
+  no_tutors_found_loc: 'No more tutors found near "{location}".',
+  no_tutors_found_no_loc: 'No more tutors, unable to locate "{location}".',
+  no_tutors_found_rate_limited: 'Too many location lookups, no results.',
   distance_away: '{distance}km away',
 }