Skip to content

Commit 7770358

Browse files
javiereguiluzjaviereguiluz
committed
Finished reorganizing app translation
1 parent 9c9f176 commit 7770358

File tree

7 files changed

+117
-136
lines changed

7 files changed

+117
-136
lines changed

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

Lines changed: 104 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,80 @@
22
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
33
<file source-language="en" target-language="en" datatype="plaintext" original="file.ext">
44
<body>
5+
<trans-unit id="note">
6+
<source>note</source>
7+
<target>NOTE</target>
8+
</trans-unit>
9+
<trans-unit id="tip">
10+
<source>tip</source>
11+
<target>TIP</target>
12+
</trans-unit>
13+
<trans-unit id="not_available">
14+
<source>not_available</source>
15+
<target>Not available</target>
16+
</trans-unit>
17+
<trans-unit id="mit_license">
18+
<source>mit_license</source>
19+
<target>MIT License</target>
20+
</trans-unit>
21+
22+
<trans-unit id="title.homepage">
23+
<source>title.homepage</source>
24+
<target><![CDATA[Welcome to the <strong>Symfony Demo Application</strong>]]></target>
25+
</trans-unit>
26+
<trans-unit id="title.source_code">
27+
<source>title.source_code</source>
28+
<target>Source code used to render this page</target>
29+
</trans-unit>
30+
<trans-unit id="title.controller_code">
31+
<source>title.controller_code</source>
32+
<target>Controller code</target>
33+
</trans-unit>
34+
<trans-unit id="title.twig_template_code">
35+
<source>title.twig_template_code</source>
36+
<target>Twig template code</target>
37+
</trans-unit>
38+
<trans-unit id="title.login">
39+
<source>title.login</source>
40+
<target>Secure Sign in</target>
41+
</trans-unit>
542
<trans-unit id="title.post_list">
643
<source>title.post_list</source>
744
<target>Post List</target>
845
</trans-unit>
46+
<trans-unit id="title.edit_post">
47+
<source>title.edit_post</source>
48+
<target>Edit post #%id%</target>
49+
</trans-unit>
50+
<trans-unit id="title.add_comment">
51+
<source>title.add_comment</source>
52+
<target>Add a comment</target>
53+
</trans-unit>
54+
955
<trans-unit id="action.show">
1056
<source>action.show</source>
1157
<target>Show</target>
1258
</trans-unit>
59+
<trans-unit id="action.show_code">
60+
<source>action.show_code</source>
61+
<target>Show code</target>
62+
</trans-unit>
1363
<trans-unit id="action.edit">
1464
<source>action.edit</source>
1565
<target>Edit</target>
1666
</trans-unit>
67+
<trans-unit id="action.edit_post">
68+
<source>action.edit_post</source>
69+
<target>Edit post</target>
70+
</trans-unit>
71+
<trans-unit id="action.save">
72+
<source>action.save</source>
73+
<target>Save changes</target>
74+
</trans-unit>
75+
<trans-unit id="action.delete_post">
76+
<source>action.delete_post</source>
77+
<target>Delete post</target>
78+
</trans-unit>
1779
<trans-unit id="action.create_post">
1880
<source>action.create_post</source>
1981
<target>Create a new post</target>
@@ -26,18 +88,23 @@
2688
<source>action.back_to_list</source>
2789
<target>Back to the post list</target>
2890
</trans-unit>
29-
<trans-unit id="title.edit_post">
30-
<source>title.edit_post</source>
31-
<target>Edit post #%id%</target>
91+
<trans-unit id="action.publish_comment">
92+
<source>action.publish_comment</source>
93+
<target>Publish comment</target>
3294
</trans-unit>
33-
<trans-unit id="label.save">
34-
<source>label.save</source>
35-
<target>Save changes</target>
95+
<trans-unit id="action.sign_in">
96+
<source>action.sign_in</source>
97+
<target>Sign in</target>
3698
</trans-unit>
37-
<trans-unit id="label.delete_post">
38-
<source>label.delete_post</source>
39-
<target>Delete post</target>
99+
<trans-unit id="action.browse_app">
100+
<source>action.browse_app</source>
101+
<target>Browse application</target>
102+
</trans-unit>
103+
<trans-unit id="action.browse_admin">
104+
<source>action.browse_admin</source>
105+
<target>Browse backend</target>
40106
</trans-unit>
107+
41108
<trans-unit id="label.title">
42109
<source>label.title</source>
43110
<target>Title</target>
@@ -86,10 +153,6 @@
86153
<source>action.edit_contents</source>
87154
<target>Edit contents</target>
88155
</trans-unit>
89-
<trans-unit id="action.delete_post">
90-
<source>action.delete_post</source>
91-
<target>Delete post</target>
92-
</trans-unit>
93156

