From f855b8979f3bbbdaa79fa9d60adaf6b101034129 Mon Sep 17 00:00:00 2001
From: Michael Watters <michael.watters@dart.biz>
Date: Nov 30 2016 21:04:57 +0000
Subject: Change - Fix grammar in UI messages


Updated UI messages to be more coherent.

---

diff --git a/pagure/ui/plugins.py b/pagure/ui/plugins.py
index 0c8915d..48bfc64 100644
--- a/pagure/ui/plugins.py
+++ b/pagure/ui/plugins.py
@@ -137,7 +137,7 @@ def view_plugin(repo, plugin, username=None, namespace=None, full=True):
         else:
             try:
                 plugin.remove(repo)
-                flask.flash('Hook %s inactived' % plugin.name)
+                flask.flash('Hook %s deactivated' % plugin.name)
             except FileNotFoundException as err:
                 pagure.APP.logger.exception(err)
                 flask.abort(404, 'No git repo found')
diff --git a/tests/test_pagure_flask_ui_plugins.py b/tests/test_pagure_flask_ui_plugins.py
index 4546bf1..d1ee886 100644
--- a/tests/test_pagure_flask_ui_plugins.py
+++ b/tests/test_pagure_flask_ui_plugins.py
@@ -144,7 +144,7 @@ class PagureFlaskPluginstests(tests.Modeltests):
                 '<section class="settings">\n  <h3>Settings for test</h3>',
                 output.data)
             self.assertIn(
-                '</button>\n                      Hook Mail inactived', output.data)
+                '</button>\n                      Hook Mail deactivated', output.data)
 
     def test_RequiredIf(self):
         """ Test the behavior of the RequiredIf validator. """
diff --git a/tests/test_pagure_flask_ui_plugins_fedmsg.py b/tests/test_pagure_flask_ui_plugins_fedmsg.py
index 43120c5..982a33f 100644
--- a/tests/test_pagure_flask_ui_plugins_fedmsg.py
+++ b/tests/test_pagure_flask_ui_plugins_fedmsg.py
@@ -97,7 +97,7 @@ class PagureFlaskPluginFedmsgtests(tests.Modeltests):
                 '<section class="settings">\n  <h3>Settings for test</h3>',
                 output.data)
             self.assertIn(
-                '</button>\n                      Hook Fedmsg inactived',
+                '</button>\n                      Hook Fedmsg deactivated',
                 output.data)
             output = self.app.get('/test/settings/Fedmsg', data=data)
             self.assertIn(
@@ -148,7 +148,7 @@ class PagureFlaskPluginFedmsgtests(tests.Modeltests):
                 '<section class="settings">\n  <h3>Settings for test</h3>',
                 output.data)
             self.assertIn(
-                '</button>\n                      Hook Fedmsg inactived',
+                '</button>\n                      Hook Fedmsg deactivated',
                 output.data)
             output = self.app.get('/test/settings/Fedmsg', data=data)
             self.assertEqual(output.status_code, 200)
diff --git a/tests/test_pagure_flask_ui_plugins_irc.py b/tests/test_pagure_flask_ui_plugins_irc.py
index 3da8dc6..702def3 100644
--- a/tests/test_pagure_flask_ui_plugins_irc.py
+++ b/tests/test_pagure_flask_ui_plugins_irc.py
@@ -97,7 +97,7 @@ class PagureFlaskPluginIRCtests(tests.Modeltests):
                 '<section class="settings">\n  <h3>Settings for test</h3>',
                 output.data)
             self.assertTrue(
-                '</button>\n                      Hook IRC inactived' in output.data)
+                '</button>\n                      Hook IRC deactivated' in output.data)
 
             output = self.app.get('/test/settings/IRC')
             self.assertEqual(output.status_code, 200)
@@ -152,7 +152,7 @@ class PagureFlaskPluginIRCtests(tests.Modeltests):
                 '<section class="settings">\n  <h3>Settings for test</h3>',
                 output.data)
             self.assertTrue(
-                '</button>\n                      Hook IRC inactived' in output.data)
+                '</button>\n                      Hook IRC deactivated' in output.data)
 
             output = self.app.get('/test/settings/IRC')
             self.assertEqual(output.status_code, 200)
