FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Ammend article datestamp year format · devhttps/frontend@d46f0de · GitHub

/ frontend Public
forked from guardian/frontend

Commit d46f0de

Browse files
sndrs
committed
Ammend article datestamp year format
From ‘XX to XXXX
1 parent aa1399e commit d46f0de

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

‎applications/app/views/fragments/crosswords/crosswordMeta.scala.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<div class="content__dateline content__dateline-crossword">
1616
<time itemprop="datePublished" datetime="@crosswordPage.crossword.date.toString("yyyy-MM-dd'T'HH:mm:ssZ"))"
1717
data-timestamp="@crosswordPage.crossword.date.getMillis" class="content__dateline-wpd js-wpd">
18-
@crosswordPage.crossword.date.toString("E d MMM ‘yy") <span class="content__dateline-time">@AuFriendlyFormat(crosswordPage.crossword.date)</span>
18+
@crosswordPage.crossword.date.toString("E d MMM yyyy") <span class="content__dateline-time">@AuFriendlyFormat(crosswordPage.crossword.date)</span>
1919
</time>
2020
</div>
2121
</div>

‎article/test/ArticleFeatureTest.scala‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ import collection.JavaConverters._
159159
import browser._
160160

161161
Then("I should see the publication date of the article")
162-
$(".content__dateline-wpd").text should be("Mon 6 Aug ‘12 20.30 BST")
162+
$(".content__dateline-wpd").text should be("Mon 6 Aug 2012 20.30 BST")
163163
$("time").attribute("datetime") should be("2012-08-06T20:30:00+0100")
164164
}
165165
}
@@ -171,31 +171,31 @@ import collection.JavaConverters._
171171
goTo("/world/2012/nov/08/syria-arms-embargo-rebel") { browser =>
172172
import browser._
173173
Then("the date should be 'Thursday 8 November 2012 00.01 GMT'")
174-
$(".content__dateline time").text should be("Thu 8 Nov ‘12 00.01 GMT")
174+
$(".content__dateline time").text should be("Thu 8 Nov 2012 00.01 GMT")
175175
}
176176

177177
Given("I am on an article published on '2012-11-08'")
178178
And("I am on the 'US' edition")
179179
US("/world/2012/nov/08/syria-arms-embargo-rebel") { browser =>
180180
import browser._
181181
Then("the date should be 'Wednesday 7 November 2012 19.01 GMT'")
182-
$(".content__dateline time").text should be("Wed 7 Nov ‘12 19.01 EST")
182+
$(".content__dateline time").text should be("Wed 7 Nov 2012 19.01 EST")
183183
}
184184

185185
Given("I am on an article published on '2012-08-19'")
186186
And("I am on the 'UK' edition")
187187
goTo("/business/2012/aug/19/shell-spending-security-nigeria-leak") { browser =>
188188
import browser._
189189
Then("the date should be 'Sunday 19 August 2012 18.38 BST'")
190-
$(".content__dateline time").text should be("Sun 19 Aug ‘12 18.38 BST")
190+
$(".content__dateline time").text should be("Sun 19 Aug 2012 18.38 BST")
191191
}
192192

193193
Given("I am on an article published on '2012-08-19'")
194194
And("I am on the 'US' edition")
195195
US("/business/2012/aug/19/shell-spending-security-nigeria-leak") { browser =>
196196
import browser._
197197
Then("the date should be 'Sunday 19 August 2012 13.38 BST'")
198-
$(".content__dateline time").text should be("Sun 19 Aug ‘12 13.38 EDT")
198+
$(".content__dateline time").text should be("Sun 19 Aug 2012 13.38 EDT")
199199
}
200200

201201
}

‎common/app/views/fragments/meta/dateline.scala.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<time itemprop="datePublished" datetime='@Format(webPublicationDate, "yyyy-MM-dd'T'HH:mm:ssZ")'
99
data-timestamp="@webPublicationDate.getMillis" class="content__dateline-wpd js-wpd">
1010
@if(isMinute) {
11-
<span class="content__dateline-time">@Format(webPublicationDate, "E d MMM ‘yy")</span>
11+
<span class="content__dateline-time">@Format(webPublicationDate, "E d MMM yyyy")</span>
1212
} else {
13-
@Format(webPublicationDate, "E d MMM ‘yy") <span class="content__dateline-time">@AuFriendlyFormat(webPublicationDate)</span>
13+
@Format(webPublicationDate, "E d MMM yyyy") <span class="content__dateline-time">@AuFriendlyFormat(webPublicationDate)</span>
1414
}
1515
</time>
1616
@if(isLiveBlog) {
@@ -22,7 +22,7 @@
2222
data-timestamp="@date.getMillis" class="content__dateline-lm js-lm u-h"
2323
@optItemProp.map { itemProp => itemprop="@itemProp" }
2424
>
25-
@label @Format(date, "E d MMM ‘yy") <span class="content__dateline-time">@AuFriendlyFormat(date)</span>
25+
@label @Format(date, "E d MMM yyyy") <span class="content__dateline-time">@AuFriendlyFormat(date)</span>
2626
</time>
2727
}
2828

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL