From 18eea8a9b1526c1eef1acd4251e86f85b539b917 Mon Sep 17 00:00:00 2001
From: blurrah <borisbesemer@gmail.com>
Date: Wed, 31 May 2017 16:30:18 +0200
Subject: [PATCH] updates faulty strings

---
 .../locale/en/LC_MESSAGES/django.po           | 214 ++++++++++--------
 src/wagtail_personalisation/rules.py          |   6 +-
 .../segment/dashboard.html                    |   4 +-
 3 files changed, 128 insertions(+), 96 deletions(-)

diff --git a/src/wagtail_personalisation/locale/en/LC_MESSAGES/django.po b/src/wagtail_personalisation/locale/en/LC_MESSAGES/django.po
index ba090af..abb0d35 100644
--- a/src/wagtail_personalisation/locale/en/LC_MESSAGES/django.po
+++ b/src/wagtail_personalisation/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wagtail_personalisation 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-31 03:00-0500\n"
+"POT-Creation-Date: 2017-05-31 09:30-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: blocks.py:19
+#: blocks.py:20
 msgid "Personalisation segment"
 msgstr ""
 
-#: blocks.py:20
+#: blocks.py:21
 msgid "Only show this content block for users in this segment"
 msgstr ""
 
@@ -29,43 +29,43 @@ msgstr ""
 msgid "Wagtail Personalisation"
 msgstr ""
 
-#: models.py:29
+#: models.py:26
 msgid "Enabled"
 msgstr ""
 
-#: models.py:30
+#: models.py:27
 msgid "Disabled"
 msgstr ""
 
-#: models.py:35
+#: models.py:39
 msgid "Should the segment persist between visits?"
 msgstr ""
 
-#: models.py:38
+#: models.py:42
 msgid "Should the segment match all the rules or just one of them?"
 msgstr ""
 
-#: models.py:56
+#: models.py:60
 msgid "Rules"
 msgstr ""
 
-#: models.py:137
+#: models.py:167
 msgid "Content"
 msgstr ""
 
-#: models.py:139
+#: models.py:169
 msgid "Variations"
 msgstr ""
 
-#: models.py:141
+#: models.py:171
 msgid "Promote"
 msgstr ""
 
-#: models.py:143
+#: models.py:173
 msgid "Settings"
 msgstr ""
 
-#: rules.py:30 rules.py:45
+#: rules.py:29 rules.py:48
 msgid "Abstract segmentation rule"
 msgstr ""
 
@@ -77,244 +77,276 @@ msgstr ""
 msgid "Ending time"
 msgstr ""
 
-#: rules.py:84
+#: rules.py:74
 msgid "Time Rule"
 msgstr ""
 
-#: rules.py:88
+#: rules.py:85
 msgid "These users visit between"
 msgstr ""
 
-#: rules.py:89
+#: rules.py:86
 msgid "{} and {}"
 msgstr ""
 
-#: rules.py:106
+#: rules.py:103
 msgid "Monday"
 msgstr ""
 
-#: rules.py:107
+#: rules.py:104
 msgid "Tuesday"
 msgstr ""
 
-#: rules.py:108
+#: rules.py:105
 msgid "Wednesday"
 msgstr ""
 
-#: rules.py:109
+#: rules.py:106
 msgid "Thursday"
 msgstr ""
 
-#: rules.py:110
+#: rules.py:107
 msgid "Friday"
 msgstr ""
 
-#: rules.py:111
+#: rules.py:108
 msgid "Saturday"
 msgstr ""
 
-#: rules.py:112
+#: rules.py:109
 msgid "Sunday"
 msgstr ""
 
-#: rules.py:136
+#: rules.py:122
 msgid "Day Rule"
 msgstr ""
 
-#: rules.py:152
+#: rules.py:146
 msgid "These users visit on"
 msgstr ""
 