diff --git a/tests/test_pagure_flask_ui_plugins_mail.py b/tests/test_pagure_flask_ui_plugins_mail.py
index 16610bb..82af99e 100644
--- a/tests/test_pagure_flask_ui_plugins_mail.py
+++ b/tests/test_pagure_flask_ui_plugins_mail.py
@@ -100,7 +100,7 @@ class PagureFlaskPluginMailtests(tests.Modeltests):
                 '<section class="settings">\n  <h3>Settings for test</h3>',
                 output.data)
             self.assertTrue(
-                '</button>\n                      Hook Mail inactived' in output.data)
+                '</button>\n                      Hook Mail deactivated' in output.data)
 
             output = self.app.get('/test/settings/Mail')
             self.assertEqual(output.status_code, 200)
@@ -181,7 +181,7 @@ class PagureFlaskPluginMailtests(tests.Modeltests):
                 '<section class="settings">\n  <h3>Settings for test</h3>',
                 output.data)
             self.assertTrue(
-                '</button>\n                      Hook Mail inactived' in output.data)
+                '</button>\n                      Hook Mail deactivated' in output.data)
 
             output = self.app.get('/test/settings/Mail')
             self.assertIn(
diff --git a/tests/test_pagure_flask_ui_plugins_noff.py b/tests/test_pagure_flask_ui_plugins_noff.py
index 8590275..ffa37d4 100644
--- a/tests/test_pagure_flask_ui_plugins_noff.py
+++ b/tests/test_pagure_flask_ui_plugins_noff.py
@@ -108,7 +108,7 @@ class PagureFlaskPluginNoFFtests(tests.Modeltests):
                 output.data)
             self.assertTrue(
                 '</button>\n                      Hook Block non '
-                'fast-forward pushes inactived' in output.data)
+                'fast-forward pushes deactivated' in output.data)
 
             output = self.app.get(
                 '/test/settings/Block non fast-forward pushes')
@@ -204,7 +204,7 @@ class PagureFlaskPluginNoFFtests(tests.Modeltests):
                 output.data)
             self.assertIn(
                 '</button>\n                      Hook Block non '
-                'fast-forward pushes inactived', output.data)
+                'fast-forward pushes deactivated', output.data)
 
             output = self.app.get(
                 '/test/settings/Block non fast-forward pushes')
diff --git a/tests/test_pagure_flask_ui_plugins_pagure_ci.py b/tests/test_pagure_flask_ui_plugins_pagure_ci.py
index 8f3894f..eafdf75 100644
--- a/tests/test_pagure_flask_ui_plugins_pagure_ci.py
+++ b/tests/test_pagure_flask_ui_plugins_pagure_ci.py
@@ -143,7 +143,7 @@ class PagureFlaskPluginPagureCItests(tests.Modeltests):
                 '/test/settings/Pagure CI', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '</button>\n                      Hook Pagure CI inactived',
+                '</button>\n                      Hook Pagure CI deactivated',
                 output.data)
             self.assertIn(
                 '<section class="settings">\n  <h3>Settings for test</h3>',
diff --git a/tests/test_pagure_flask_ui_plugins_pagure_hook.py b/tests/test_pagure_flask_ui_plugins_pagure_hook.py
index ea3fd1d..3b7ebb5 100644
--- a/tests/test_pagure_flask_ui_plugins_pagure_hook.py
+++ b/tests/test_pagure_flask_ui_plugins_pagure_hook.py
@@ -99,7 +99,7 @@ class PagureFlaskPluginPagureHooktests(tests.Modeltests):
                 '<section class="settings">\n  <h3>Settings for test</h3>',
                 output.data)
             self.assertTrue(
-                '</button>\n                      Hook Pagure inactived'
+                '</button>\n                      Hook Pagure deactivated'
                 in output.data)
 
             output = self.app.get('/test/settings/Pagure')
@@ -153,7 +153,7 @@ class PagureFlaskPluginPagureHooktests(tests.Modeltests):
                 '<section class="settings">\n  <h3>Settings for test</h3>',
                 output.data)
             self.assertTrue(
-                '</button>\n                      Hook Pagure inactived'
+                '</button>\n                      Hook Pagure deactivated'
                 in output.data)
 
             output = self.app.get('/test/settings/Pagure')
diff --git a/tests/test_pagure_flask_ui_plugins_pagure_request_hook.py b/tests/test_pagure_flask_ui_plugins_pagure_request_hook.py
index 829e5ee..3062f93 100644
--- a/tests/test_pagure_flask_ui_plugins_pagure_request_hook.py
+++ b/tests/test_pagure_flask_ui_plugins_pagure_request_hook.py
@@ -97,7 +97,7 @@ class PagureFlaskPluginPagureRequestHooktests(tests.Modeltests):
                 '<section class="settings">\n  <h3>Settings for test</h3>',
                 output.data)
             self.assertTrue(
-                '</button>\n                      Hook Pagure requests inactived'
+                '</button>\n                      Hook Pagure requests deactivated'
                 in output.data)
 
             output = self.app.get('/test/settings/Pagure requests')
