patch.txt

Brad Beattie, 2009-03-24 22:34

Download (30.7 KB)

 
1
### Eclipse Workspace Patch 1.0
2
#P Redmine
3
Index: config/locales/sv.yml
4
===================================================================
5
--- config/locales/sv.yml	(revision 2632)
6
+++ config/locales/sv.yml	(working copy)
7
@@ -338,7 +338,7 @@
8
   setting_mail_handler_api_enabled: Aktivera WS för inkommande mail
9
   setting_mail_handler_api_key: API-nyckel
10
   setting_sequential_project_identifiers: Generera projektidentifierare sekventiellt
11
-  setting_gravatar_enabled: Använd Gravatar-avatarer
12
+  setting_avatars_enabled: Använd Gravatar-avatarer
13
   setting_diff_max_lines_displayed: Maximalt antal synliga rader i diff
14
   setting_file_max_size_displayed: Maxstorlek på textfiler som visas inline
15
   setting_repository_log_display_limit: Maximalt antal revisioner i filloggen
16
Index: config/locales/zh-TW.yml
17
===================================================================
18
--- config/locales/zh-TW.yml	(revision 2632)
19
+++ config/locales/zh-TW.yml	(working copy)
20
@@ -387,7 +387,7 @@
21
   setting_mail_handler_api_enabled: 啟用處理傳入電子郵件的服務
22
   setting_mail_handler_api_key: API 金鑰
23
   setting_sequential_project_identifiers: 循序產生專案識別碼
24
-  setting_gravatar_enabled: 啟用 Gravatar 全球認證大頭像
25
+  setting_avatars_enabled: 啟用 Gravatar 全球認證大頭像
26
   setting_diff_max_lines_displayed: 差異顯示行數之最大值
27
   setting_file_max_size_displayed: 檔案內容顯示大小之最大值
28
   setting_repository_log_display_limit: 版次顯示數目之最大值
29
Index: public/stylesheets/application.css
30
===================================================================
31
--- public/stylesheets/application.css	(revision 2632)
32
+++ public/stylesheets/application.css	(working copy)
33
@@ -666,19 +666,19 @@
34
 .icon22-settings { background-image: url(../images/22x22/settings.png); }
35
 .icon22-plugin { background-image: url(../images/22x22/plugin.png); }
36
 
