i18n continuation

gui/app/components/document/page-heading.js

@@ -79,8 +79,7 @@ export default Component.extend(Notifier, ModalMixin, {
 		this._super(...arguments);
 
 		let pageId = this.get('page.id');
-		let url = window.location.protocol + '//' + this.get('appMeta.appHost') +
+		let url = window.location.protocol + '//' + this.get('appMeta.appHost') + this.get('router').generate('document.index', {queryParams: {currentPageId: pageId}});
-			this.get('router').generate('document.index', {queryParams: {currentPageId: pageId}});
 		let self = this;
 
 		let clip = new ClipboardJS('#page-copy-link-' + pageId, {

gui/app/templates/components/document/document-toolbar.hbs

@@ -19,7 +19,7 @@
 		{{/if}}
 	{{/if}}
 
-	{{#ui/ui-toolbar-dropdown label="Content" arrow=true}}
+	{{#ui/ui-toolbar-dropdown label=(localize 'content') arrow=true}}
 		{{#attach-popover class="ember-attacher-popper" hideOn="click clickout" showOn="click" isShown=false}}
 			<ul class="menu">
 				{{#if pinState.isPinned}}
@@ -49,7 +49,7 @@
 	{{/ui/ui-toolbar-dropdown}}
 
 	{{#if (or showActivity showRevisions)}}
-		{{#ui/ui-toolbar-dropdown label="History" arrow=true}}
+		{{#ui/ui-toolbar-dropdown label=(localize 'history') arrow=true}}
 			{{#attach-popover class="ember-attacher-popper" hideOn="click clickout" showOn="click" isShown=false}}
 				<ul class="menu">
 					{{#if showActivity}}
@@ -77,7 +77,6 @@
 					<div class="form-group">
 						<label for="new-template-name">{{localize 'name'}}</label>
 						{{input id="new-template-name" value=saveTemplate.name type="text" class="form-control mousetrap" placeholder=""}}
-						<small class="form-text text-muted">Good template name conveys document type</small>
 					</div>
 					<div class="form-group">
 						<label for="new-template-desc">{{localize 'description'}}</label>

gui/app/templates/components/folder/settings-general.hbs

@@ -1,12 +1,12 @@
 {{layout/logo-heading
-	title="Space Meta"
+	title=(localize 'space')
-	desc="Set space visibility, icon and label"
+	desc=(localize 'settings')
 	icon=constants.Icon.Settings}}
 
 <form role="form">
 	<div class="form-group">
 		<label>{{localize 'name'}}</label>
-		{{focus-input id="space-name" type="text" value=spaceName class=(if hasNameError "form-control is-invalid" "form-control") placeholder="Space name" autocomplete="off"}}
+		{{focus-input id="space-name" type="text" value=spaceName class=(if hasNameError "form-control is-invalid" "form-control") placeholder="" autocomplete="off"}}
 	</div>
 
 	<div class="form-group">
@@ -35,7 +35,7 @@
 	</div>
 
 	<div class="form-group">
-		<label>Label</label>
+		<label>{{localize 'label'}}</label>
 		<ul class="space-label-picker">
 			<li class="label none {{if (eq spaceLabel "") "selected"}}" {{action "onSetLabel" ""}} role="button" tabindex="0">{{localize 'none'}}</li>
 			{{#each labels as |label|}}
@@ -55,9 +55,9 @@
 
 	{{#if allowLikes}}
 		<div class="form-group">
-			<label>Feedback Prompt</label>
+			<label>{{localize 'feedback_prompt'}}</label>
-				{{input type="text" id="space-likes-prompt" class="form-control" placeholder=(localize 'feedback_prompt_hint') value=likes}}
+			{{input type="text" id="space-likes-prompt" class="form-control" placeholder=(localize 'feedback_prompt_hint') value=likes}}
-				<small class="form-text text-muted">{{localize 'feedback_prompt_explain'}}</small>
+			<small class="form-text text-muted">{{localize 'feedback_prompt_explain'}}</small>
 		</div>
 	{{/if}}
 </form>

gui/public/i18n/en-US.json

@@ -1,5 +1,6 @@
 {
     "none": "None",
+    "never": "Never",
     "add": "Add",
     "added": "Added",
     "activate": "Activate",
@@ -8,6 +9,7 @@
     "cancel": "Cancel",
     "close": "Close",
     "copy": "Copy",
+    "copied": "Copied",
     "delete": "Delete",
     "deleted": "Deleted",
     "remove": "Remove",
@@ -38,6 +40,7 @@
     "ok": "OK",
     "preview": "Preview",
     "preview_wait": "Generating preview...",
+    "pdf_prepare": "Preparing PDF...",
     "publish": "Publish",
     "print": "Print",
     "reject": "Reject",
@@ -45,6 +48,7 @@
     "reply": "Reply",
     "reset": "Reset",
     "request": "Request",
+    "requested": "Requested",
     "save": "Save",
     "saved": "Saved",
     "search": "Search",
@@ -65,13 +69,6 @@
     "updating": "Updating",
     "viewed": "Viewed",
     "edited": "Edited",
-    "draft": "Draft",
-    "drafts": "Drafts",
-    "live": "Live",
-    "archived": "Archived",
-    "approved": "Approved",
-    "reverted": "Reverted",
-    "published": "Published",
     "name": "Name",
     "description": "Description",
     "excerpt": "Excerpt",
@@ -114,6 +111,7 @@
     "default": "Default",
     "no_undo": "Proceed with caution as there is no undo",
     "show_hide": "Show/hide",
+    "sent": "Sent",
 
     "public": "Public",
     "public_explain": "Public - can be seen by everyone",
@@ -125,6 +123,16 @@
     "labels": "Labels",
     "labels_none": "No labels",
     "label_unclassified": "Unclassified",
+    "draft": "Draft",
+    "draft_explain": "Draft - must be approved before publication, no revision history",
+    "drafts": "Drafts",
+    "live": "Live",
+    "live_explain": "Live - published on creation",
+    "archived": "Archived",
+    "archived_explain": "Archived - not visible to anyone",
+    "approved": "Approved",
+    "reverted": "Reverted",
+    "published": "Published",
     "space": "Space",
     "spaces": "Spaces",
     "category": "Category",
@@ -153,6 +161,7 @@
     "document": "Document",
     "documents": "Documents",
     "attachments": "Attachments",
+    "history": "History",
     "bookmark": "Bookmark",
     "bookmarks": "Bookmarks",
     "bookmark_remove": "Remove bookmark",
@@ -165,6 +174,7 @@
     "new_import": "Import files",
     "new_import_explain1": "Click to select files or drag-drop files",
     "new_import_explain2": ".doc, .docx, .md, .markdown",
+    "new_content": "New Content",
     "export_html": "Export as HTML",
     "export_html_explain1": "Export all space content as HTML or select categories.",
     "export_html_explain2": "All space content will be exported as a single self-enclosed HTML file.",
@@ -223,20 +233,30 @@
     "approval_unanimous": "Unanimous approval required from all approvers",
     "approval_pending": "Pending changes",
     "approval_awaiting": "Awaiting approval",
-
-    "revision_none": "No revisions made",
-    "revision_restore": "Restore Section",
-    "revision_restore_confirm": "Are you sure you want to restore this revision?",
-
     "protection_type_open": "Open",
     "protection_type_protected": "Protected",
     "protection_type_locked": "Locked",
-    "doc_request_": "Request contribution",
+    "doc_request_contribution": "Request contribution",
     "doc_request_feedback": "Request feedback",
     "doc_request_read": "Request read",
     "doc_request_publication": "Request publication",
+    "doc_request_approval": "Request approval",
+    "doc_withdraw_approval": "Withdraw request",
+    "doc_withdraw_approval_reason": "Explanation",
+    "doc_withdraw_approval_reason_explain": "Helpful note explaining reason, e.g. corrections, additions",
+    "doc_review_publish": "Please can you review and approve the changes.",
+    "doc_review_discard": "I would like to withdraw this approval request.",
+    "doc_contribution_pending": "You have a pending change",
+    "doc_contribution_under_review": "Your approval request is under review",
+    "doc_contribution_rejected": "Your change has been rejected",
+    "doc_contribution_review": "Review changes ({1})",
+    "doc_change_status": "{1} change(s) progressing, {2} awaiting review, {3} rejected",
+    "doc_publish": "Please can you move this document from Draft to Live? We are ready to publish it!",
     "doc_secure_share": "Share via secure external link",
     "doc_category_explain": "Assign one or more categories to help organize content within this space",
+    "revision_none": "No revisions made",
+    "revision_restore": "Restore Section",
+    "revision_restore_confirm": "Are you sure you want to restore this revision?",
     "template_save": "Save as Template",
     "template_name_explain": "Good template name conveys document type",
     "template_desc_explain": "Explain use case for this template",
@@ -256,6 +276,12 @@
     "link_type_network_example": "e.g. //share/folder",
     "discard_changes": "Discard changes",
     "discard_confirm": "You have made changes - continue editing or discard changes?",
+    "share_expire_2": "in 2 days",
+    "share_expire_7": "in 7 days",
+    "share_expire_14": "in 14 days",
+    "share_expire_30": "in 30 days",
+    "share_expire_60": "in 60 days",
+    "share_expire_90": "in 90 days",
 
     "space_permissions": "Space Permissions",
     "space_permissions_explain": "Assign permissions to users or groups and invite new users to this space",