@@ -155,7 +155,7 @@ class PagureFlaskPluginPagureRequestHooktests(tests.Modeltests):
                 '<section class="settings">\n  <h3>Settings for test</h3>',
                 output.data)
             self.assertTrue(
-                '</button>\n                      Hook Pagure requests inactived'
+                '</button>\n                      Hook Pagure requests deactivated'
                 in output.data)
 
             output = self.app.get('/test/settings/Pagure requests')
diff --git a/tests/test_pagure_flask_ui_plugins_pagure_ticket_hook.py b/tests/test_pagure_flask_ui_plugins_pagure_ticket_hook.py
index 017def4..6dffa90 100644
--- a/tests/test_pagure_flask_ui_plugins_pagure_ticket_hook.py
+++ b/tests/test_pagure_flask_ui_plugins_pagure_ticket_hook.py
@@ -97,7 +97,7 @@ class PagureFlaskPluginPagureTicketHooktests(tests.Modeltests):
                 '<section class="settings">\n  <h3>Settings for test</h3>',
                 output.data)
             self.assertTrue(
-                '</button>\n                      Hook Pagure tickets inactived'
+                '</button>\n                      Hook Pagure tickets deactivated'
                 in output.data)
 
             output = self.app.get('/test/settings/Pagure tickets')
@@ -155,7 +155,7 @@ class PagureFlaskPluginPagureTicketHooktests(tests.Modeltests):
                 '<section class="settings">\n  <h3>Settings for test</h3>',
                 output.data)
             self.assertTrue(
-                '</button>\n                      Hook Pagure tickets inactived'
+                '</button>\n                      Hook Pagure tickets deactivated'
                 in output.data)
 
             output = self.app.get('/test/settings/Pagure tickets')
diff --git a/tests/test_pagure_flask_ui_plugins_rtd_hook.py b/tests/test_pagure_flask_ui_plugins_rtd_hook.py
index 759403a..9cea204 100644
--- a/tests/test_pagure_flask_ui_plugins_rtd_hook.py
+++ b/tests/test_pagure_flask_ui_plugins_rtd_hook.py
@@ -97,7 +97,7 @@ class PagureFlaskPluginRtdHooktests(tests.Modeltests):
                 '<section class="settings">\n  <h3>Settings for test</h3>',
                 output.data)
             self.assertIn(
-                '</button>\n                      Hook Read the Doc inactived',
+                '</button>\n                      Hook Read the Doc deactivated',
                 output.data)
 
             output = self.app.get('/test/settings/Read the Doc')
@@ -156,7 +156,7 @@ class PagureFlaskPluginRtdHooktests(tests.Modeltests):
                 '<section class="settings">\n  <h3>Settings for test</h3>',
                 output.data)
             self.assertIn(
-                '</button>\n                      Hook Read the Doc inactived',
+                '</button>\n                      Hook Read the Doc deactivated',
                 output.data)
 
             output = self.app.get('/test/settings/Read the Doc')
diff --git a/tests/test_pagure_flask_ui_plugins_unsigned.py b/tests/test_pagure_flask_ui_plugins_unsigned.py
index 2cda6e3..8475813 100644
--- a/tests/test_pagure_flask_ui_plugins_unsigned.py
+++ b/tests/test_pagure_flask_ui_plugins_unsigned.py
@@ -102,7 +102,7 @@ class PagureFlaskPluginUnsignedtests(tests.Modeltests):
                 output.data)
             self.assertTrue(
                 '</button>\n                      Hook Block Un-Signed '
-                'commits inactived' in output.data)
+                'commits deactivated' in output.data)
 
             output = self.app.get(
                 '/test/settings/Block Un-Signed commits')
@@ -153,7 +153,7 @@ class PagureFlaskPluginUnsignedtests(tests.Modeltests):
                 output.data)
             self.assertTrue(
                 '</button>\n                      Hook Block Un-Signed '
-                'commits inactived' in output.data)
+                'commits deactivated' in output.data)
 
             output = self.app.get(
                 '/test/settings/Block Un-Signed commits')

