浏览代码

#202 rename last_author to last_modification_author

Alexis CLEMENT 8 年前
父节点
当前提交
0dea83ab9f

+ 2 - 2
tracim/tracim/model/serializers.py 查看文件

392
             label=data_container.label,
392
             label=data_container.label,
393
             icon=ContentType.get_icon(content.type),
393
             icon=ContentType.get_icon(content.type),
394
             owner=context.toDict(content.first_revision.owner),
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
             status=context.toDict(data_container.get_status()),
396
             status=context.toDict(data_container.get_status()),
397
             links=[],
397
             links=[],
398
             revision_nb = len(content.revisions),
398
             revision_nb = len(content.revisions),
464
             label = item.label,
464
             label = item.label,
465
             links=[],
465
             links=[],
466
             owner = context.toDict(item.owner),
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
             parent = context.toDict(item.parent),
468
             parent = context.toDict(item.parent),
469
             selected_revision = 'latest',
469
             selected_revision = 'latest',
470
             status = context.toDict(item.get_status()),
470
             status = context.toDict(item.get_status()),

+ 2 - 2
tracim/tracim/templates/file/getone.mak 查看文件

52
             <div style="margin: -1.5em auto -1.5em auto;" class="tracim-less-visible">
52
             <div style="margin: -1.5em auto -1.5em auto;" class="tracim-less-visible">
53
                 <% created_localized = h.get_with_timezone(result.file.created) %>
53
                 <% created_localized = h.get_with_timezone(result.file.created) %>
54
                 <% updated_localized = h.get_with_timezone(result.file.updated) %>
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
               <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}
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
                   % if result.file.revision_nb > 1:
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
                   % endif
59
                   % endif
60
               </p>
60
               </p>
61
 
61
 

+ 2 - 2
tracim/tracim/templates/page/getone.mak 查看文件

50
             <div style="margin: -1.5em auto -1.5em auto;" class="tracim-less-visible">
50
             <div style="margin: -1.5em auto -1.5em auto;" class="tracim-less-visible">
51
                 <% created_localized = h.get_with_timezone(result.page.created) %>
51
                 <% created_localized = h.get_with_timezone(result.page.created) %>
52
                 <% updated_localized = h.get_with_timezone(result.page.updated) %>
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
                 <p>
54
                 <p>
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}
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
                     % if result.page.revision_nb > 1:
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
                     % endif
58
                     % endif
59
                 </p>
59
                 </p>
60
             </div>
60
             </div>

+ 2 - 2
tracim/tracim/templates/thread/getone.mak 查看文件

52
             <div style="margin: -1.5em auto -1.5em auto;" class="tracim-less-visible">
52
             <div style="margin: -1.5em auto -1.5em auto;" class="tracim-less-visible">
53
                 <% created_localized = h.get_with_timezone(result.thread.created) %>
53
                 <% created_localized = h.get_with_timezone(result.thread.created) %>
54
                 <% updated_localized = h.get_with_timezone(result.thread.updated) %>
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
                 <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}
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
                     % if result.thread.revision_nb > 1:
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
                     % endif
59
                     % endif
60
                 </p>
60
                 </p>
61
 
61