37
-img.gravatar { 
38
+img.avatar { 
39
 	padding: 2px;
40
   border: solid 1px #d5d5d5;
41
   background: #fff;
42
 }
43
 
44
-div.issue img.gravatar {
45
+div.issue img.avatar {
46
 	float: right;
47
 	margin: 0 0 0 1em;
48
 	padding: 5px;
49
 }
50
 
51
-div.issue table img.gravatar {
52
+div.issue table img.avatar {
53
 	height: 14px;
54
 	width: 14px;
55
 	padding: 2px;
56
@@ -686,18 +686,18 @@
57
 	margin: 0 0.5em 0 0;
58
 }
59
 
60
-#history img.gravatar {
61
+#history img.avatar {
62
 	padding: 3px;
63
 	margin: 0 1.5em 1em 0;
64
 	float: left;
65
 }
66
 
67
-td.username img.gravatar {
68
+td.username img.avatar {
69
 	float: left;
70
 	margin: 0 1em 0 0;
71
 }
72
 
73
-#activity dt img.gravatar {
74
+#activity dt img.avatar {
75
 	float: left;
76
 	margin: 0 1em 1em 0;
77
 }
78
Index: config/locales/gl.yml
79
===================================================================
80
--- config/locales/gl.yml	(revision 2632)
81
+++ config/locales/gl.yml	(working copy)
82
@@ -728,7 +728,7 @@
83
   setting_emails_footer: Pe de mensaxes
84
   setting_enabled_scm: Activar SCM
85
   setting_feeds_limit: Límite de contido para sindicación
86
-  setting_gravatar_enabled: Usar iconas de usuario (Gravatar)
87
+  setting_avatars_enabled: Usar iconas de usuario (Gravatar)
88
   setting_host_name: Nome e ruta do servidor
89
   setting_issue_list_default_columns: Columnas por defecto para a lista de peticións
90
   setting_issues_export_limit: Límite de exportación de peticións
91
Index: config/locales/pt.yml
92
===================================================================
93
--- config/locales/pt.yml	(revision 2632)
94
+++ config/locales/pt.yml	(working copy)
95
@@ -780,7 +780,7 @@
96
   permission_rename_wiki_pages: Renomear páginas de wiki
97
   permission_edit_time_entries: Editar entradas de tempo
98
   permission_edit_own_issue_notes: Editar as prórpias notas
99
-  setting_gravatar_enabled: Utilizar icons Gravatar
100
+  setting_avatars_enabled: Utilizar icons Gravatar
101
   label_example: Exemplo
102
   text_repository_usernames_mapping: "Seleccionar ou actualizar o utilizador de Redmine mapeado a cada nome de utilizador encontrado no repositório.\nUtilizadores com o mesmo nome de utilizador ou email no Redmine e no repositório são mapeados automaticamente."
103
   permission_edit_own_messages: Editar as próprias mensagens
104
Index: app/views/settings/_display.rhtml
105
===================================================================
106
--- app/views/settings/_display.rhtml	(revision 2632)
107
+++ app/views/settings/_display.rhtml	(working copy)
108
@@ -16,8 +16,8 @@
109
 <p><label><%= l(:setting_user_format) %></label>
110
 <%= select_tag 'settings[user_format]', options_for_select( @options[:user_format], Setting.user_format.to_s ) %></p>
111
 
112
-<p><label><%= l(:setting_gravatar_enabled) %></label>
113
-<%= check_box_tag 'settings[gravatar_enabled]', 1, Setting.gravatar_enabled? %><%= hidden_field_tag 'settings[gravatar_enabled]', 0 %></p>
114
+<p><label><%= l(:setting_avatars_enabled) %></label>
115
+<%= check_box_tag 'settings[avatars_enabled]', 1, Setting.avatars_enabled? %><%= hidden_field_tag 'settings[avatars_enabled]', 0 %></p>
116
 </div>
117
 
118
 <%= submit_tag l(:button_save) %>
119
Index: test/fixtures/diffs/subversion.diff
120
===================================================================
121
--- test/fixtures/diffs/subversion.diff	(revision 2632)
122
+++ test/fixtures/diffs/subversion.diff	(working copy)
123
@@ -9,8 +9,8 @@
124
 +<p><label><%= l(:setting_diff_max_lines_displayed) %></label>
125
 +<%= text_field_tag 'settings[diff_max_lines_displayed]', Setting.diff_max_lines_displayed, :size => 6 %></p>
126
 +
127
- <p><label><%= l(:setting_gravatar_enabled) %></label>
128
- <%= check_box_tag 'settings[gravatar_enabled]', 1, Setting.gravatar_enabled? %><%= hidden_field_tag 'settings[gravatar_enabled]', 0 %></p>
129
+ <p><label><%= l(:setting_avatars_enabled) %></label>
130
+ <%= check_box_tag 'settings[avatars_enabled]', 1, Setting.avatars_enabled? %><%= hidden_field_tag 'settings[avatars_enabled]', 0 %></p>
131
  </div>
132
 Index: app/views/common/_diff.rhtml
133
 ===================================================================
134
Index: config/locales/ja.yml
135
===================================================================
136
--- config/locales/ja.yml	(revision 2632)
137
+++ config/locales/ja.yml	(working copy)
138
@@ -787,7 +787,7 @@
139
   permission_rename_wiki_pages: Rename wiki pages
140
   permission_edit_time_entries: Edit time logs
141
   permission_edit_own_issue_notes: Edit own notes
142
-  setting_gravatar_enabled: Gravatarユーザーアイコンを使用する
143
+  setting_avatars_enabled: Gravatarユーザーアイコンを使用する
144
   label_example: 例
145
   text_repository_usernames_mapping: "リポジトリのログから検出されたユーザー名をどのRedmineユーザーに関連づけるのか選択してください。\nログ上のユーザー名またはメールアドレスがRedmineのユーザーと一致する場合は自動的に関連づけられます。"
146
   permission_edit_own_messages: Edit own messages
147
Index: config/locales/fr.yml
148
===================================================================
149
--- config/locales/fr.yml	(revision 2632)
150
+++ config/locales/fr.yml	(working copy)
151
@@ -312,7 +312,7 @@
152
   setting_mail_handler_api_enabled: "Activer le WS pour la réception d'emails"
153
   setting_mail_handler_api_key: Clé de protection de l'API
154
   setting_sequential_project_identifiers: Générer des identifiants de projet séquentiels
155
-  setting_gravatar_enabled: Afficher les Gravatar des utilisateurs
156
+  setting_avatars_enabled: Afficher les Gravatar des utilisateurs
157
   setting_diff_max_lines_displayed: Nombre maximum de lignes de diff affichées
158
   setting_file_max_size_displayed: Taille maximum des fichiers texte affichés en ligne
159
   setting_repository_log_display_limit: "Nombre maximum de revisions affichées sur l'historique d'un fichier"
160
Index: config/locales/bg.yml
161
===================================================================
162
--- config/locales/bg.yml	(revision 2632)
163
+++ config/locales/bg.yml	(working copy)
164
@@ -756,7 +756,7 @@
165
   permission_rename_wiki_pages: Rename wiki pages
166
   permission_edit_time_entries: Edit time logs
167
   permission_edit_own_issue_notes: Edit own notes
168
-  setting_gravatar_enabled: Use Gravatar user icons
169
+  setting_avatars_enabled: Use Gravatar user icons
170
   label_example: Example
171
   text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
172
   permission_edit_own_messages: Edit own messages
173
Index: config/locales/it.yml
174
===================================================================
175
--- config/locales/it.yml	(revision 2632)
176
+++ config/locales/it.yml	(working copy)
177
@@ -774,7 +774,7 @@
178
   permission_rename_wiki_pages: Rinomina pagine wiki
179
   permission_edit_time_entries: Modifica time logs
180
   permission_edit_own_issue_notes: Modifica proprie note
181
-  setting_gravatar_enabled: Usa icone utente Gravatar
182
+  setting_avatars_enabled: Usa icone utente Gravatar
183
   label_example: Esempio
184
   text_repository_usernames_mapping: "Seleziona per aggiornare la corrispondenza tra gli utenti Redmine e quelli presenti nel log del repository.\nGli utenti Redmine e repository con lo stesso username o email sono mappati automaticamente."
185
   permission_edit_own_messages: Modifica propri messaggi
186
Index: config/locales/ru.yml
187
===================================================================
188
--- config/locales/ru.yml	(revision 2632)
189
+++ config/locales/ru.yml	(working copy)
190
@@ -823,7 +823,7 @@
191
   setting_emails_footer: Подстрочные примечания Email
192
   setting_enabled_scm: Разрешенные SCM
193
   setting_feeds_limit: Ограничение количества заголовков для RSS потока
194
-  setting_gravatar_enabled: Использовать аватар пользователя из Gravatar
195
+  setting_avatars_enabled: Использовать аватар пользователя из Gravatar
196
   setting_host_name: Имя компьютера
197
   setting_issue_list_default_columns: Колонки, отображаемые в списке задач по умолчанию
198
   setting_issues_export_limit: Ограничение по экспортируемым задачам
199
Index: config/locales/no.yml
200
===================================================================
201
--- config/locales/no.yml	(revision 2632)
202
+++ config/locales/no.yml	(working copy)
203
@@ -761,7 +761,7 @@
204
   permission_rename_wiki_pages: Rename wiki pages
205
   permission_edit_time_entries: Edit time logs
206
   permission_edit_own_issue_notes: Edit own notes
207
-  setting_gravatar_enabled: Use Gravatar user icons
208
+  setting_avatars_enabled: Use Gravatar user icons
209
   label_example: Example
210
   text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
211
   permission_edit_own_messages: Edit own messages
212
Index: config/locales/bs.yml
213
===================================================================
214
--- config/locales/bs.yml	(revision 2632)
215
+++ config/locales/bs.yml	(working copy)
216
@@ -308,7 +308,7 @@
217
   setting_mail_handler_api_enabled: Omogući automatsku obradu ulaznih emailova
218
   setting_mail_handler_api_key: API ključ (obrada ulaznih mailova)
219
   setting_sequential_project_identifiers: Generiši identifikatore projekta sekvencijalno
220
-  setting_gravatar_enabled: 'Koristi "gravatar" korisničke ikone'
221
+  setting_avatars_enabled: 'Koristi "gravatar" korisničke ikone'
222
   setting_diff_max_lines_displayed: Maksimalan broj linija za prikaz razlika između dva fajla
223
   setting_file_max_size_displayed: Maksimalna veličina fajla kod prikaza razlika unutar fajla (inline)
224
   setting_repository_log_display_limit: Maksimalna veličina revizija prikazanih na log fajlu
225
Index: config/locales/de.yml
226
===================================================================
227
--- config/locales/de.yml	(revision 2632)
228
+++ config/locales/de.yml	(working copy)
229
@@ -305,7 +305,7 @@
230
   setting_mail_handler_api_enabled: Abruf eingehender E-Mails aktivieren
231
   setting_mail_handler_api_key: API-Schlüssel
232
   setting_sequential_project_identifiers: Fortlaufende Projektkennungen generieren
233
-  setting_gravatar_enabled: Gravatar Benutzerbilder benutzen
234
+  setting_avatars_enabled: Gravatar Benutzerbilder benutzen
235
   setting_diff_max_lines_displayed: Maximale Anzahl anzuzeigender Diff-Zeilen
236
   
237
   permission_edit_project: Projekt bearbeiten
238
Index: config/locales/nl.yml
239
===================================================================
240
--- config/locales/nl.yml	(revision 2632)
241
+++ config/locales/nl.yml	(working copy)
242
@@ -684,7 +684,7 @@
243
   setting_emails_footer: E-mails footer
244
   setting_enabled_scm: SCM ingeschakeld
245
   setting_feeds_limit: Feedinhoudlimiet
246
-  setting_gravatar_enabled: Gebruik Gravatar gebruikersiconen
247
+  setting_avatars_enabled: Gebruik Gravatar gebruikersiconen
248
   setting_host_name: Hostnaam
249
   setting_issue_list_default_columns: Standaardkolommen getoond op de lijst met issues
250
   setting_issues_export_limit: Limiet export issues
251
Index: config/locales/cs.yml
252
===================================================================
253
--- config/locales/cs.yml	(revision 2632)
254
+++ config/locales/cs.yml	(working copy)
255
@@ -761,7 +761,7 @@
256
   permission_rename_wiki_pages: Rename wiki pages
257
   permission_edit_time_entries: Edit time logs
258
   permission_edit_own_issue_notes: Edit own notes
259
-  setting_gravatar_enabled: Use Gravatar user icons
260
+  setting_avatars_enabled: Use Gravatar user icons
261
   label_example: Example
262
   text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
263
   permission_edit_own_messages: Edit own messages
264
Index: config/settings.yml
265
===================================================================
266
--- config/settings.yml	(revision 2632)
267
+++ config/settings.yml	(working copy)
268
@@ -146,7 +146,7 @@
269
   default: |-
270
     You have received this notification because you have either subscribed to it, or are involved in it.
271
     To change your notification preferences, please click here: http://hostname/my/account
272
-gravatar_enabled:  
273
+avatars_enabled:  
274
   default: 0
275
 openid:
276
   default: 0
277
Index: config/locales/fi.yml
278
===================================================================
279
--- config/locales/fi.yml	(revision 2632)
280
+++ config/locales/fi.yml	(working copy)
281
@@ -799,7 +799,7 @@
282
   permission_rename_wiki_pages: Uudelleennimeä wiki sivuja
283
   permission_edit_time_entries: Muokkaa aika lokeja
284
   permission_edit_own_issue_notes: Muokkaa omia muistiinpanoja
285
-  setting_gravatar_enabled: Käytä Gravatar käyttäjä ikoneita
286
+  setting_avatars_enabled: Käytä Gravatar käyttäjä ikoneita
287
   label_example: Esimerkki
288
   text_repository_usernames_mapping: "Valitse päivittääksesi Redmine käyttäjä jokaiseen käyttäjään joka löytyy tietovaraston lokista.\nKäyttäjät joilla on sama Redmine ja tietovaraston käyttäjänimi tai sähköpostiosoite, yhdistetään automaattisesti."
289
   permission_edit_own_messages: Muokkaa omia viestejä
290
Index: config/locales/hu.yml
291
===================================================================
292
--- config/locales/hu.yml	(revision 2632)
293
+++ config/locales/hu.yml	(working copy)
294
@@ -794,7 +794,7 @@
295
   permission_rename_wiki_pages: Wiki oldalak átnevezése
296
   permission_edit_time_entries: Időnaplók szerkesztése
297
   permission_edit_own_issue_notes: Saját jegyzetek szerkesztése
298
-  setting_gravatar_enabled: Felhasználói fényképek engedélyezése
299
+  setting_avatars_enabled: Felhasználói fényképek engedélyezése
300
   label_example: Példa
301
   text_repository_usernames_mapping: "Állítsd be a felhasználó összerendeléseket a Redmine, és a tároló logban található felhasználók között.\nAz azonos felhasználó nevek összerendelése automatikusan megtörténik."
302
   permission_edit_own_messages: Saját üzenetek szerkesztése
303
Index: config/locales/sr.yml
304
===================================================================
305
--- config/locales/sr.yml	(revision 2632)
306
+++ config/locales/sr.yml	(working copy)
307
@@ -783,7 +783,7 @@
308
   permission_rename_wiki_pages: Rename wiki pages
309
   permission_edit_time_entries: Edit time logs
310
   permission_edit_own_issue_notes: Edit own notes
311
-  setting_gravatar_enabled: Use Gravatar user icons
312
+  setting_avatars_enabled: Use Gravatar user icons
313
   permission_edit_own_messages: Edit own messages
314
   permission_delete_own_messages: Delete own messages
315
   text_repository_usernames_mapping: "Select or update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
316
Index: config/locales/he.yml
317
===================================================================
318
--- config/locales/he.yml	(revision 2632)
319
+++ config/locales/he.yml	(working copy)
320
@@ -771,7 +771,7 @@
321
   permission_rename_wiki_pages: שנה שם של דפי wiki
322
   permission_edit_time_entries: ערוך רישום זמנים
323
   permission_edit_own_issue_notes: Edit own notes
324
-  setting_gravatar_enabled: Use Gravatar user icons
325
+  setting_avatars_enabled: Use Gravatar user icons
326
   label_example: דוגמא
327
   text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
328
   permission_edit_own_messages: ערוך הודעות של עצמך
329
Index: config/locales/es.yml
330
===================================================================
331
--- config/locales/es.yml	(revision 2632)
332
+++ config/locales/es.yml	(working copy)
333
@@ -749,7 +749,7 @@
334
   setting_emails_footer: Pie de mensajes
335
   setting_enabled_scm: Activar SCM
336
   setting_feeds_limit: Límite de contenido para sindicación
337
-  setting_gravatar_enabled: Usar iconos de usuario (Gravatar)
338
+  setting_avatars_enabled: Usar iconos de usuario (Gravatar)
339
   setting_host_name: Nombre y ruta del servidor
340
   setting_issue_list_default_columns: Columnas por defecto para la lista de peticiones
341
   setting_issues_export_limit: Límite de exportación de peticiones
342
Index: config/locales/da.yml
343
===================================================================
344
--- config/locales/da.yml	(revision 2632)
345
+++ config/locales/da.yml	(working copy)
346
@@ -774,7 +774,7 @@
347
   label_and_its_subprojects: "{{value}} og dets underprojekter"
348
   permission_view_calendar: Se kalender
349
   button_create_and_continue: Opret og fortsæt
350
-  setting_gravatar_enabled: Anvend Gravatar bruger ikoner
351
+  setting_avatars_enabled: Anvend Gravatar bruger ikoner
352
   label_updated_time_by: "Opdateret af {{author}} for {{age}} siden"
353
   text_diff_truncated: '... Listen over forskelle er bleve afkortet fordi den overstiger den maksimale størrelse der kan vises.'
354
   text_user_wrote: "{{value}} skrev:"
355
Index: config/locales/sk.yml
356
===================================================================
357
--- config/locales/sk.yml	(revision 2632)
358
+++ config/locales/sk.yml	(working copy)
359
@@ -760,7 +760,7 @@
360
   permission_rename_wiki_pages: Premenovanie Wiki strániek
361
   permission_edit_time_entries: Editácia časových záznamov 
362
   permission_edit_own_issue_notes: Editácia vlastných poznámok úlohy
363
-  setting_gravatar_enabled: Použitie užívateľských Gravatar ikon
364
+  setting_avatars_enabled: Použitie užívateľských Gravatar ikon
365
   permission_edit_own_messages: Úprava vlastných správ
366
   permission_delete_own_messages: Mazanie vlastných správ
367
   text_repository_usernames_mapping: "Vyberte alebo doplňte užívateľov systému Redmine, ktorí majú byť namapovaní k užívateľským menám, nájdeným v logu repository.\nUžívatelia s rovnakým prihlasovacím menom alebo emailom v systéme Redmine a repository sú mapovaní automaticky."
368
Index: config/locales/th.yml
369
===================================================================
370
--- config/locales/th.yml	(revision 2632)
371
+++ config/locales/th.yml	(working copy)
372
@@ -759,7 +759,7 @@
373
   permission_rename_wiki_pages: Rename wiki pages
374
   permission_edit_time_entries: Edit time logs
375
   permission_edit_own_issue_notes: Edit own notes
376
-  setting_gravatar_enabled: Use Gravatar user icons
377
+  setting_avatars_enabled: Use Gravatar user icons
378
   label_example: Example
379
   text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
380
   permission_edit_own_messages: Edit own messages
381
Index: config/locales/ca.yml
382
===================================================================
383
--- config/locales/ca.yml	(revision 2632)
384
+++ config/locales/ca.yml	(working copy)
385
@@ -280,7 +280,7 @@
386
   setting_mail_handler_api_enabled: "Habilita el WS per correus electrònics d'entrada"
387
   setting_mail_handler_api_key: Clau API
388
   setting_sequential_project_identifiers: Genera identificadors de projecte seqüencials
389
-  setting_gravatar_enabled: "Utilitza les icones d'usuari Gravatar"
390
+  setting_avatars_enabled: "Utilitza les icones d'usuari Gravatar"
391
   setting_diff_max_lines_displayed: Número màxim de línies amb diferències mostrades
392
   setting_file_max_size_displayed: Mida màxima dels fitxers de text mostrats en línia
393
   setting_repository_log_display_limit: Número màxim de revisions que es mostren al registre de fitxers
394
Index: config/locales/lt.yml
395
===================================================================
396
--- config/locales/lt.yml	(revision 2632)
397
+++ config/locales/lt.yml	(working copy)
398
@@ -315,7 +315,7 @@
399
   setting_mail_handler_api_enabled: Įgalinti WS įeinantiems laiškams
400
   setting_mail_handler_api_key: API raktas
401
   setting_sequential_project_identifiers: Generuoti nuoseklus projekto identifikatorius
402
-  setting_gravatar_enabled: Naudoti Gravatar vartotojo ikonkės
403
+  setting_avatars_enabled: Naudoti Gravatar vartotojo ikonkės
404
   setting_diff_max_lines_displayed: Maksimalus rodomas eilučiu skaičius diff\'e
405
   
406
   permission_edit_project: Edit project
407
Index: config/locales/pl.yml
408
===================================================================
409
--- config/locales/pl.yml	(revision 2632)
410
+++ config/locales/pl.yml	(working copy)
411
@@ -728,7 +728,7 @@
412
   setting_emails_footer: Stopka e-mail
413
   setting_enabled_scm: Dostępny SCM
414
   setting_feeds_limit: Limit danych RSS
415
-  setting_gravatar_enabled: Używaj ikon użytkowników Gravatar
416
+  setting_avatars_enabled: Używaj ikon użytkowników Gravatar
417
   setting_host_name: Nazwa hosta i ścieżka
418
   setting_issue_list_default_columns: Domyślne kolumny wiświetlane na liście zagadnień
419
   setting_issues_export_limit: Limit eksportu zagadnień
420
Index: config/locales/tr.yml
421
===================================================================
422
--- config/locales/tr.yml	(revision 2632)
423
+++ config/locales/tr.yml	(working copy)
424
@@ -795,7 +795,7 @@
425
   permission_rename_wiki_pages: Rename wiki pages
426
   permission_edit_time_entries: Edit time logs
427
   permission_edit_own_issue_notes: Edit own notes
428
-  setting_gravatar_enabled: Use Gravatar user icons
429
+  setting_avatars_enabled: Use Gravatar user icons
430
   label_example: Example
431
   text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
432
   permission_edit_own_messages: Edit own messages
433
Index: config/locales/pt-BR.yml
434
===================================================================
435
--- config/locales/pt-BR.yml	(revision 2632)
436
+++ config/locales/pt-BR.yml	(working copy)
437
@@ -794,7 +794,7 @@
438
   permission_rename_wiki_pages: Renomear páginas wiki
439
   permission_edit_time_entries: Editar tempo gasto
440
   permission_edit_own_issue_notes: Editar próprias notas
441
-  setting_gravatar_enabled: Usar ícones do Gravatar
442
+  setting_avatars_enabled: Usar ícones do Gravatar
443
   label_example: Exemplo
444
   text_repository_usernames_mapping: "Seleciona ou atualiza os usuários do Redmine mapeando para cada usuário encontrado no log do repositório.\nUsuários com o mesmo login ou email no Redmine e no repositório serão mapeados automaticamente."
445
   permission_edit_own_messages: Editar próprias mensagens
446
Index: app/helpers/application_helper.rb
447
===================================================================
448
--- app/helpers/application_helper.rb	(revision 2632)
449
+++ app/helpers/application_helper.rb	(working copy)
450
@@ -23,7 +23,6 @@
451
 module ApplicationHelper
452
   include Redmine::WikiFormatting::Macros::Definitions
453
   include Redmine::I18n
454
-  include GravatarHelper::PublicMethods
455
 
456
   extend Forwardable
457
   def_delegators :wiki_helper, :wikitoolbar_for, :heads_for_wiki_formatter
458
@@ -626,14 +625,8 @@
459
   # Returns the avatar image tag for the given +user+ if avatars are enabled
460
   # +user+ can be a User or a string that will be scanned for an email address (eg. 'joe <joe@foo.bar>')
461
   def avatar(user, options = { })
462
-    if Setting.gravatar_enabled?
463
-      email = nil
464
-      if user.respond_to?(:mail)
465
-        email = user.mail
466
-      elsif user.to_s =~ %r{<(.+?)>}
467
-        email = $1
468
-      end
469
-      return gravatar(email.to_s.downcase, options) unless email.blank? rescue nil
470
+    if Setting.avatars_enabled?
471
+      return call_hook(:render_avatar, :user => user) rescue nil
472
     end
473
   end
474
 
475
Index: config/locales/ko.yml
476
===================================================================
477
--- config/locales/ko.yml	(revision 2632)
478
+++ config/locales/ko.yml	(working copy)
479
@@ -818,7 +818,7 @@
480
   permission_rename_wiki_pages: 위키 페이지 이름변경
481
   permission_edit_time_entries: 시간기록 편집
482
   permission_edit_own_issue_notes: 내 덧글 편집
483
-  setting_gravatar_enabled: 그라바타 사용자 아이콘 쓰기
484
+  setting_avatars_enabled: 그라바타 사용자 아이콘 쓰기
485
   label_example: 예
486
   text_repository_usernames_mapping: "저장소 로그에서 발견된 각 사용자에 레드마인 사용자를 업데이트할때 선택합니다.\n레드마인과 저장소의 이름이나 이메일이 같은 사용자가 자동으로 연결됩니다."
487
   permission_edit_own_messages: 자기 메시지 편집
488
Index: config/locales/uk.yml
489
===================================================================
490
--- config/locales/uk.yml	(revision 2632)
491
+++ config/locales/uk.yml	(working copy)
492
@@ -758,7 +758,7 @@
493
   permission_rename_wiki_pages: Rename wiki pages
494
   permission_edit_time_entries: Edit time logs
495
   permission_edit_own_issue_notes: Edit own notes
496
-  setting_gravatar_enabled: Use Gravatar user icons
497
+  setting_avatars_enabled: Use Gravatar user icons
498
   label_example: Example
499
   text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
500
   permission_edit_own_messages: Edit own messages
501
Index: config/locales/zh.yml
502
===================================================================
503
--- config/locales/zh.yml	(revision 2632)
504
+++ config/locales/zh.yml	(working copy)
505
@@ -312,7 +312,7 @@
506
   setting_mail_handler_api_enabled: 启用用于接收邮件的服务
507
   setting_mail_handler_api_key: API key
508
   setting_sequential_project_identifiers: 顺序产生项目标识
509
-  setting_gravatar_enabled: 使用Gravatar用户头像
510
+  setting_avatars_enabled: 使用Gravatar用户头像
511
   setting_diff_max_lines_displayed: 查看差别页面上显示的最大行数
512
   setting_file_max_size_displayed: 允许直接显示的最大文本文件
513
   setting_repository_log_display_limit: 在文件变更记录页面上显示的最大修订版本数量
514
Index: config/locales/ro.yml
515
===================================================================
516
--- config/locales/ro.yml	(revision 2632)
517
+++ config/locales/ro.yml	(working copy)
518
@@ -278,7 +278,7 @@
519
   setting_mail_handler_api_enabled: Activeaza WS pentru e-mail-uri intrate
520
   setting_mail_handler_api_key: cheie API
521
   setting_sequential_project_identifiers: Genereaza secvential identificatoarele de proiect
522
-  setting_gravatar_enabled: Foloseste poze Gravatar pentru utilizatori
523
+  setting_avatars_enabled: Foloseste poze Gravatar pentru utilizatori
524
   setting_diff_max_lines_displayed: Numar maxim de linii de diferenta afisate
525
   setting_file_max_size_displayed: Numar maxim de fisiere text afisate in pagina (inline)
526
   setting_repository_log_display_limit: Numar maxim de revizii afisate in istoricul fisierului
527
Index: test/unit/helpers/application_helper_test.rb
528
===================================================================
529
--- test/unit/helpers/application_helper_test.rb	(revision 2632)
530
+++ test/unit/helpers/application_helper_test.rb	(working copy)
531
@@ -408,14 +408,14 @@
532
   
533
   def test_avatar
534
     # turn on avatars
535
-    Setting.gravatar_enabled = '1'
536
+    Setting.avatars_enabled = '1'
537
     assert avatar(User.find_by_mail('jsmith@somenet.foo')).include?(Digest::MD5.hexdigest('jsmith@somenet.foo'))
538
     assert avatar('jsmith <jsmith@somenet.foo>').include?(Digest::MD5.hexdigest('jsmith@somenet.foo'))
539
     assert_nil avatar('jsmith')
540
     assert_nil avatar(nil)
541
     
542
     # turn off avatars
543
-    Setting.gravatar_enabled = '0'
544
+    Setting.avatars_enabled = '0'
545
     assert_nil avatar(User.find_by_mail('jsmith@somenet.foo'))
546
   end
547
 end
548
Index: config/locales/vi.yml
549
===================================================================
550
--- config/locales/vi.yml	(revision 2632)
551
+++ config/locales/vi.yml	(working copy)
552
@@ -781,7 +781,7 @@
553
   enumeration_activities: Hoạt động (theo dõi thời gian)
554
   
555
   setting_plain_text_mail: mail dạng text đơn giản (không dùng HTML)
556
-  setting_gravatar_enabled: Dùng biểu tượng Gravatar
557
+  setting_avatars_enabled: Dùng biểu tượng Gravatar
558
   permission_edit_project: Chỉnh dự án
559
   permission_select_project_modules: Chọn mô-đun
560
   permission_manage_members: Quản lý thành viên
561
Index: config/locales/sl.yml
562
===================================================================
563
--- config/locales/sl.yml	(revision 2632)
564
+++ config/locales/sl.yml	(working copy)
565
@@ -274,7 +274,7 @@
566
   setting_mail_handler_api_enabled: Omogoči WS za prihajajočo e-pošto
567
   setting_mail_handler_api_key: API ključ
568
   setting_sequential_project_identifiers: Generiraj projektne identifikatorje sekvenčno
569
-  setting_gravatar_enabled: Uporabljaj Gravatar ikone
570
+  setting_avatars_enabled: Uporabljaj Gravatar ikone
571
   setting_diff_max_lines_displayed: Maksimalno število prikazanih vrstic različnosti
572
   
573
   permission_edit_project: Uredi projekt
574
Index: config/locales/en.yml
575
===================================================================
576
--- config/locales/en.yml	(revision 2632)
577
+++ config/locales/en.yml	(working copy)
578
@@ -280,7 +280,7 @@
579
   setting_mail_handler_api_enabled: Enable WS for incoming emails
580
   setting_mail_handler_api_key: API key
581
   setting_sequential_project_identifiers: Generate sequential project identifiers
582
-  setting_gravatar_enabled: Use Gravatar user icons
583
+  setting_avatars_enabled: Use Gravatar user icons
584
   setting_diff_max_lines_displayed: Max number of diff lines displayed
585
   setting_file_max_size_displayed: Max size of text files displayed inline
586
   setting_repository_log_display_limit: Maximum number of revisions displayed on file log