From f180b258503802351d07e4925b45f22dba98d03f Mon Sep 17 00:00:00 2001 From: James Allen Date: Fri, 17 Feb 2017 16:28:53 +0100 Subject: [PATCH] Convert track changes text to translation strings --- .../web/app/views/project/editor/header.pug | 2 +- .../app/views/project/editor/review-panel.pug | 80 +++++++++---------- services/web/package.json | 4 +- 3 files changed, 40 insertions(+), 46 deletions(-) diff --git a/services/web/app/views/project/editor/header.pug b/services/web/app/views/project/editor/header.pug index 2817efa814..fe3732de97 100644 --- a/services/web/app/views/project/editor/header.pug +++ b/services/web/app/views/project/editor/header.pug @@ -93,7 +93,7 @@ header.toolbar.toolbar-header.toolbar-with-labels( ) i.review-icon p.toolbar-label - | Review + | #{translate("review")} span(style="vertical-align: 20%; margin-left: 4px; padding: 2px 4px;").beta-feature-badge a.btn.btn-full-height( href, diff --git a/services/web/app/views/project/editor/review-panel.pug b/services/web/app/views/project/editor/review-panel.pug index 93ff664eed..5b68fd1bfc 100644 --- a/services/web/app/views/project/editor/review-panel.pug +++ b/services/web/app/views/project/editor/review-panel.pug @@ -4,9 +4,7 @@ ng-if="editor.wantTrackChanges" ng-click="toggleReviewPanel();" ng-class="{ 'rp-track-changes-indicator-on-dark' : darkTheme }" - ) Track changes is - strong on - + ) !{translate("track_changes_is_on")} .review-panel-toolbar resolved-comments-dropdown( class="rp-flex-block" @@ -21,10 +19,8 @@ permissions="permissions" ) span.review-panel-toolbar-label(ng-if="permissions.write") - span(ng-click="toggleTrackChanges(true)", ng-if="editor.wantTrackChanges === false") Track Changes is - strong off - span(ng-click="toggleTrackChanges(false)", ng-if="editor.wantTrackChanges === true") Track Changes is - strong on + span(ng-click="toggleTrackChanges(true)", ng-if="editor.wantTrackChanges === false") !{translate("track_changes_is_off")} + span(ng-click="toggleTrackChanges(false)", ng-if="editor.wantTrackChanges === true") !{translate("track_changes_is_on")} review-panel-toggle( ng-if="editor.wantTrackChanges == editor.trackChanges" ng-model="editor.wantTrackChanges" @@ -33,10 +29,8 @@ on-disabled-click="openTrackChangesUpgradeModal" ) span.review-panel-toolbar-label.review-panel-toolbar-label-disabled(ng-if="!permissions.write") - span(ng-if="editor.wantTrackChanges === false") Track Changes is - strong off - span(ng-if="editor.wantTrackChanges === true") Track Changes is - strong on + span(ng-if="editor.wantTrackChanges === false") !{translate("track_changes_is_off")} + span(ng-if="editor.wantTrackChanges === true") !{translate("track_changes_is_on")} span.review-panel-toolbar-spinner(ng-if="editor.wantTrackChanges != editor.trackChanges") i.fa.fa-spin.fa-spinner @@ -127,14 +121,14 @@ ng-class="{ 'rp-nav-item-active' : reviewPanel.subView === SubViews.CUR_FILE }" ) i.fa.fa-file-text-o - span.rp-nav-label Current file + span.rp-nav-label #{translate("current_file")} a.rp-nav-item( href ng-click="setSubView(SubViews.OVERVIEW);" ng-class="{ 'rp-nav-item-active' : reviewPanel.subView === SubViews.OVERVIEW }" ) i.fa.fa-list - span.rp-nav-label Overview + span.rp-nav-label #{translate("overview")} script(type='text/ng-template', id='changeEntryTemplate') @@ -158,30 +152,30 @@ script(type='text/ng-template', id='changeEntryTemplate') i.rp-icon-delete(ng-switch-when="delete") .rp-entry-details .rp-entry-description(ng-switch="entry.type") - span(ng-switch-when="insert") Added  + span(ng-switch-when="insert") #{translate("tracked_change_added")}  ins.rp-content-highlight {{ entry.content | limitTo:(isCollapsed ? contentLimit : entry.content.length) }} a.rp-collapse-toggle( href ng-if="needsCollapsing" ng-click="toggleCollapse();" - ) {{ isCollapsed ? '... (show all)' : ' (show less)' }} - span(ng-switch-when="delete") Deleted  + ) {{ isCollapsed ? '... (#{translate("show_all")})' : ' (#{translate("show_less")})' }} + span(ng-switch-when="delete") #{translate("tracked_change_deleted")}  del.rp-content-highlight {{ entry.content | limitTo:(isCollapsed ? contentLimit : entry.content.length) }} a.rp-collapse-toggle( href ng-if="needsCollapsing" ng-click="toggleCollapse();" - ) {{ isCollapsed ? '... (show all)' : ' (show less)' }} + ) {{ isCollapsed ? '... (#{translate("show_all")})' : ' (#{translate("show_less")})' }} .rp-entry-metadata | {{ entry.metadata.ts | date : 'MMM d, y h:mm a' }} •  span.rp-entry-user(style="color: hsl({{ user.hue }}, 70%, 40%);") {{ user.name }} .rp-entry-actions(ng-if="permissions.write") a.rp-entry-button(href, ng-click="onReject();") i.fa.fa-times - |  Reject + |  #{translate("reject")} a.rp-entry-button(href, ng-click="onAccept();") i.fa.fa-check - |  Accept + |  #{translate("accept")} script(type='text/ng-template', id='commentEntryTemplate') .rp-comment-wrapper( @@ -198,7 +192,7 @@ script(type='text/ng-template', id='commentEntryTemplate') ) .rp-loading(ng-if="!threads[entry.thread_id].submitting && (!threads[entry.thread_id] || threads[entry.thread_id].messages.length == 0)") - | No comments + | #{translate("no_comments")} .rp-comment-loaded .rp-comment( ng-repeat="comment in threads[entry.thread_id].messages track by comment.id" @@ -222,16 +216,16 @@ script(type='text/ng-template', id='commentEntryTemplate') span(ng-if="!comment.deleting") {{ comment.timestamp | date : 'MMM d, y h:mm a' }} span.rp-comment-actions(ng-if="comment.user.isSelf && !comment.deleting") |  •  - a(href, ng-click="startEditing(comment)") Edit + a(href, ng-click="startEditing(comment)") #{translate("edit")} span(ng-if="threads[entry.thread_id].messages.length > 1") |  •  - a(href, ng-click="confirmDelete(comment)") Delete + a(href, ng-click="confirmDelete(comment)") #{translate("delete")} span.rp-confim-delete(ng-if="comment.user.isSelf && comment.deleting") - | Are you sure? + | #{translate("are_you_sure")} | •  - a(href, ng-click="doDelete(comment)") Delete + a(href, ng-click="doDelete(comment)") #{translate("delete")} |  •  - a(href, ng-click="cancelDelete(comment)") Cancel + a(href, ng-click="cancelDelete(comment)") #{translate("cancel")} .rp-loading(ng-if="threads[entry.thread_id].submitting") i.fa.fa-spinner.fa-spin @@ -249,20 +243,20 @@ script(type='text/ng-template', id='commentEntryTemplate') ng-if="permissions.comment && permissions.write" ) i.fa.fa-inbox - |  Resolve + |  #{translate("resolve")} button.rp-entry-button( ng-click="onReply();" ng-if="permissions.comment" ng-disabled="!entry.replyContent.length" ) i.fa.fa-reply - |  Reply + |  #{translate("reply")} script(type='text/ng-template', id='resolvedCommentEntryTemplate') .rp-resolved-comment div .rp-resolved-comment-context - | Quoted text on  + | #{translate("quoted_text_in")}  span.rp-resolved-comment-context-file {{ thread.docName }} p.rp-resolved-comment-context-quote span {{ thread.content | limitTo:(isCollapsed ? contentLimit : thread.content.length)}} @@ -270,7 +264,7 @@ script(type='text/ng-template', id='resolvedCommentEntryTemplate') href ng-if="needsCollapsing" ng-click="toggleCollapse();" - )  {{ isCollapsed ? '... (show all)' : ' (show less)' }} + )  {{ isCollapsed ? '... (#{translate("show_all")})' : ' (#{translate("show_less")})' }} .rp-comment( ng-repeat="comment in thread.messages track by comment.id" ) @@ -287,7 +281,7 @@ script(type='text/ng-template', id='resolvedCommentEntryTemplate') span.rp-entry-user( style="color: hsl({{ thread.resolved_by_user.hue }}, 70%, 40%);" ) {{ thread.resolved_by_user.name }}:  - | Marked as resolved. + | #{translate("mark_as_resolveded")}. .rp-entry-metadata | {{ thread.resolved_at | date : 'MMM d, y h:mm a' }} @@ -296,12 +290,12 @@ script(type='text/ng-template', id='resolvedCommentEntryTemplate') href ng-click="onUnresolve({ 'threadId': thread.threadId });" ) - |  Re-open + |  #{translate("reopen")} a.rp-entry-button( href ng-click="onDelete({ 'entryId': thread.entryId, 'docId': thread.docId, 'threadId': thread.threadId });" ) - |  Delete + |  #{translate("delete")} script(type='text/ng-template', id='addCommentEntryTemplate') @@ -324,7 +318,7 @@ script(type='text/ng-template', id='addCommentEntryTemplate') ng-click="startNewComment();" ) i.fa.fa-comment - |  Add comment + |  #{translate("add_comment")} div(ng-if="state.isAdding") .rp-new-comment textarea.rp-comment-input( @@ -340,13 +334,13 @@ script(type='text/ng-template', id='addCommentEntryTemplate') ng-click="cancelNewComment();" ) i.fa.fa-times - |  Cancel + |  #{translate("cancel")} button.rp-entry-button( ng-click="submitNewComment()" ng-disabled="!state.content.length" ) i.fa.fa-comment - |  Comment + |  #{translate("cancel")} script(type='text/ng-template', id='resolvedCommentsDropdownTemplate') .resolved-comments @@ -378,7 +372,7 @@ script(type='text/ng-template', id='resolvedCommentsDropdownTemplate') permissions="permissions" ) .rp-loading(ng-if="!resolvedComments.length") - | No resolved threads. + | #{translate("no_resolved_threads")}. script(type="text/ng-template", id="trackChangesUpgradeModalTemplate") .modal-header @@ -387,14 +381,14 @@ script(type="text/ng-template", id="trackChangesUpgradeModalTemplate") data-dismiss="modal" ng-click="cancel()" ) × - h3 Upgrade to Track Changes + h3 #{translate("upgrade_to_track_changes")} .modal-body .teaser-video-container video.teaser-video(autoplay, loop) source(src="/img/teasers/track-changes/teaser-track-changes.mp4", type="video/mp4") img(src="/img/teasers/track-changes/teaser-track-changes.gif") - h4.teaser-title See changes in your documents, live + h4.teaser-title #{translate("see_changes_in_your_documents_live")} p.small(ng-show="startedFreeTrial") | #{translate("refresh_page_after_starting_free_trial")} @@ -404,15 +398,15 @@ script(type="text/ng-template", id="trackChangesUpgradeModalTemplate") ul.list-unstyled li i.fa.fa-check   - | Track any change, in real-time + | #{translate("track_any_change_in_real_time")} li i.fa.fa-check   - | Review your peers' work + | #{translate("review_your_peers_work")} li i.fa.fa-check   - | Accept or reject each change individually + | #{translate("accept_or_reject_each_changes_individually")} .row.text-center(ng-controller="FreeTrialModalController") @@ -420,8 +414,8 @@ script(type="text/ng-template", id="trackChangesUpgradeModalTemplate") href ng-click="startFreeTrial('real-time-track-changes')" ng-show="project.owner._id == user.id" - ) Try it for free - p(ng-show="project.owner._id != user.id"): strong Please ask the project owner to upgrade to use track changes + ) #{translate("try_it_for_free")} + p(ng-show="project.owner._id != user.id"): strong #{translate("please_ask_the_project_owner_to_upgrade_to_track_changes")} .modal-footer() button.btn.btn-default( diff --git a/services/web/package.json b/services/web/package.json index 100b55f75c..1134b9433c 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -59,6 +59,7 @@ "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.0.0", "sixpack-client": "^1.0.0", "temp": "^0.8.3", + "translations-sharelatex": "git+https://github.com/sharelatex/translations-sharelatex.git#master", "underscore": "1.6.0", "v8-profiler": "^5.2.3", "xml2js": "0.2.0", @@ -93,7 +94,6 @@ "grunt-sed": "^0.1.1", "sandboxed-module": "0.2.0", "sinon": "", - "timekeeper": "", - "translations-sharelatex": "git+https://github.com/sharelatex/translations-sharelatex.git#master" + "timekeeper": "" } }