Skip to content

Commit fe7125c

Browse files
mirekmarekmirekmarek
committed
Test.Locale module refactored
It is now possible to select each locale to test.
1 parent cffba71 commit fe7125c

File tree

2 files changed

+55
-20
lines changed

2 files changed

+55
-20
lines changed

‎application/Modules/Test/Locale/Controller/Main.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
namespace JetApplicationModule\Test\Locale;
1010

11+
use Jet\Http_Request;
12+
use Jet\Locale;
1113
use Jet\MVC_Controller_Default;
1214

1315
/**
@@ -20,6 +22,16 @@ class Controller_Main extends MVC_Controller_Default
2022
*/
2123
public function test_locale_Action(): void
2224
{
25+
$locale = Http_Request::GET()->getString(
26+
key: 'locale',
27+
default_value: Locale::getCurrentLocale()->toString(),
28+
valid_values: array_keys(Locale::getAllLocalesList())
29+
);
30+
31+
$locale = new Locale($locale);
32+
33+
$this->view->setVar('locale', $locale);
34+
2335
$this->output( 'test-locale' );
2436
}
2537
}

‎application/Modules/Test/Locale/views/test-locale.phtml

Lines changed: 43 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,48 @@
11
<?php
22

3+
use Jet\Http_Request;
34
use Jet\Locale;
5+
use Jet\MVC_View;
46
use Jet\Tr;
57
use Jet\Data_DateTime;
68
use Jet\UI;
79

10+
/**
11+
* @var MVC_View $this
12+
* @var Locale $locale
13+
*/
14+
815
$now = Data_DateTime::now();
16+
17+
$locale = $this->getRaw('locale');
918
?>
1019

20+
<div class="card">
21+
<div class="card-body">
22+
<?=UI::flag($locale)?> <?=$locale->getName()?> / <?=$locale->getName( $locale )?>
23+
</div>
24+
</div>
25+
26+
<br>
27+
1128
<legend><?= Tr::_( 'Date' ) ?></legend>
1229

1330
<table class="table">
1431
<tr>
1532
<td style="width: 20%"><?= Tr::_( 'Short: ' ) ?></td>
16-
<td><?= Locale::date( $now, Locale::DATE_TIME_FORMAT_SHORT ); ?></td>
33+
<td><?= $locale->formatDate( $now, Locale::DATE_TIME_FORMAT_SHORT ); ?></td>
1734
</tr>
1835
<tr>
1936
<td><?= Tr::_( 'Medium: ' ) ?></td>
20-
<td><?= Locale::date( $now, Locale::DATE_TIME_FORMAT_MEDIUM ); ?></td>
37+
<td><?= $locale->formatDate( $now, Locale::DATE_TIME_FORMAT_MEDIUM ); ?></td>
2138
</tr>
2239
<tr>
2340
<td><?= Tr::_( 'Long: ' ) ?></td>
24-
<td><?= Locale::date( $now, Locale::DATE_TIME_FORMAT_LONG ); ?></td>
41+
<td><?= $locale->formatDate( $now, Locale::DATE_TIME_FORMAT_LONG ); ?></td>
2542
</tr>
2643
<tr>
2744
<td><?= Tr::_( 'Full: ' ) ?></td>
28-
<td><?= Locale::date( $now, Locale::DATE_TIME_FORMAT_FULL ); ?></td>
45+
<td><?= $locale->formatDate( $now, Locale::DATE_TIME_FORMAT_FULL ); ?></td>
2946
</tr>
3047

3148
<tr>
@@ -40,19 +57,19 @@ $now = Data_DateTime::now();
4057
<table class="table">
4158
<tr>
4259
<td style="width: 20%"><?= Tr::_( 'Short: ' ) ?></td>
43-
<td><?= Locale::time( $now, Locale::DATE_TIME_FORMAT_SHORT ); ?></td>
60+
<td><?= $locale->formatTime( $now, Locale::DATE_TIME_FORMAT_SHORT ); ?></td>
4461
</tr>
4562
<tr>
4663
<td><?= Tr::_( 'Medium: ' ) ?></td>
47-
<td><?= Locale::time( $now, Locale::DATE_TIME_FORMAT_MEDIUM ); ?></td>
64+
<td><?= $locale->formatTime( $now, Locale::DATE_TIME_FORMAT_MEDIUM ); ?></td>
4865
</tr>
4966
<tr>
5067
<td><?= Tr::_( 'Long: ' ) ?></td>
51-
<td><?= Locale::time( $now, Locale::DATE_TIME_FORMAT_LONG ); ?></td>
68+
<td><?= $locale->formatTime( $now, Locale::DATE_TIME_FORMAT_LONG ); ?></td>
5269
</tr>
5370
<tr>
5471
<td><?= Tr::_( 'Full: ' ) ?></td>
55-
<td><?= Locale::time( $now, Locale::DATE_TIME_FORMAT_FULL ); ?></td>
72+
<td><?= $locale->formatTime( $now, Locale::DATE_TIME_FORMAT_FULL ); ?></td>
5673
</tr>
5774