-#: rules.py:153 rules.py:192 rules.py:400
-msgid "{}"
+#: rules.py:162
+msgid "Regular expression to match the referrer"
 msgstr ""
 
-#: rules.py:168
-msgid "Regex string to match the referer with"
-msgstr ""
-
-#: rules.py:187
+#: rules.py:169
 msgid "Referral Rule"
 msgstr ""
 
-#: rules.py:191
+#: rules.py:182
 msgid "These visits originate from"
 msgstr ""
 
-#: rules.py:211
+#: rules.py:183 rules.py:366
+msgid "{}"
+msgstr ""
+
+#: rules.py:202
 msgid "More than"
 msgstr ""
 
-#: rules.py:212
+#: rules.py:203
 msgid "Less than"
 msgstr ""
 
-#: rules.py:213
+#: rules.py:204
 msgid "Equal to"
 msgstr ""
 
-#: rules.py:270
+#: rules.py:247
 msgid "Visit count Rule"
 msgstr ""
 
-#: rules.py:274
+#: rules.py:251
 msgid "These users visited {}"
 msgstr ""
 
-#: rules.py:277
+#: rules.py:254
 msgid "{} {} times"
 msgstr ""
 
-#: rules.py:294
+#: rules.py:271
 msgid "The query parameter to search for"
 msgstr ""
 
-#: rules.py:296
+#: rules.py:273
 msgid "The value of the parameter to match"
 msgstr ""
 
-#: rules.py:317
+#: rules.py:282
 msgid "Query Rule"
 msgstr ""
 
-#: rules.py:321
-msgid "These users used a url with the query"
+#: rules.py:293
+msgid "These users used a URL with the query"
 msgstr ""
 
-#: rules.py:322
+#: rules.py:294
 msgid "?{}={}"
 msgstr ""
 
-#: rules.py:340
+#: rules.py:312
 msgid "Mobile phone"
 msgstr ""
 
-#: rules.py:341
+#: rules.py:313
 msgid "Tablet"
 msgstr ""
 
-#: rules.py:342
+#: rules.py:314
 msgid "Desktop"
 msgstr ""
 
-#: rules.py:367
+#: rules.py:323
 msgid "Device Rule"
 msgstr ""
 
-#: rules.py:391
-msgid "Logged In Rule"
+#: rules.py:354
+msgid "Logged in Rule"
 msgstr ""
 
-#: rules.py:394
+#: rules.py:360
 msgid "Logged in"
 msgstr ""
 
-#: rules.py:396
+#: rules.py:362
 msgid "Not logged in"
 msgstr ""
 
-#: rules.py:399
+#: rules.py:365
 msgid "These visitors are"
 msgstr ""
 
-#: templates/modeladmin/wagtail_personalisation/segment/index.html:12
+#: templates/modeladmin/wagtail_personalisation/segment/base.html:28
+msgid "Switch view"
+msgstr ""
+
+#: templates/modeladmin/wagtail_personalisation/segment/dashboard.html:14
+#: templates/modeladmin/wagtail_personalisation/segment/index.html:14
 msgid "Filter"
 msgstr ""
 
-#: templates/modeladmin/wagtail_personalisation/segment/index.html:28
-msgid "This segmented has been visited"
+#: templates/modeladmin/wagtail_personalisation/segment/dashboard.html:30
+msgid "This segment has been visited"
 msgstr ""
 
-#: templates/modeladmin/wagtail_personalisation/segment/index.html:29
+#: templates/modeladmin/wagtail_personalisation/segment/dashboard.html:31
 msgid "time"
 msgstr ""
 
-#: templates/modeladmin/wagtail_personalisation/segment/index.html:32
+#: templates/modeladmin/wagtail_personalisation/segment/dashboard.html:34
 msgid "This segment has been active for"
 msgstr ""
 
-#: templates/modeladmin/wagtail_personalisation/segment/index.html:33
+#: templates/modeladmin/wagtail_personalisation/segment/dashboard.html:35
 msgid "day"
 msgstr ""
 
