From 0449e6c2a2564679ecf96c93601ebbd6761c0287 Mon Sep 17 00:00:00 2001 From: Eric Mc Sween Date: Tue, 2 Nov 2021 09:01:14 -0400 Subject: [PATCH] Merge pull request #5645 from overleaf/em-history-origin Identify resyncs in the history panel GitOrigin-RevId: 5c96f0f1be68bfb05954457a7d5b72b4cec6c607 --- .../views/project/editor/history/entriesListV2.pug | 14 +++++++++++++- services/web/locales/en.json | 3 ++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/services/web/app/views/project/editor/history/entriesListV2.pug b/services/web/app/views/project/editor/history/entriesListV2.pug index 300bfde368..506d2c1097 100644 --- a/services/web/app/views/project/editor/history/entriesListV2.pug +++ b/services/web/app/views/project/editor/history/entriesListV2.pug @@ -176,7 +176,19 @@ script(type="text/ng-template", id="historyEntryTpl") ng-if="::update_user == null" ng-style="$ctrl.getUserCSSStyle(update_user);" ) #{translate("anonymous")} - li.history-entry-metadata-user(ng-if="::$ctrl.entry.meta.users.length == 0") + li.history-entry-metadata-user( + ng-if="::$ctrl.entry.meta.origin" + ng-switch on="::$ctrl.entry.meta.origin.kind" + ) + span.name( + ng-switch-when="history-resync" + ng-style="$ctrl.getUserCSSStyle()" + ) #{translate("history_resync")} + span.name( + ng-switch-default + ng-style="$ctrl.getUserCSSStyle()" + ) #{translate("anonymous")} + li.history-entry-metadata-user(ng-if="::!$ctrl.entry.meta.origin && $ctrl.entry.meta.users.length == 0") span.name( ng-style="$ctrl.getUserCSSStyle();" ) #{translate("anonymous")} diff --git a/services/web/locales/en.json b/services/web/locales/en.json index 200d62bd25..943c465b17 100644 --- a/services/web/locales/en.json +++ b/services/web/locales/en.json @@ -1522,5 +1522,6 @@ "showing_x_results_of_total": "Showing __x__ results of __total__", "showing_x_results": "Showing __x__ results", "showing_1_result": "Showing 1 result", - "showing_1_result_of_total": "Showing 1 result of __total__" + "showing_1_result_of_total": "Showing 1 result of __total__", + "history_resync": "History Resync" }