首页 探索 帮助
注册 登录
Denis
/
seum-counter
镜像自地址 https://github.com/denismerigoux/seum-counter.git
关注 1
点赞 0
派生 0
文件 工单管理 0 提交历史 154 版本发布 0 Wiki
浏览代码

Tweak some traductions

Denis Merigoux 9 年之前
父节点
5a9c95d7fe
当前提交
7841dfc8fa
共有 5 个文件被更改，包括 212 次插入 和 81 次删除
分列视图 显示文件统计
  1. 6 0
      README.md
  2. 12 25
      counter/templates/baseTemplate.html
  3. 4 5
      counter/templates/counterTemplate.html
  4. 6 7
      counter/templates/homeTemplate.html
  5. 184 44
      locale/fr/LC_MESSAGES/django.po

+ 6 - 0
README.md
查看文件 

@@ -16,6 +16,12 @@ In order to use correctly the internationalisation, compile the locale files:
16 16 
 python manage.py compilemessages
17 17 
 ```
18 18
19 
+To  update the locale file for the project, use
20 
+```
21 
+django-admin makemessages -l fr --ignore=env
22 
+```
23 
+where `env` is the name of the folder containing your virtualenv.
24 
+
19 25 
 ## Running the server
20 26
21 27 
 ### Developement

+ 12 - 25
counter/templates/baseTemplate.html
查看文件 

@@ -1,6 +1,4 @@
1 
-{% load i18n %}
2 
-
3 
-{% get_current_language as LANGUAGE_CODE %}
1 
+{% load i18n %} {% get_current_language as LANGUAGE_CODE %}
4 2
5 3 
 <!DOCTYPE html>
6 4 
 <html>
 
@@ -14,13 +12,7 @@
14 12 
 	<link rel="shortcut icon" type="image/png" href="{{STATIC_URL}}/favicon.ico" />
15 13 
 	<title>SeumBook™ – {% block title %}{% endblock %}</title>
16 14
17 
-	{# Load the tag library #}
18 
-	{% load bootstrap3 %}
19 
-	{# Load CSS and JavaScript #}
20 
-	{% bootstrap_css %}
21 
-	{% bootstrap_javascript jquery=True %}
22 
-	{# Display django.contrib.messages as Bootstrap alerts #}
23 
-	{% bootstrap_messages %}
15 
+	{# Load the tag library #} {% load bootstrap3 %} {# Load CSS and JavaScript #} {% bootstrap_css %} {% bootstrap_javascript jquery=True %} {# Display django.contrib.messages as Bootstrap alerts #} {% bootstrap_messages %}
24 16
25 17 
 	<style>
26 18 
 		body {
 
@@ -75,23 +67,18 @@
75 67 
 	</script>
76 68 
 </head>
77 69 
 <section id="content">
78 
-	<div class="container-fluid" style="padding-top: 15px; ">
79 
- 		<div class="row">
80 
- 			<div class="col-md-12">
81 
- 				<form class="form-horizontal" action="{% url 'set_language' %}" method="post">{% csrf_token %}
82 
- 				{% if LANGUAGE_CODE == 'fr' %}
83 
- 					<input name="language" type="hidden" value="en" />
84 
-					<input type="submit" class="btn btn-info pull-right" value="English version" />
85 
-				{% else %}
86 
-					<input name="language" type="hidden" value="fr" />
87 
-					<input type="submit" class="btn btn-info pull-right" value="Version française" />
88 
- 				{% endif %}
89 
- 				</form>
90 
-			</div>
91 
-		</div>
92 
-	</div>
93 70 
 	{% block content %}{% endblock %}
94 71 
 </section>
72 
+<div class="container">
73 
+	<div class="text-center">
74 
+		<form action="{% url 'set_language' %}" method="post">{% csrf_token %} {% if LANGUAGE_CODE == 'fr' %}
75 
+			<input name="language" type="hidden" value="en" />
76 
+			<input type="submit" class="btn btn-primary" value="English version" /> {% else %}
77 
+			<input name="language" type="hidden" value="fr" />
78 
+			<input type="submit" class="btn btn-primary" value="Version française" /> {% endif %}
79 
+		</form>
80 
+	</div>
81 
+</div>
95 82 
 </body>
96 83
97 84 
 </html>

+ 4 - 5
counter/templates/counterTemplate.html
查看文件 

@@ -44,13 +44,12 @@
44 44 
         </div>
45 45 
         <div class="seum-counter panel-body" style="height:125px" id="container{{counter.id}}">
46 46 
           {% if counter.lastReset.noSeum %}
47 
-            <strong>{% trans "Has not got the seum yet" %}.</strong><br />
47 
+            <strong>{% trans "No seum yet" %}.</strong><br />
48 48 
           {% else %}
49 49 
             <strong>
50 50 
             {% if counter.lastReset.selfSeum %}
51 
-              {% trans "Has got the seum" %} {{ counter.lastReset.formatted_delta }}.
52 
-            {% else %}
53 
-              {{ counter.lastReset.who.trigramme }} {% trans "threw him/her the seum" %} {{ counter.lastReset.formatted_delta }}.
51 
+              {% trans "Got the seum" %} {{ counter.lastReset.formatted_delta }}.
52 
+            {% else %}{% blocktrans with trigram=counter.lastReset.who.trigramme time_ago=counter.lastReset.formatted_delta %}Seum thrown by {{ trigram }} {{ time_ago }}.{% endblocktrans %}
54 53 
             {% endif %}
55 54 
             </strong><br />
56 55 
           {% endif %}
 
@@ -58,7 +57,7 @@
58 57 
           <p>{{ counter.lastReset.reason | hashtag }}</p>
59 58 
           <div class="text-center">
60 59 
             <button id="button{{counter.id}}" class="btn btn-default btn-danger" type="button" onclick="revealSeumForm({{counter.id}})">
61 
-              {% trans "Reset" %}
60 
+              {% trans "Reset the counter" %}
62 61 
             </button>
63 62 
           </div>
64 63 
           <form style="display:none" id="counter{{counter.id}}" action="{% url 'reset-counter' %}" method="post">

+ 6 - 7
counter/templates/homeTemplate.html
查看文件 

@@ -29,7 +29,7 @@
29 29 
 				<div class="primary-counter panel-body" id="container{{myCounter.id}}">
30 30 
 					<div style="width:100%;">
31 31 
 						{% if myCounter.lastReset.noSeum %}
32 
-							<strong>{% trans "Has not got the seum yet" %}.</strong><br />
32 
+							<strong>{% trans "No seum yet" %}.</strong><br />
33 33 
 						{% else %}
34 34 
 							<strong>
35 35 
 								{% if myCounter.lastReset.selfSeum %}
 
@@ -42,7 +42,7 @@
42 42 
 						<p>{{ myCounter.lastReset.reason | hashtag }}</p>
43 43 
 						<div class="text-center" id="button{{myCounter.id}}">
44 44 
 							<button class="btn btn-default btn-danger" type="button" onclick="revealSeumForm({{myCounter.id}})">
45 
-								{% trans "Reset" %}
45 
+								{% trans "Reset the counter" %}
46 46 
 							</button>
47 47 
 						</div>
48 48 
 						{# reset form for my counter #}
 
@@ -135,9 +135,8 @@
135 135 
 					{% else %}
136 136 
 						<strong>
137 137 
 							{% if counter.lastReset.selfSeum %}
138 
-								{% trans "Has got the seum" %} {{ counter.lastReset.formatted_delta }}.
139 
-							{% else %}
140 
-								{{ counter.lastReset.who.trigramme }} {% trans "threw him/her the seum" %} {{ counter.lastReset.formatted_delta }}.
138 
+								{% trans "Got the seum" %} {{ counter.lastReset.formatted_delta }}.
139 
+							{% else %}{% blocktrans with trigram=counter.lastReset.who.trigramme time_ago=counter.lastReset.formatted_delta %}Seum thrown by {{ trigram }} {{ time_ago }}.{% endblocktrans %}
141 140 
 							{% endif %}
142 141 
 						</strong><br />
143 142 
 					{% endif %}
 
@@ -175,7 +174,7 @@
175 174 
 				<div class="panel-body graphs">
176 175 
 					{% if noBestSeum %}
177 176 
 						<div class="text-center text-muted">
178 
-							<p>{% trans "Nobody has got the seum..." %}</p>
177 
+							<p>{% trans "Nobody got the seum..." %}</p>
179 178 
 						</div>
180 179 
 					{% else %}
181 180 
 						{{ best_chart.as_html }}
 
@@ -247,7 +246,7 @@
247 246 
 				<div class="panel-body graphs">
248 247 
 					{% if noSeumActivity %}
249 248 
 						<div class="text-center text-muted">
250 
-							<p>{% trans "Nobody has got the seum..." %}</p>
249 
+							<p>{% trans "Nobody got the seum..." %}</p>
251 250 
 						</div>
252 251 
 					{% else %}
253 252 
 						{{ activity_chart.as_html }}

+ 184 - 44
locale/fr/LC_MESSAGES/django.po
查看文件 

@@ -8,7 +8,7 @@ msgid ""
8 8 
 msgstr ""
9 9 
 "Project-Id-Version: PACKAGE VERSION\n"
10 10 
 "Report-Msgid-Bugs-To: \n"
11 
-"POT-Creation-Date: 2017-01-22 13:09-0500\n"
11 
+"POT-Creation-Date: 2017-01-22 13:49-0500\n"
12 12 
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 
 "Language-Team: LANGUAGE <LL@li.org>\n"
 
@@ -18,70 +18,201 @@ msgstr ""
18 18 
 "Content-Transfer-Encoding: 8bit\n"
19 19 
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
20 20
21 
+#: counter/models.py:12
22 
+#, fuzzy
23 
+#| msgid "Username"
24 
+msgid "name"
25 
+msgstr "Nom d'utilisateur"
26 
+
27 
+#: counter/models.py:13
28 
+msgid "email"
29 
+msgstr "email"
30 
+
31 
+#: counter/models.py:14
32 
+#, fuzzy
33 
+#| msgid "Trigram"
34 
+msgid "trigram"
35 
+msgstr "Trigramme"
36 
+
37 
+#: counter/models.py:15
38 
+msgid "associated user"
39 
+msgstr "utilisateur associé"
40 
+
41 
+#: counter/models.py:16
42 
+#, fuzzy
43 
+#| msgid "Email notifications"
44 
+msgid "email notifications"
45 
+msgstr "Notifications par email"
46 
+
47 
+#: counter/models.py:17
48 
+#, fuzzy
49 
+#| msgid "Sort seums by score"
50 
+msgid "sort by SeumScore"
51 
+msgstr "Trier les seums par score"
52 
+
53 
+#: counter/models.py:20
54 
+#, python-format
55 
+msgid "%(trigram)s (%(name)s)"
56 
+msgstr "%(trigram)s (%(name)s)"
57 
+
58 
+#: counter/models.py:23
59 
+#, fuzzy
60 
+#| msgid "Counters"
61 
+msgid "counter"
62 
+msgstr "Compteurs"
63 
+
64 
+#: counter/models.py:27 counter/models.py:55
65 
+msgid "datetime"
66 
+msgstr "date et heure"
67 
+
68 
+#: counter/models.py:28
69 
+msgid "reason"
70 
+msgstr "raison"
71 
+
72 
+#: counter/models.py:29
73 
+#, fuzzy
74 
+#| msgid "Victim"
75 
+msgid "victim"
76 
+msgstr "Victime"
77 
+
78 
+#: counter/models.py:30
79 
+msgid "seum giver"
80 
+msgstr "fouteur de seum"
81 
+
82 
+#: counter/models.py:34
83 
+#, fuzzy, python-format
84 
+#| msgid "%(counter)s: %(reason)s"
85 
+msgid "%(counter)s: %(datetime)s (%(reason)s)"
86 
+msgstr "%(counter)s : %(reason)s"
87 
+
88 
+#: counter/models.py:48 counter/models.py:79
89 
+#, fuzzy
90 
+#| msgid "Reset"
91 
+msgid "reset"
92 
+msgstr "Remise à zéro"
93 
+
94 
+#: counter/models.py:49
95 
+#, fuzzy
96 
+#| msgid "Reset"
97 
+msgid "resets"
98 
+msgstr "Remise à zéro"
99 
+
100 
+#: counter/models.py:53
101 
+msgid "liker"
102 
+msgstr "liker"
103 
+
104 
+#: counter/models.py:54
105 
+msgid "seum"
106 
+msgstr "seum"
107 
+
108 
+#: counter/models.py:58
109 
+msgid "like"
110 
+msgstr "like"
111 
+
112 
+#: counter/models.py:59
113 
+msgid "likes"
114 
+msgstr "likes"
115 
+
116 
+#: counter/models.py:63
117 
+#, python-format
118 
+msgid "%(liker)s likes %(reset)s"
119 
+msgstr "%(liker)s likes %(reset)s"
120 
+
121 
+#: counter/models.py:70
122 
+msgid "keyword"
123 
+msgstr "mot-clé"
124 
+
125 
+#: counter/models.py:71
126 
+msgid "keywords"
127 
+msgstr "mots-clé"
128 
+
129 
+#: counter/models.py:78 counter/models.py:82
130 
+#, fuzzy
131 
+#| msgid "Hashtag"
132 
+msgid "hashtag"
133 
+msgstr "Hashtag"
134 
+
135 
+#: counter/models.py:83
136 
+#, fuzzy
137 
+#| msgid "Hashtag"
138 
+msgid "hashtags"
139 
+msgstr "Hashtag"
140 
+
141 
+#: counter/models.py:86
142 
+#, python-format
143 
+msgid "%(keyword)s for %(who)s"
144 
+msgstr "%(keyword)s pour %(who)s"
145 
+
21 146 
 #: counter/templates/counterTemplate.html:47
22 147 
 #: counter/templates/homeTemplate.html:32
23 
-#: counter/templates/homeTemplate.html:134
24 
-msgid "Has not got the seum yet"
25 
-msgstr "N'a pas encore eu le seum"
148 
+#, fuzzy
149 
+#| msgid "Sort seums by date"
150 
+msgid "No seum yet"
151 
+msgstr "Trier les seums par ancienneté"
26 152
27 153 
 #: counter/templates/counterTemplate.html:51
28 154 
 #: counter/templates/homeTemplate.html:138
29 
-msgid "Has got the seum"
30 
-msgstr "A eu le seum"
155 
+#, fuzzy
156 
+#| msgid "I got the seum"
157 
+msgid "Got the seum"
158 
+msgstr "J'ai eu le seum"
31 159
32 
-#: counter/templates/counterTemplate.html:53
33 
-#: counter/templates/homeTemplate.html:140
34 
-msgid "threw him/her the seum"
35 
-msgstr "lui a foutu le seum"
160 
+#: counter/templates/counterTemplate.html:52
161 
+#: counter/templates/homeTemplate.html:139
162 
+#, python-format
163 
+msgid "Seum thrown by %(trigram)s %(time_ago)s."
164 
+msgstr "%(trigram)s lui a foutu le seum %(time_ago)s"
36 165
37 
-#: counter/templates/counterTemplate.html:61
166 
+#: counter/templates/counterTemplate.html:60
38 167 
 #: counter/templates/homeTemplate.html:45
39 
-msgid "Reset"
40 
-msgstr "Remise à zéro"
168 
+#, fuzzy
169 
+#| msgid "Create the counter"
170 
+msgid "Reset the counter"
171 
+msgstr "Remettre à zéro"
41 172
42 
-#: counter/templates/counterTemplate.html:67
173 
+#: counter/templates/counterTemplate.html:66
43 174 
 msgid "Motive for the seum:"
44 175 
 msgstr "Motif du seum :"
45 176
46 
-#: counter/templates/counterTemplate.html:74
177 
+#: counter/templates/counterTemplate.html:73
47 178 
 #: counter/templates/homeTemplate.html:89
48 179 
 msgid "Throw the seum"
49 180 
 msgstr "Foutre le seum"
50 181
51 
-#: counter/templates/counterTemplate.html:83
182 
+#: counter/templates/counterTemplate.html:82
52 183 
 msgid "Timeline of the seum"
53 184 
 msgstr "Timeline du seum"
54 185
55 
-#: counter/templates/counterTemplate.html:88
186 
+#: counter/templates/counterTemplate.html:87
56 187 
 msgid "No timeline of the seum yet..."
57 188 
 msgstr "Pas encore de timeline du seum..."
58 189
59 
-#: counter/templates/counterTemplate.html:102
190 
+#: counter/templates/counterTemplate.html:101
60 191 
 msgid "Seum history"
61 192 
 msgstr "Historique du seum"
62 193
63 
-#: counter/templates/counterTemplate.html:110
194 
+#: counter/templates/counterTemplate.html:109
64 195 
 #: counter/templates/hashtagTemplate.html:26
65 196 
 msgid "Date"
66 197 
 msgstr "Date"
67 198
68 
-#: counter/templates/counterTemplate.html:111
199 
+#: counter/templates/counterTemplate.html:110
69 200 
 #: counter/templates/hashtagTemplate.html:27
70 201 
 #: counter/templates/homeTemplate.html:82
71 202 
 msgid "Motive"
72 203 
 msgstr "Motif"
73 204
74 
-#: counter/templates/counterTemplate.html:112
205 
+#: counter/templates/counterTemplate.html:111
75 206 
 #: counter/templates/hashtagTemplate.html:29
76 207 
 msgid "Seum thrower"
77 208 
 msgstr "Fouteur de seum"
78 209
79 
-#: counter/templates/counterTemplate.html:113
210 
+#: counter/templates/counterTemplate.html:112
80 211 
 #: counter/templates/hashtagTemplate.html:30
81 212 
 msgid "Number of likes"
82 213 
 msgstr "Nombre de likes"
83 214
84 
-#: counter/templates/counterTemplate.html:138
215 
+#: counter/templates/counterTemplate.html:137
85 216 
 #: counter/templates/hashtagTemplate.html:56
86 217 
 msgid "Back to counters list"
87 218 
 msgstr "Retour à la liste des compteurs"
 
@@ -220,53 +351,59 @@ msgstr "J'ai le seum"
220 351 
 msgid "Break the seum wall"
221 352 
 msgstr "Brise le mur du seum"
222 353
223 
-#: counter/templates/homeTemplate.html:155
354 
+#: counter/templates/homeTemplate.html:134
355 
+msgid "Has not got the seum yet"
356 
+msgstr "N'a pas encore eu le seum"
357 
+
358 
+#: counter/templates/homeTemplate.html:154
224 359 
 msgid "Timeline of the 24h of the seum"
225 360 
 msgstr "Timeline des 24 heures du seum"
226 361
227 
-#: counter/templates/homeTemplate.html:160
362 
+#: counter/templates/homeTemplate.html:159
228 363 
 msgid "No seum in the last past 24h..."
229 364 
 msgstr "Pas de seum durant les dernières 24h..."
230 365
231 
-#: counter/templates/homeTemplate.html:173
366 
+#: counter/templates/homeTemplate.html:172
232 367 
 msgid "Best seumers"
233 368 
 msgstr "Meilleurs seumers"
234 369
235 
-#: counter/templates/homeTemplate.html:178
236 
-#: counter/templates/homeTemplate.html:250
237 
-msgid "Nobody has got the seum..."
370 
+#: counter/templates/homeTemplate.html:177
371 
+#: counter/templates/homeTemplate.html:249
372 
+#, fuzzy
373 
+#| msgid "Nobody has got the seum..."
374 
+msgid "Nobody got the seum..."
238 375 
 msgstr "Personne n'a eu le seum..."
239 376
240 
-#: counter/templates/homeTemplate.html:191
377 
+#: counter/templates/homeTemplate.html:190
241 378 
 msgid "Most liked seumers"
242 379 
 msgstr "Seumers les plus likés"
243 380
244 
-#: counter/templates/homeTemplate.html:196
245 
-#: counter/templates/homeTemplate.html:232
381 
+#: counter/templates/homeTemplate.html:195
382 
+#: counter/templates/homeTemplate.html:231
246 383 
 msgid "Nobody liked..."
247 384 
 msgstr "Personne n'a aimé..."
248 385
249 
-#: counter/templates/homeTemplate.html:209
386 
+#: counter/templates/homeTemplate.html:208
250 387 
 msgid "Most popular hashtags"
251 388 
 msgstr "Hashtags les plus populaires"
252 389
253 
-#: counter/templates/homeTemplate.html:214
390 
+#: counter/templates/homeTemplate.html:213
254 391 
 msgid "Nobody used any hashtag..."
255 392 
 msgstr "Personne n'a utilisé de hashtag..."
256 393
257 
-#: counter/templates/homeTemplate.html:227
394 
+#: counter/templates/homeTemplate.html:226
258 395 
 msgid "Best likers of seum"
259 396 
 msgstr "Meilleurs likeurs de seum"
260 397
261 
-#: counter/templates/homeTemplate.html:245
398 
+#: counter/templates/homeTemplate.html:244
262 399 
 msgid "Seum activity"
263 400 
 msgstr "Activité seumesque"
264 401
265 
-#: counter/templates/homeTemplate.html:261
402 
+#: counter/templates/homeTemplate.html:260
266 403 
 msgid "Logout"
267 404 
 msgstr "Se déconnecter"
268 405
269 
-#: counter/templates/homeTemplate.html:262
406 
+#: counter/templates/homeTemplate.html:261
270 407 
 #: counter/templates/passwordChange.html:5
271 408 
 #: counter/templates/passwordChange.html:35
272 409 
 #: counter/templates/passwordResetConfirm.html:5
 
@@ -274,19 +411,19 @@ msgstr "Se déconnecter"
274 411 
 msgid "Change password"
275 412 
 msgstr "Modifier le mot de passe"
276 413
277 
-#: counter/templates/homeTemplate.html:265
414 
+#: counter/templates/homeTemplate.html:264
278 415 
 msgid "Deactivate email notifications"
279 416 
 msgstr "Désactiver les notifications par email"
280 417
281 
-#: counter/templates/homeTemplate.html:267
418 
+#: counter/templates/homeTemplate.html:266
282 419 
 msgid "Activate email notifications"
283 420 
 msgstr "Activer les notifications par email"
284 421
285 
-#: counter/templates/homeTemplate.html:272
422 
+#: counter/templates/homeTemplate.html:271
286 423 
 msgid "Sort seums by date"
287 424 
 msgstr "Trier les seums par ancienneté"
288 425
289 
-#: counter/templates/homeTemplate.html:274
426 
+#: counter/templates/homeTemplate.html:273
290 427 
 msgid "Sort seums by score"
291 428 
 msgstr "Trier les seums par score"
292 429 
 
@@ -495,10 +632,13 @@ msgstr "Un utilisateur avec cette adresse email existe déjà."
495 632 
 msgid "Use another email address, another user has already this login."
496 633 
 msgstr "Utilise une autre adresse email, un autre utilisateur a déjà ce login."
497 634
498 
-#: seum/settings.py:109
635 
+#: seum/settings.py:107
499 636 
 msgid "English"
500 637 
 msgstr "Anglais"
501 638
502 
-#: seum/settings.py:110
639 
+#: seum/settings.py:108
503 640 
 msgid "French"
504 641 
 msgstr "Français"
642 
+
643 
+#~ msgid "Has got the seum"
644 
+#~ msgstr "A eu le seum"