From 929184f386b81f5829b8cedffd87fecc68fc35c3 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 28 Sep 2017 14:24:43 +0200
Subject: [PATCH] webhook: improve spelling and help text.

---
 rhodecode/integrations/types/webhook.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/rhodecode/integrations/types/webhook.py b/rhodecode/integrations/types/webhook.py
index 7d8b27b6..dbc7a9c7 100644
--- a/rhodecode/integrations/types/webhook.py
+++ b/rhodecode/integrations/types/webhook.py
@@ -165,7 +165,7 @@ class WebhookSettingsSchema(colander.Schema):
         colander.String(),
         title=_('Webhook URL'),
         description=
-            _('URL of the webhook to receive POST event. Following variables '
+            _('URL to which Webhook should submit data. Following variables '
               'are allowed to be used: {vars}. Some of the variables would '
               'trigger multiple calls, like ${{branch}} or ${{commit_id}}. '
               'Webhook will be called as many times as unique objects in '
@@ -180,8 +180,8 @@ class WebhookSettingsSchema(colander.Schema):
     secret_token = colander.SchemaNode(
         colander.String(),
         title=_('Secret Token'),
-        description=_('String used to validate received payloads. It will be '
-                      'sent together with event data in JSON'),
+        description=_('Optional string used to validate received payloads. '
+                      'It will be sent together with event data in JSON'),
         default='',
         missing='',
         widget=deform.widget.TextInputWidget(
@@ -211,7 +211,7 @@ class WebhookSettingsSchema(colander.Schema):
     method_type = colander.SchemaNode(
         colander.String(),
         title=_('Call Method'),
-        description=_('Select if the webhook call should be made '
+        description=_('Select if the Webhook call should be made '
                       'with POST or GET.'),
         default='post',
         missing='',
@@ -225,7 +225,7 @@ class WebhookSettingsSchema(colander.Schema):
 class WebhookIntegrationType(IntegrationTypeBase):
     key = 'webhook'
     display_name = _('Webhook')
-    description = _('Post json events to a webhook endpoint')
+    description = _('Post json events to a Webhook endpoint')
     icon = '''<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg viewBox="0 0 256 239" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid"><g><path d="M119.540432,100.502743 C108.930124,118.338815 98.7646301,135.611455 88.3876025,152.753617 C85.7226696,157.154315 84.4040417,160.738531 86.5332204,166.333309 C92.4107024,181.787152 84.1193605,196.825836 68.5350381,200.908244 C53.8383677,204.759349 39.5192953,195.099955 36.6032893,179.365384 C34.0194114,165.437749 44.8274148,151.78491 60.1824106,149.608284 C61.4694072,149.424428 62.7821041,149.402681 64.944891,149.240571 C72.469175,136.623655 80.1773157,123.700312 88.3025935,110.073173 C73.611854,95.4654658 64.8677898,78.3885437 66.803227,57.2292132 C68.1712787,42.2715849 74.0527146,29.3462646 84.8033863,18.7517722 C105.393354,-1.53572199 136.805164,-4.82141828 161.048542,10.7510424 C184.333097,25.7086706 194.996783,54.8450075 185.906752,79.7822957 C179.052655,77.9239597 172.151111,76.049808 164.563565,73.9917997 C167.418285,60.1274266 165.306899,47.6765751 155.95591,37.0109123 C149.777932,29.9690049 141.850349,26.2780332 132.835442,24.9178894 C114.764113,22.1877169 97.0209573,33.7983633 91.7563309,51.5355878 C85.7800012,71.6669027 94.8245623,88.1111998 119.540432,100.502743 L119.540432,100.502743 Z" fill="#C73A63"></path><path d="M149.841194,79.4106285 C157.316054,92.5969067 164.905578,105.982857 172.427885,119.246236 C210.44865,107.483365 239.114472,128.530009 249.398582,151.063322 C261.81978,178.282014 253.328765,210.520191 228.933162,227.312431 C203.893073,244.551464 172.226236,241.605803 150.040866,219.46195 C155.694953,214.729124 161.376716,209.974552 167.44794,204.895759 C189.360489,219.088306 208.525074,218.420096 222.753207,201.614016 C234.885769,187.277151 234.622834,165.900356 222.138374,151.863988 C207.730339,135.66681 188.431321,135.172572 165.103273,150.721309 C155.426087,133.553447 145.58086,116.521995 136.210101,99.2295848 C133.05093,93.4015266 129.561608,90.0209366 122.440622,88.7873178 C110.547271,86.7253555 102.868785,76.5124151 102.408155,65.0698097 C101.955433,53.7537294 108.621719,43.5249733 119.04224,39.5394355 C129.363912,35.5914599 141.476705,38.7783085 148.419765,47.554004 C154.093621,54.7244134 155.896602,62.7943365 152.911402,71.6372484 C152.081082,74.1025091 151.00562,76.4886916 149.841194,79.4106285 L149.841194,79.4106285 Z" fill="#4B4B4B"></path><path d="M167.706921,187.209935 L121.936499,187.209935 C117.54964,205.253587 108.074103,219.821756 91.7464461,229.085759 C79.0544063,236.285822 65.3738898,238.72736 50.8136292,236.376762 C24.0061432,232.053165 2.08568567,207.920497 0.156179306,180.745298 C-2.02835403,149.962159 19.1309765,122.599149 47.3341915,116.452801 C49.2814904,123.524363 51.2485589,130.663141 53.1958579,137.716911 C27.3195169,150.919004 18.3639187,167.553089 25.6054984,188.352614 C31.9811726,206.657224 50.0900643,216.690262 69.7528413,212.809503 C89.8327554,208.847688 99.9567329,192.160226 98.7211371,165.37844 C117.75722,165.37844 136.809118,165.180745 155.847178,165.475311 C163.280522,165.591951 169.019617,164.820939 174.620326,158.267339 C183.840836,147.48306 200.811003,148.455721 210.741239,158.640984 C220.88894,169.049642 220.402609,185.79839 209.663799,195.768166 C199.302587,205.38802 182.933414,204.874012 173.240413,194.508846 C171.247644,192.37176 169.677943,189.835329 167.706921,187.209935 L167.706921,187.209935 Z" fill="#4A4A4A"></path></g></svg>'''
 
     valid_events = [
@@ -254,7 +254,7 @@ class WebhookIntegrationType(IntegrationTypeBase):
         return schema
 
     def send_event(self, event):
-        log.debug('handling event %s with webhook integration %s',
+        log.debug('handling event %s with Webhook integration %s',
             event.name, self)
 
         if event.__class__ not in self.valid_events:
@@ -306,11 +306,11 @@ def post_to_webhook(url_calls, settings):
         headers = headers or {}
         call_headers.update(headers)
 
-        log.debug('calling WEBHOOK with method: %s', call_method)
+        log.debug('calling Webhook with method: %s', call_method)
         resp = call_method(url, json={
             'token': token,
             'event': data
         }, headers=call_headers)
-        log.debug('Got WEBHOOK response: %s', resp)
+        log.debug('Got Webhook response: %s', resp)
 
         resp.raise_for_status()  # raise exception on a failed request