-#: templates/modeladmin/wagtail_personalisation/segment/index.html:41
+#: templates/modeladmin/wagtail_personalisation/segment/dashboard.html:43
 msgid "The visitor must match"
 msgstr ""
 
-#: templates/modeladmin/wagtail_personalisation/segment/index.html:43
+#: templates/modeladmin/wagtail_personalisation/segment/dashboard.html:45
 msgid "Any rule"
 msgstr ""
 
-#: templates/modeladmin/wagtail_personalisation/segment/index.html:45
+#: templates/modeladmin/wagtail_personalisation/segment/dashboard.html:47
 msgid "All rules"
 msgstr ""
 
-#: templates/modeladmin/wagtail_personalisation/segment/index.html:50
+#: templates/modeladmin/wagtail_personalisation/segment/dashboard.html:52
 msgid "The persistence of this segment is"
 msgstr ""
 
-#: templates/modeladmin/wagtail_personalisation/segment/index.html:52
+#: templates/modeladmin/wagtail_personalisation/segment/dashboard.html:54
 msgid "This segment persists in between visits"
 msgstr ""
 
-#: templates/modeladmin/wagtail_personalisation/segment/index.html:52
+#: templates/modeladmin/wagtail_personalisation/segment/dashboard.html:54
 msgid "Persistent"
 msgstr ""
 
-#: templates/modeladmin/wagtail_personalisation/segment/index.html:54
-msgid "This segment is reevaluated on every visit"
+#: templates/modeladmin/wagtail_personalisation/segment/dashboard.html:56
+msgid "This segment is re-evaluated on every visit"
 msgstr ""
 
-#: templates/modeladmin/wagtail_personalisation/segment/index.html:54
+#: templates/modeladmin/wagtail_personalisation/segment/dashboard.html:56
 msgid "Fleeting"
 msgstr ""
 
-#: templates/modeladmin/wagtail_personalisation/segment/index.html:74
+#: templates/modeladmin/wagtail_personalisation/segment/dashboard.html:76
 msgid "Enable this segment"
 msgstr ""
 
-#: templates/modeladmin/wagtail_personalisation/segment/index.html:74
-msgid "enable"
-msgstr ""
-
-#: templates/modeladmin/wagtail_personalisation/segment/index.html:76
+#: templates/modeladmin/wagtail_personalisation/segment/dashboard.html:78
 msgid "Disable this segment"
 msgstr ""
 
-#: templates/modeladmin/wagtail_personalisation/segment/index.html:76
-msgid "disable"
-msgstr ""
-
-#: templates/modeladmin/wagtail_personalisation/segment/index.html:78
+#: templates/modeladmin/wagtail_personalisation/segment/dashboard.html:80
 msgid "Configure this segment"
 msgstr ""
 
-#: templates/modeladmin/wagtail_personalisation/segment/index.html:78
-msgid "configure this"
-msgstr ""
-
-#: templates/modeladmin/wagtail_personalisation/segment/index.html:87
+#: templates/modeladmin/wagtail_personalisation/segment/dashboard.html:88
 #, python-format
-msgid "Add a new %(name)s"
+msgid ""
+"\n"
+"                                    <a class=\"block suggestion\" href="
+"\"%(url)s\">\n"
+"                                        <span class=\"suggestive_text\">Add "
+"a new %(name)s</span>\n"
+"                                    </a>\n"
+"                                "
 msgstr ""
 
-#: templates/modeladmin/wagtail_personalisation/segment/index.html:97
+#: templates/modeladmin/wagtail_personalisation/segment/dashboard.html:101
+#: templates/modeladmin/wagtail_personalisation/segment/index.html:45
 #, python-format
 msgid "Page %(current_page)s of %(num_pages)s."
 msgstr ""
 