5875
<tr>
@@ -68,19 +85,19 @@ $now = Data_DateTime::now();
6885
<table class="table">
6986
<tr>
7087
<td style="width: 20%"><?= Tr::_( 'Short: ' ) ?></td>
71-
<td><?= Locale::dateAndTime( $now, Locale::DATE_TIME_FORMAT_SHORT, Locale::DATE_TIME_FORMAT_SHORT ); ?></td>
88+
<td><?= $locale->formatDateAndTime( $now, Locale::DATE_TIME_FORMAT_SHORT, Locale::DATE_TIME_FORMAT_SHORT ); ?></td>
7289
</tr>
7390
<tr>
7491
<td><?= Tr::_( 'Medium: ' ) ?></td>
75-
<td><?= Locale::dateAndTime( $now, Locale::DATE_TIME_FORMAT_MEDIUM, Locale::DATE_TIME_FORMAT_MEDIUM ); ?></td>
92+
<td><?= $locale->formatDateAndTime( $now, Locale::DATE_TIME_FORMAT_MEDIUM, Locale::DATE_TIME_FORMAT_MEDIUM ); ?></td>
7693
</tr>
7794
<tr>
7895
<td><?= Tr::_( 'Long: ' ) ?></td>
79-
<td><?= Locale::dateAndTime( $now, Locale::DATE_TIME_FORMAT_LONG, Locale::DATE_TIME_FORMAT_LONG ); ?></td>
96+
<td><?= $locale->formatDateAndTime( $now, Locale::DATE_TIME_FORMAT_LONG, Locale::DATE_TIME_FORMAT_LONG ); ?></td>
8097
</tr>
8198
<tr>
8299
<td><?= Tr::_( 'Full: ' ) ?></td>
83-
<td><?= Locale::dateAndTime( $now, Locale::DATE_TIME_FORMAT_FULL, Locale::DATE_TIME_FORMAT_FULL ); ?></td>
100+
<td><?= $locale->formatDateAndTime( $now, Locale::DATE_TIME_FORMAT_FULL, Locale::DATE_TIME_FORMAT_FULL ); ?></td>
84101
</tr>
85102

86103
<tr>
@@ -95,33 +112,33 @@ $now = Data_DateTime::now();
95112
<table class="table">
96113
<tr>
97114
<td style="width: 20%"><?= Tr::_( 'Integer: ' ) ?></td>
98-
<td><?= Locale::int( 1234567898765321 ); ?></td>
115+
<td><?= $locale->formatInt( 1234567898765321 ); ?></td>
99116
</tr>
100117

101118
<tr>
102119
<td><?= Tr::_( 'Float: ' ) ?></td>
103-
<td><?= Locale::float( pi(), 2, 20 ); ?></td>
120+
<td><?= $locale->formatFloat( pi(), 2, 20 ); ?></td>
104121
</tr>
105122
<tr>
106123
<td><?= Tr::_( 'Float: ' ) ?></td>
107-
<td><?= Locale::float( 1980, 2, 20 ); ?></td>
124+
<td><?= $locale->formatFloat( 1980, 2, 20 ); ?></td>
108125
</tr>
109126
<tr>
110127
<td><?= Tr::_( 'File size: ' ) ?></td>
111-
<td><?= Locale::size( 5046586572 ); ?></td>
128+
<td><?= $locale->formatSize( 5046586572 ); ?></td>
112129
</tr>
113130

114131
<tr>
115132
<td><?= Tr::_( 'Price: ' ) ?></td>
116-
<td><?= Locale::currency( 10.95, 'USD' ); ?></td>
133+
<td><?= $locale->formatCurrency( 10.95, 'USD' ); ?></td>
117134
</tr>
118135
<tr>
119136
<td><?= Tr::_( 'Price: ' ) ?></td>
120-
<td><?= Locale::currency( 225.70, 'CZK' ); ?></td>
137+
<td><?= $locale->formatCurrency( 225.70, 'CZK' ); ?></td>
121138
</tr>
122139
<tr>
123140
<td><?= Tr::_( 'Price: ' ) ?></td>
124-
<td><?= Locale::currency( 11.81, 'EUR' ); ?></td>
141+
<td><?= $locale->formatCurrency( 11.81, 'EUR' ); ?></td>
125142
</tr>
126143

127144
</table>
@@ -159,7 +176,13 @@ $now = Data_DateTime::now();
159176
<tr>
160177
<td><?= UI::flag( $l ) ?></td>
161178

162-
<td><?= $l ?></td>
179+
<td>
180+
<?php if($l->toString()==$locale->toString()): ?>
181+
<b><?=$l;?></b>
182+
<?php else: ?>
183+
<a href="<?= Http_Request::currentURI(['locale' =>$l->toString()])?>"><?= $l ?></a>
184+
<?php endif; ?>
185+
</td>
163186
<td><?= $l->getName( $current_locale ) ?></td>
164187
<td><?= $l->getName( $l ) ?></td>
165188

0 commit comments

Comments
 (0)