[25/50] git commit: [#3154] tweak bulk export email text & formatting

[jo...@apache.org]

[#3154] tweak bulk export email text & formatting


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/6ee0e0d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/6ee0e0d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/6ee0e0d6

Branch: refs/heads/cj/6530
Commit: 6ee0e0d68d6b3b409cddc90dd14d85bdeef7a008
Parents: 20955bd
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Thu Aug 1 15:37:24 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Thu Aug 22 20:04:43 2013 +0000

----------------------------------------------------------------------
 Allura/allura/templates/mail/bulk_export.html | 14 ++++++++------
 Allura/allura/tests/test_tasks.py             |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6ee0e0d6/Allura/allura/templates/mail/bulk_export.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/mail/bulk_export.html b/Allura/allura/templates/mail/bulk_export.html
index 95ade78..e8aded1 100644
--- a/Allura/allura/templates/mail/bulk_export.html
+++ b/Allura/allura/templates/mail/bulk_export.html
@@ -17,20 +17,22 @@
        under the License.
 #}
 
-Bulk export for project {{ project.shortname }} is completed.
+The bulk export for project {{ project.shortname }} is completed.
 
-Following tools was exported:
-{% for tool in tools %}
+{% if tools %}
+The following tools were exported:
+{% for tool in tools -%}
 - {{ tool }}
 {% endfor %}
+{% endif %}
 
 {% if not_exported_tools %}
-Following tools was not exported:
-{% for tool in not_exported_tools %}
+The following tools were not exported:
+{% for tool in not_exported_tools -%}
 - {{ tool }}
 {% endfor %}
 {% endif %}
 
-Follow instructions below to get exported data.
+Follow the instructions below to get your exported data.
 
 {{ instructions }}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6ee0e0d6/Allura/allura/tests/test_tasks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_tasks.py b/Allura/allura/tests/test_tasks.py
index cd10683..c772253 100644
--- a/Allura/allura/tests/test_tasks.py
+++ b/Allura/allura/tests/test_tasks.py
@@ -392,8 +392,8 @@ class TestExportTasks(unittest.TestCase):
         assert_equal(len(tasks), 1)
         assert_equal(tasks[0].kwargs['subject'], 'Bulk export for project test completed')
         text = tasks[0].kwargs['text']
-        assert_in('Bulk export for project test is completed.', text)
-        assert_in('Following tools was exported:\n\n- wiki', text)
+        assert_in('The bulk export for project test is completed.', text)
+        assert_in('The following tools were exported:\n- wiki', text)
         assert_in('Sample instructions for test', text)
 
     @mock.patch('forgewiki.wiki_main.ForgeWikiApp.bulk_export')