-#: wagtail_hooks.py:167
+#: templates/modeladmin/wagtail_personalisation/segment/index.html:24
+#, python-format
+msgid ""
+"No %(name)s have been created yet. One of the following must be created "
+"before you can add any %(name)s:"
+msgstr ""
+
+#: templates/modeladmin/wagtail_personalisation/segment/index.html:29
+#, python-format
+msgid "No %(name)s have been created yet."
+msgstr ""
+
+#: templates/modeladmin/wagtail_personalisation/segment/index.html:31
+#, python-format
+msgid ""
+"\n"
+"                                            Why not <a href=\"%(url)s\">add "
+"one</a>?\n"
+"                                        "
+msgstr ""
+
+#: views.py:60
+#, python-brace-format
+msgid "{visits} visits"
+msgstr ""
+
+#: views.py:63
+#, python-brace-format
+msgid "{days} days"
+msgstr ""
+
+#: wagtail_hooks.py:121
 msgid "Variants"
 msgstr ""
 
-#: wagtail_hooks.py:172
+#: wagtail_hooks.py:126
 msgid "Create a new variant"
 msgstr ""
 
-#: wagtail_hooks.py:191
+#: wagtail_hooks.py:146
 msgid "Create this variant"
 msgstr ""
 
-#: wagtail_hooks.py:204
+#: wagtail_hooks.py:159
 msgid "Segments"
 msgstr ""
diff --git a/src/wagtail_personalisation/rules.py b/src/wagtail_personalisation/rules.py
index 7bdb5a8..c6f1ee7 100644
--- a/src/wagtail_personalisation/rules.py
+++ b/src/wagtail_personalisation/rules.py
@@ -159,7 +159,7 @@ class ReferralRule(AbstractBaseRule):
 
     """
     regex_string = models.TextField(
-        _("Regex string to match the referer with"))
+        _("Regular expression to match the referrer"))
 
     panels = [
         FieldPanel('regex_string'),
@@ -290,7 +290,7 @@ class QueryRule(AbstractBaseRule):
 
     def description(self):
         description = {
-            'title': _('These users used a url with the query'),
+            'title': _('These users used a URL with the query'),
             'value': _('?{}={}').format(
                 self.parameter,
                 self.value
@@ -351,7 +351,7 @@ class UserIsLoggedInRule(AbstractBaseRule):
     ]
 
     def __str__(self):
-        return _('Logged In Rule')
+        return _('Logged in Rule')
 
     def test_user(self, request=None):
         return request.user.is_authenticated() == self.is_logged_in
diff --git a/src/wagtail_personalisation/templates/modeladmin/wagtail_personalisation/segment/dashboard.html b/src/wagtail_personalisation/templates/modeladmin/wagtail_personalisation/segment/dashboard.html
index 257d8fc..7b72511 100644
--- a/src/wagtail_personalisation/templates/modeladmin/wagtail_personalisation/segment/dashboard.html
+++ b/src/wagtail_personalisation/templates/modeladmin/wagtail_personalisation/segment/dashboard.html
@@ -27,7 +27,7 @@
                                         <div class="inspect_container">
                                             <ul class="inspect segment_stats">
                                                 <li class="visit_stat">
-                                                    {% trans "This segmented has been visited" %}
+                                                    {% trans "This segment has been visited" %}
                                                     <span>{{ segment.visit_count|localize }} {% trans "time" %}{{ segment.visit_count|pluralize }}</span>
                                                 </li>
                                                 <li class="days_stat">
@@ -53,7 +53,7 @@
                                                     {% if segment.persistent %}
                                                         <span title="{% trans "This segment persists in between visits" %}">{% trans "Persistent" %}</span>
                                                     {% else %}
-                                                        <span title="{% trans "This segment is reevaluated on every visit" %}">{% trans "Fleeting" %}</span>
+                                                        <span title="{% trans "This segment is re-evaluated on every visit" %}">{% trans "Fleeting" %}</span>
                                                     {% endif %}
                                                 </li>