94157
<trans-unit id="menu.post_list">
95158
<source>menu.post_list</source>
@@ -99,10 +162,6 @@
99162
<source>menu.back_to_blog</source>
100163
<target>Back to blog</target>
101164
</trans-unit>
102-
<trans-unit id="menu.logout">
103-
<source>menu.logout</source>
104-
<target>Logout</target>
105-
</trans-unit>
106165
<trans-unit id="menu.homepage">
107166
<source>menu.homepage</source>
108167
<target>Homepage</target>
@@ -111,119 +170,46 @@
111170
<source>menu.admin</source>
112171
<target>Backend</target>
113172
</trans-unit>
114-
115-
<trans-unit id="more_info_check_out">
116-
<source>more_info_check_out</source>
117-
<target>For more information, check out the</target>
118-
</trans-unit>
119-
<trans-unit id="symfony_doc">
120-
<source>symfony_doc</source>
121-
<target>Symfony doc</target>
122-
</trans-unit>
123-
<trans-unit id="mit_license">
124-
<source>mit_license</source>
125-
<target>MIT License</target>
126-
</trans-unit>
127-
<trans-unit id="title.add_comment">
128-
<source>title.add_comment</source>
129-
<target>Add a comment</target>
130-
</trans-unit>
131-
<trans-unit id="label.publish_comment">
132-
<source>label.publish_comment</source>
133-
<target>Publish comment</target>
134-
</trans-unit>
135-
<trans-unit id="action.sign_in">
136-
<source>action.sign_in</source>
137-
<target>Sign in</target>
173+
<trans-unit id="menu.logout">
174+
<source>menu.logout</source>
175+
<target>Logout</target>
138176
</trans-unit>
139-
<trans-unit id="to_publish_a_comment">
140-
<source>to_publish_a_comment</source>
177+
178+
<trans-unit id="post.to_publish_a_comment">
179+
<source>post.to_publish_a_comment</source>
141180
<target>to publish a comment</target>
142181
</trans-unit>
143-
<trans-unit id="title.comments">
144-
<source>title.comments</source>
182+
<trans-unit id="post.num_comments">
183+
<source>post.num_comments</source>
145184
<target>%count% comment|%count% comments</target>
146185
</trans-unit>
147-
<trans-unit id="commented_on">
148-
<source>commented_on</source>
186+
<trans-unit id="post.commented_on">
187+
<source>post.commented_on</source>
149188
<target>commented on</target>
150189
</trans-unit>
151-
<trans-unit id="no_comment">
152-
<source>no_comment</source>
190+
<trans-unit id="post.no_comments">
191+
<source>post.no_comments</source>
153192
<target>Be the first to comment on this post.</target>
154193
</trans-unit>
155-
<trans-unit id="action.edit_post">
156-
<source>action.edit_post</source>
157-
<target>Edit post</target>
158-
</trans-unit>
159-
<trans-unit id="action.show_code">
160-
<source>action.show_code</source>
161-
<target>Show code</target>
162-
</trans-unit>
163-
<trans-unit id="title.source_code">
164-
<source>title.source_code</source>
165-
<target>Source code used to render this page</target>
166-
</trans-unit>
167-
<trans-unit id="title.controller_code">
168-
<source>title.controller_code</source>
169-
<target>Controller code</target>
170-
</trans-unit>
171-
<trans-unit id="not_available">
172-
<source>not_available</source>
173-
<target>Not available</target>
174-
</trans-unit>
175-
<trans-unit id="title.twig_template_code">
176-
<source>title.twig_template_code</source>
177-
<target>Twig template code</target>
178-
</trans-unit>
179-
<trans-unit id="action.browse_app">
180-
<source>action.browse_app</source>
181-
<target>Browse application</target>
182-
</trans-unit>
183-
<trans-unit id="action.browse_admin">
184-
<source>action.browse_admin</source>
185-
<target>Browse backend</target>
186-
</trans-unit>
187-
<trans-unit id="title.login">
188-
<source>title.login</source>
189-
<target>Secure Sign in</target>
190-
</trans-unit>
191-
<trans-unit id="label.username">
192-
<source>label.username</source>
193-
<target>Username</target>
194-
</trans-unit>
195-
<trans-unit id="label.password">
196-
<source>label.password</source>
197-
<target>Password:</target>
198-
</trans-unit>
199-
<trans-unit id="label.sign_in">
200-
<source>label.sign_in</source>
201-
<target>Sign in</target>
202-
</trans-unit>
203194

