Skip to content

Commit 9c9f176

Browse files
javiereguiluzjaviereguiluz
committed
Reordered some items and removed duplicates
1 parent b7dd618 commit 9c9f176

File tree

4 files changed

+47
-67
lines changed

4 files changed

+47
-67
lines changed

‎app/Resources/translations/messages.en.xliff

Lines changed: 36 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -38,41 +38,49 @@
3838
<source>label.delete_post</source>
3939
<target>Delete post</target>
4040
</trans-unit>
41-
<trans-unit id="column.title">
42-
<source>column.title</source>
41+
<trans-unit id="label.title">
42+
<source>label.title</source>
4343
<target>Title</target>
4444
</trans-unit>
45-
<trans-unit id="column.author">
46-
<source>column.author</source>
45+
<trans-unit id="label.author">
46+
<source>label.author</source>
4747
<target>Author</target>
4848
</trans-unit>
49-
<trans-unit id="column.published_at">
50-
<source>column.published_at</source>
51-
<target>Published at</target>
49+
<trans-unit id="label.author_email">
50+
<source>label.author_email</source>
51+
<target>Author email</target>
5252
</trans-unit>
53-
<trans-unit id="column.actions">
54-
<source>column.actions</source>
55-
<target>Actions</target>
53+
<trans-unit id="label.username">
54+
<source>label.username</source>
55+
<target>Username</target>
5656
</trans-unit>
57-
<trans-unit id="title.post_new">
58-
<source>title.post_new</source>
59-
<target>Post creation</target>
57+
<trans-unit id="label.password">
58+
<source>label.password</source>
59+
<target>Password</target>
6060
</trans-unit>
61-
<trans-unit id="term.summary">
62-
<source>term.summary</source>
63-
<target>Summary</target>
61+
<trans-unit id="label.role">
62+
<source>label.role</source>
63+
<target>Role</target>
6464
</trans-unit>
65-
<trans-unit id="term.content">
66-
<source>term.content</source>
65+
<trans-unit id="label.content">
66+
<source>label.content</source>
6767
<target>Content</target>
6868
</trans-unit>
69-
<trans-unit id="term.author">
70-
<source>term.author</source>
71-
<target>Author</target>
69+
<trans-unit id="label.summary">
70+
<source>label.summary</source>
71+
<target>Summary</target>
7272
</trans-unit>
73-
<trans-unit id="term.published">
74-
<source>term.published</source>
75-
<target>Published</target>
73+
<trans-unit id="label.published_at">
74+
<source>label.published_at</source>
75+
<target>Published at</target>
76+
</trans-unit>
77+
<trans-unit id="label.actions">
78+
<source>label.actions</source>
79+
<target>Actions</target>
80+
</trans-unit>
81+
<trans-unit id="title.post_new">
82+
<source>title.post_new</source>
83+
<target>Post creation</target>
7684
</trans-unit>
7785
<trans-unit id="action.edit_contents">
7886
<source>action.edit_contents</source>
@@ -82,6 +90,7 @@
8290
<source>action.delete_post</source>
8391
<target>Delete post</target>
8492
</trans-unit>
93+
8594
<trans-unit id="menu.post_list">
8695
<source>menu.post_list</source>
8796
<target>Post list</target>
@@ -102,6 +111,7 @@
102111
<source>menu.admin</source>
103112
<target>Backend</target>
104113
</trans-unit>
114+
105115
<trans-unit id="more_info_check_out">
106116
<source>more_info_check_out</source>
107117
<target>For more information, check out the</target>
@@ -190,38 +200,7 @@
190200
<source>label.sign_in</source>
191201
<target>Sign in</target>
192202
</trans-unit>
193-
<trans-unit id="column.username">
194-
<source>column.username</source>
195-
<target>Username</target>
196-
</trans-unit>
197-
<trans-unit id="column.password">
198-
<source>column.password</source>
199-
<target>Password</target>
200-
</trans-unit>
201-
<trans-unit id="column.role">
202-
<source>column.role</source>
203-
<target>Role</target>
204-
</trans-unit>
205-
<trans-unit id="label.title">
206-
<source>label.title</source>
207-
<target>Title</target>
208-
</trans-unit>
209-
<trans-unit id="label.summary">
210-
<source>label.summary</source>
211-
<target>Summary</target>
212-
</trans-unit>
213-
<trans-unit id="label.content">
214-
<source>label.content</source>
215-
<target>Content</target>
216-
</trans-unit>
217-
<trans-unit id="label.author_email">
218-
<source>label.author_email</source>
219-
<target>Author email</target>
220-
</trans-unit>
221-
<trans-unit id="label.published_at">
222-
<source>label.published_at</source>
223-
<target>Published at</target>
224-
</trans-unit>
203+
225204
<trans-unit id="description.demo_app">
226205
<source>description.demo_app</source>
227206
<target><![CDATA[This is a <strong>demo application</strong> built in the Symfony Framework to illustrate the recommended way of developing Symfony applications.]]></target>
@@ -242,6 +221,7 @@
242221
<source>description.browse_admin</source>
243222
<target><![CDATA[Browse the <strong>admin backend</strong> of the demo application.]]></target>
244223
</trans-unit>
224+
245225
<trans-unit id="title.login_help">
246226
<source>title.login_help</source>
247227
<target>Try either of the following users</target>

