Skip to content

Commit 3fe7960

Browse files
committed
feature #182 minor: use long-form duration message for english (kbond)
This PR was squashed before being merged into the 2.x-dev branch. Discussion ---------- minor: use long-form duration message for english Followup to #177. `@weaverryan` and I concluded it would be best to _not_ use short forms by default. Commits ------- a353072 minor: use long-form duration message for english
2 parents 6a484a9 + a353072 commit 3fe7960

3 files changed

Lines changed: 16 additions & 16 deletions

File tree

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Last edited: {{ post.updatedAt|time_diff }} <!-- Last edited: 1 week ago -->
77
88
Event date: {{ event.date|time_diff }} <!-- Event date: in two weeks -->
99
10-
Read time: {{ post.readTimeInSeconds|duration }} <!-- Read time: 2 mins -->
10+
Read time: {{ post.readTimeInSeconds|duration }} <!-- Read time: 2 minutes -->
1111
```
1212

1313
Want to see it used in a screencast 🎥? Check out SymfonyCasts: https://symfonycasts.com/screencast/symfony-doctrine/ago
@@ -47,15 +47,15 @@ Time formatting:
4747
Duration formatting:
4848

4949
```twig
50-
{{ someDurationInSeconds|duration }} {# 2 mins #}
50+
{{ someDurationInSeconds|duration }} {# 2 minutes #}
5151
```
5252

5353
### Service
5454

5555
You can also format dates and durations in your services/controllers by autowiring/injecting the
5656
`Knp\Bundle\TimeBundle\DateTimeFormatter` service:
5757

58-
```
58+
```php
5959
use Knp\Bundle\TimeBundle\DateTimeFormatter;
6060
// ...
6161

@@ -71,7 +71,7 @@ public function yourAction(DateTimeFormatter $dateTimeFormatter)
7171
return $this->json([
7272
// ...
7373
'published_at' => $agoTime, // 2 years ago
74-
'read_time' => $readTime, // 1 min
74+
'read_time' => $readTime, // 1 minute
7575
// ...
7676
]);
7777
}

tests/IntegrationTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ public function testServiceWiring(): void
2929
$this->assertStringContainsString('Now: now', $result);
3030

3131
$this->assertStringContainsString('1 day ago', $result);
32-
$this->assertStringContainsString('Zero: < 1 sec', $result);
33-
$this->assertStringContainsString('Less than a second: < 1 sec', $result);
34-
$this->assertStringContainsString('One second: 1 sec', $result);
35-
$this->assertStringContainsString('Multiple seconds: 59 secs', $result);
36-
$this->assertStringContainsString('One minute: 1 min', $result);
37-
$this->assertStringContainsString('Multiple minutes: 59 mins', $result);
38-
$this->assertStringContainsString('One hour: 1 hr', $result);
39-
$this->assertStringContainsString('Multiple hours: 23 hrs', $result);
32+
$this->assertStringContainsString('Zero: < 1 second', $result);
33+
$this->assertStringContainsString('Less than a second: < 1 second', $result);
34+
$this->assertStringContainsString('One second: 1 second', $result);
35+
$this->assertStringContainsString('Multiple seconds: 59 seconds', $result);
36+
$this->assertStringContainsString('One minute: 1 minute', $result);
37+
$this->assertStringContainsString('Multiple minutes: 59 minutes', $result);
38+
$this->assertStringContainsString('One hour: 1 hour', $result);
39+
$this->assertStringContainsString('Multiple hours: 23 hours', $result);
4040
$this->assertStringContainsString('One day: 1 day', $result);
4141
$this->assertStringContainsString('Multiple days: 99 days', $result);
4242
}

translations/time.en.xliff

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,23 +56,23 @@
5656
</trans-unit>
5757
<trans-unit id="14">
5858
<source>duration.second</source>
59-
<target>1 sec|%count% secs</target>
59+
<target>1 second|%count% seconds</target>
6060
</trans-unit>
6161
<trans-unit id="15">
6262
<source>duration.minute</source>
63-
<target>1 min|%count% mins</target>
63+
<target>1 minute|%count% minutes</target>
6464
</trans-unit>
6565
<trans-unit id="16">
6666
<source>duration.hour</source>
67-
<target>1 hr|%count% hrs</target>
67+
<target>1 hour|%count% hours</target>
6868
</trans-unit>
6969
<trans-unit id="17">
7070
<source>duration.day</source>
7171
<target>1 day|%count% days</target>
7272
</trans-unit>
7373
<trans-unit id="18">
7474
<source>duration.none</source>
75-
<target>&lt; 1 sec</target>
75+
<target>&lt; 1 second</target>
7676
</trans-unit>
7777
</body>
7878
</file>

0 commit comments

Comments
 (0)