204-
<trans-unit id="description.demo_app">
205-
<source>description.demo_app</source>
195+
<trans-unit id="help.app_description">
196+
<source>help.app_description</source>
206197
<target><![CDATA[This is a <strong>demo application</strong> built in the Symfony Framework to illustrate the recommended way of developing Symfony applications.]]></target>
207198
</trans-unit>
208-
<trans-unit id="description.show_code">
209-
<source>description.show_code</source>
199+
<trans-unit id="help.show_code">
200+
<source>help.show_code</source>
210201
<target><![CDATA[Click on this button to show the source code of the <strong>Controller</strong> and <strong>template</strong> used to render this page.]]></target>
211202
</trans-unit>
212-
<trans-unit id="title.homepage">
213-
<source>title.homepage</source>
214-
<target><![CDATA[Welcome to the <strong>Symfony Demo Application</strong>]]></target>
215-
</trans-unit>
216-
<trans-unit id="description.browse_app">
217-
<source>description.browse_app</source>
203+
<trans-unit id="help.browse_app">
204+
<source>help.browse_app</source>
218205
<target><![CDATA[Browse the <strong>public section</strong> of the demo application.]]></target>
219206
</trans-unit>
220-
<trans-unit id="description.browse_admin">
221-
<source>description.browse_admin</source>
207+
<trans-unit id="help.browse_admin">
208+
<source>help.browse_admin</source>
222209
<target><![CDATA[Browse the <strong>admin backend</strong> of the demo application.]]></target>
223210
</trans-unit>
224-
225-
<trans-unit id="title.login_help">
226-
<source>title.login_help</source>
211+
<trans-unit id="help.login_users">
212+
<source>help.login_users</source>
227213
<target>Try either of the following users</target>
228214
</trans-unit>
229215
<trans-unit id="help.role_user">
@@ -234,22 +220,18 @@
234220
<source>help.role_admin</source>
235221
<target>administrator</target>
236222
</trans-unit>
237-
<trans-unit id="note">
238-
<source>note</source>
239-
<target>NOTE</target>
240-
</trans-unit>
241-
<trans-unit id="reload_fixtures">
223+
<trans-unit id="help.reload_fixtures">
242224
<source>reload_fixtures</source>
243225
<target>If these users don't work, reload application fixtures by running this command from the terminal:</target>
244226
</trans-unit>
245-
<trans-unit id="tip">
246-
<source>tip</source>
247-
<target>TIP</target>
248-
</trans-unit>
249-
<trans-unit id="add_user">
227+
<trans-unit id="help.add_user">
250228
<source>add_user</source>
251229
<target>If you want to create new users, run this other command:</target>
252230
</trans-unit>
231+
<trans-unit id="help.more_information">
232+
<source>title.homepage</source>
233+
<target><![CDATA[For more information, check out the <a href="http://symfony.com/doc">Symfony doc</a>.]]></target>
234+
</trans-unit>
253235