‎app/Resources/views/admin/blog/index.html.twig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
<table class="table table-striped">
99
<thead>
1010
<tr>
11-
<th>{{ 'column.title'|trans }}</th>
12-
<th><i class="fa fa-user"></i> {{ 'column.author'|trans }}</th>
13-
<th><i class="fa fa-calendar"></i> {{ 'column.published_at'|trans }}</th>
14-
<th><i class="fa fa-cogs"></i> {{ 'column.actions'|trans }}</th>
11+
<th>{{ 'label.title'|trans }}</th>
12+
<th><i class="fa fa-user"></i> {{ 'label.author'|trans }}</th>
13+
<th><i class="fa fa-calendar"></i> {{ 'label.published_at'|trans }}</th>
14+
<th><i class="fa fa-cogs"></i> {{ 'label.actions'|trans }}</th>
1515
</tr>
1616
</thead>
1717
<tbody>

‎app/Resources/views/admin/blog/show.html.twig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@
88
<table class="table">
99
<tbody>
1010
<tr>
11-
<th>{{ 'term.summary'|trans }}</th>
11+
<th>{{ 'label.summary'|trans }}</th>
1212
<td>{{ post.summary|md2html }}</td>
1313
</tr>
1414
<tr>
15-
<th>{{ 'term.content'|trans }}</th>
15+
<th>{{ 'label.content'|trans }}</th>
1616
<td>{{ post.content|md2html }}</td>
1717
</tr>
1818
<tr>
19-
<th>{{ 'term.author'|trans }}</th>
19+
<th>{{ 'label.author'|trans }}</th>
2020
<td><p>{{ post.authorEmail }}</p></td>
2121
</tr>
2222
<tr>
23-
<th>{{ 'term.published'|trans }}</th>
23+
<th>{{ 'label.published_at'|trans }}</th>
2424
<td><p>{{ post.publishedAt|date('Y-m-d H:i:s') }}</p></td>
2525
</tr>
2626
</tbody>

‎app/Resources/views/security/login.html.twig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
<table class="table table-striped table-bordered table-hover">
4242
<thead>
4343
<tr>
44-
<th>{{ 'column.username'|trans }}</th>
45-
<th>{{ 'column.password'|trans }}</th>
46-
<th>{{ 'column.role'|trans }}</th>
44+
<th>{{ 'label.username'|trans }}</th>
45+
<th>{{ 'label.password'|trans }}</th>
46+
<th>{{ 'label.role'|trans }}</th>
4747
</tr>
4848
</thead>
4949
<tbody>

0 commit comments

Comments
 (0)