Преглед изворни кода

#202 rename last_author to last_modification_author

Alexis CLEMENT пре 8 година
родитељ
комит
0dea83ab9f

+ 2 - 2
tracim/tracim/model/serializers.py Прегледај датотеку

@@ -392,7 +392,7 @@ def serialize_node_for_page(content: Content, context: Context):
392 392
             label=data_container.label,
393 393
             icon=ContentType.get_icon(content.type),
394 394
             owner=context.toDict(content.first_revision.owner),
395
-            last_author=context.toDict(content.last_revision.owner),
395
+            last_modification_author=context.toDict(content.last_revision.owner),
396 396
             status=context.toDict(data_container.get_status()),
397 397
             links=[],
398 398
             revision_nb = len(content.revisions),
@@ -464,7 +464,7 @@ def serialize_node_for_thread(item: Content, context: Context):
464 464
             label = item.label,
465 465
             links=[],
466 466
             owner = context.toDict(item.owner),
467
-            last_author=context.toDict(item.last_revision.owner),
467
+            last_modification_author=context.toDict(item.last_revision.owner),
468 468
             parent = context.toDict(item.parent),
469 469
             selected_revision = 'latest',
470 470
             status = context.toDict(item.get_status()),

+ 2 - 2
tracim/tracim/templates/file/getone.mak Прегледај датотеку

@@ -52,10 +52,10 @@
52 52
             <div style="margin: -1.5em auto -1.5em auto;" class="tracim-less-visible">
53 53
                 <% created_localized = h.get_with_timezone(result.file.created) %>
54 54
                 <% updated_localized = h.get_with_timezone(result.file.updated) %>
55
-                <% last_author = result.file.last_author.name %>
55
+                <% last_modification_author = result.file.last_modification_author.name %>
56 56
               <p>${_('file created on {date} at {time} by <b>{author}</b>').format(date=h.date(created_localized), time=h.time(created_localized), author=result.file.owner.name)|n}
57 57
                   % if result.file.revision_nb > 1:
58
-                      ${_(' (last modification on {update_date} at {update_time} by {last_author})').format(update_date=h.update_date(updated_localized), update_time=h.update_time(updated_localized), last_author = last_author)|n}
58
+                      ${_(' (last modification on {update_date} at {update_time} by {last_modification_author})').format(update_date=h.update_date(updated_localized), update_time=h.update_time(updated_localized), last_modification_author = last_modification_author)|n}
59 59
                   % endif
60 60
               </p>
61 61
 

+ 2 - 2
tracim/tracim/templates/page/getone.mak Прегледај датотеку

@@ -50,11 +50,11 @@
50 50
             <div style="margin: -1.5em auto -1.5em auto;" class="tracim-less-visible">
51 51
                 <% created_localized = h.get_with_timezone(result.page.created) %>
52 52
                 <% updated_localized = h.get_with_timezone(result.page.updated) %>
53
-                <% last_author = result.page.last_author.name %>
53
+                <% last_modification_author = result.page.last_modification_author.name %>
54 54
                 <p>
55 55
                     ${_('page created on {date} at {time} by <b>{author}</b> ').format(date=h.date(created_localized), time=h.time(created_localized), author=result.page.owner.name)|n}
56 56
                     % if result.page.revision_nb > 1:
57
-                      ${_('(last modification on {update_date} at {update_time} by {last_author})').format(update_date=h.update_date(updated_localized), update_time=h.update_time(updated_localized), last_author = last_author)|n}
57
+                      ${_('(last modification on {update_date} at {update_time} by {last_modification_author})').format(update_date=h.update_date(updated_localized), update_time=h.update_time(updated_localized), last_modification_author = last_modification_author)|n}
58 58
                     % endif
59 59
                 </p>
60 60
             </div>

+ 2 - 2
tracim/tracim/templates/thread/getone.mak Прегледај датотеку

@@ -52,10 +52,10 @@
52 52
             <div style="margin: -1.5em auto -1.5em auto;" class="tracim-less-visible">
53 53
                 <% created_localized = h.get_with_timezone(result.thread.created) %>
54 54
                 <% updated_localized = h.get_with_timezone(result.thread.updated) %>
55
-                <% last_author = result.thread.last_author.name %>
55
+                <% last_modification_author = result.thread.last_modification_author.name %>
56 56
                 <p>${_('page created on {date} at {time} by <b>{author}</b>').format(date=h.date(created_localized), time=h.time(created_localized), author=result.thread.owner.name)|n}
57 57
                     % if result.thread.revision_nb > 1:
58
-                      ${_(' (last modification on {update_date} at {update_time} by {last_author})').format(update_date=h.update_date(updated_localized), update_time=h.update_time(updated_localized), last_author = last_author)|n}
58
+                      ${_(' (last modification on {update_date} at {update_time} by {last_modification_author})').format(update_date=h.update_date(updated_localized), update_time=h.update_time(updated_localized), last_modification_author = last_modification_author)|n}
59 59
                     % endif
60 60
                 </p>
61 61