254236
<trans-unit id="entity.comment_blank">
255237
<source>entity.comment_blank</source>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77

88
{{ include('admin/blog/_form.html.twig', {
99
form: edit_form,
10-
button_label: 'label.save'|trans,
10+
button_label: 'action.save'|trans,
1111
}, with_context = false) }}
1212
{% endblock %}
1313

1414
{% block sidebar %}
1515
<div class="section actions">
1616
{{ include('admin/blog/_form.html.twig', {
1717
form: delete_form,
18-
button_label: 'label.delete_post'|trans,
18+
button_label: 'action.delete_post'|trans,
1919
button_css: 'btn btn-lg btn-block btn-danger',
2020
include_back_to_home_link: false
2121
}, with_context = false) }}

‎app/Resources/views/base.html.twig

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,10 @@
9696
<div class="section about">
9797
<div class="well well-lg">
9898
<p>
99-
{{ 'description.demo_app'|trans|raw }}
99+
{{ 'help.app_description'|trans|raw }}
100100
</p>
101101
<p>
102-
{{ 'more_info_check_out'|trans }}
103-
<a href="http://symfony.com/doc">{{ 'symfony_doc'|trans }}</a>.
102+
{{ 'help.more_information'|trans|raw }}
104103
</p>
105104
</div>
106105
</div>

‎app/Resources/views/blog/comment_form.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</div>
2222

2323
<div class="form-group">
24-
{{ form_widget(form.submit, { attr: { class: 'btn-primary pull-right' }, label: 'label.publish_comment'|trans }) }}
24+
{{ form_widget(form.submit, { attr: { class: 'btn-primary pull-right' }, label: 'action.publish_comment'|trans }) }}
2525
</div>
2626
</fieldset>
2727
{{ form_end(form) }}

‎app/Resources/views/blog/post_show.html.twig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@
2121
<a class="btn btn-success" href="{{ path('security_login_form') }}">
2222
<i class="fa fa-sign-in"></i> {{ 'action.sign_in'|trans }}
2323
</a>
24-
{{ 'to_publish_a_comment'|trans }}
24+
{{ 'post.to_publish_a_comment'|trans }}
2525
</p>
2626
{% endif %}
2727
</div>
2828

29-
<h3>{{ 'title.comments'|transchoice(post.comments|length) }}</h3>
29+
<h3>{{ 'post.num_comments'|transchoice(post.comments|length) }}</h3>
3030

3131
{% for comment in post.comments %}
3232
<div class="row post-comment">
3333
<h4 class="col-sm-3">
34-
<strong>{{ comment.authorEmail }}</strong> {{ 'commented_on'|trans }}
34+
<strong>{{ comment.authorEmail }}</strong> {{ 'post.commented_on'|trans }}
3535
<strong>{{ comment.publishedAt|date('M jS \\a\\t g:i a') }}</strong>
3636
</h4>
3737
<div class="col-sm-9">
@@ -40,7 +40,7 @@
4040
</div>
4141
{% else %}
4242
<div class="post-comment">
43-
<p>{{ 'no_comment'|trans }}</p>
43+
<p>{{ 'post.no_comments'|trans }}</p>
4444
</div>
4545
{% endfor %}
4646
{% endblock %}

‎app/Resources/views/default/_source_code.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#}
99
<div class="section source-code">
1010
<p>
11-
{{ 'description.show_code'|trans|raw }}
11+
{{ 'help.show_code'|trans|raw }}
1212
</p>
1313

1414
<button type="button" class="btn btn-default btn-lg btn-block" data-toggle="modal" data-target="#sourceCodeModal">

0 commit comments

Comments
 (0)