launchpad-reviewers team mailing list archive

Thread
Date

[Merge] ~cjwatson/launchpad:tidy-date-rendering into launchpad:master

To: mp+415120@xxxxxxxxxxxxxxxxxx
From: Colin Watson <mp+415120@xxxxxxxxxxxxxxxxxx>
Date: Fri, 04 Feb 2022 16:38:25 -0000
Reply-to: mp+415120@xxxxxxxxxxxxxxxxxx
Sender: noreply@xxxxxxxxxxxxx

Colin Watson has proposed merging ~cjwatson/launchpad:tidy-date-rendering into launchpad:master.

Commit message:
Remove superfluous "on" from a couple of templates

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/415120

`DateTimeFormatterAPI.displaydate` already adds "on" when necessary, so this resulted in things like "Created by <person> on on <date>".
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:tidy-date-rendering into launchpad:master.

diff --git a/lib/lp/answers/stories/faq-edit.txt b/lib/lp/answers/stories/faq-edit.txt
index be6a95e..4182ab7 100644
--- a/lib/lp/answers/stories/faq-edit.txt
+++ b/lib/lp/answers/stories/faq-edit.txt
@@ -83,4 +83,4 @@ The 'Last updated by' field in the 'Lifecycle' portlet is updated
 with the name of the user who made the last modification:
 
     >>> print(extract_text(find_tag_by_id(browser.contents, 'faq-updated')))
-    Last updated by: Sample Person on ...
+    Last updated by: Sample Person ...
diff --git a/lib/lp/answers/stories/this-is-a-faq.txt b/lib/lp/answers/stories/this-is-a-faq.txt
index 757f69c..f9ec0cf 100644
--- a/lib/lp/answers/stories/this-is-a-faq.txt
+++ b/lib/lp/answers/stories/this-is-a-faq.txt
@@ -318,7 +318,7 @@ The FAQ's original author and creation date appears in the header:
 
     >>> print(extract_text(
     ...     find_tag_by_id(owner_browser.contents, 'registration')))
-    Created by Sample Person on ...
+    Created by Sample Person ...
 
 A 'Related questions' portlet contains links to the question answered by
 the FAQ:
diff --git a/lib/lp/answers/templates/faq-index.pt b/lib/lp/answers/templates/faq-index.pt
index f322d82..dbdfa7a 100644
--- a/lib/lp/answers/templates/faq-index.pt
+++ b/lib/lp/answers/templates/faq-index.pt
@@ -9,7 +9,6 @@
   <body>
     <metal:registering fill-slot="registering">
       Created by <a tal:replace="structure context/owner/fmt:link" />
-      on
       <tal:created
         replace="structure context/date_created/fmt:displaydatetitle" />
     </metal:registering>
@@ -31,7 +30,6 @@
             <dt>Last updated by:</dt>
             <dd>
               <a tal:replace="structure context/last_updated_by/fmt:link" />
-              on
               <tal:last-updated
                 replace="structure context/date_last_updated/fmt:displaydatetitle" />
             </dd>
diff --git a/lib/lp/blueprints/templates/sprint-index.pt b/lib/lp/blueprints/templates/sprint-index.pt
index da5dbe2..3cac430 100644
--- a/lib/lp/blueprints/templates/sprint-index.pt
+++ b/lib/lp/blueprints/templates/sprint-index.pt
@@ -11,7 +11,6 @@
 
 <tal:registering metal:fill-slot="registering">
   Registered by <a tal:replace="structure context/owner/fmt:link" />
-  on
   <tal:created
     replace="structure context/datecreated/fmt:displaydatetitle" />
 </tal:registering>