From 08bdb152a778747c879e854a02a4e0301e5cc27d Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Thu, 16 May 2019 11:49:13 +0300
Subject: [PATCH] [DE] Fix loading document info, add translation

---
 .../documenteditor/main/app/view/FileMenuPanels.js | 14 +++++++-------
 apps/documenteditor/main/locale/en.json            | 13 +++++++++++--
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js
index 3d448c87e..eb317991a 100644
--- a/apps/documenteditor/main/app/view/FileMenuPanels.js
+++ b/apps/documenteditor/main/app/view/FileMenuPanels.js
@@ -737,7 +737,7 @@ define([
                     '<tr class="divider modify">',
                     '<tr class="divider modify">',
                     '<tr>',
-                        '<td class="left"><label>' + this.txtDate + '</label></td>',
+                        '<td class="left"><label>' + this.txtCreated + '</label></td>',
                         '<td class="right"><label id="id-info-date"></label></td>',
                     '</tr>',
                     '<tr>',
@@ -885,13 +885,13 @@ define([
                 // server info
                 if (doc.info.folder )
                     this.lblPlacement.text( doc.info.folder );
-                visible = visible || this._ShowHideInfoItem(this.lblPlacement, doc.info.folder!==undefined && doc.info.folder!==null);
+                visible = this._ShowHideInfoItem(this.lblPlacement, doc.info.folder!==undefined && doc.info.folder!==null) || visible;
                 if (doc.info.author)
                     this.lblOwner.text(doc.info.author);
-                visible = visible || this._ShowHideInfoItem(this.lblOwner, doc.info.author!==undefined && doc.info.author!==null);
+                visible = this._ShowHideInfoItem(this.lblOwner, doc.info.author!==undefined && doc.info.author!==null) || visible;
                 if (doc.info.uploaded)
                     this.lblUploaded.text(doc.info.uploaded.toLocaleString());
-                visible = visible || this._ShowHideInfoItem(this.lblUploaded, doc.info.uploaded!==undefined && doc.info.uploaded!==null);
+                visible = this._ShowHideInfoItem(this.lblUploaded, doc.info.uploaded!==undefined && doc.info.uploaded!==null) || visible;
             } else
                 this._ShowHideDocInfo(false);
             $('tr.divider.general', this.el)[visible?'show':'hide']();
@@ -932,11 +932,11 @@ define([
                 value = props.asc_getModified();
                 if (value)
                     this.lblModifyDate.text(value.toLocaleString());
-                visible = visible || this._ShowHideInfoItem(this.lblModifyDate, !!value);
+                visible = this._ShowHideInfoItem(this.lblModifyDate, !!value) || visible;
                 value = props.asc_getLastModifiedBy();
                 if (value)
                     this.lblModifyBy.text(value);
-                visible = visible || this._ShowHideInfoItem(this.lblModifyBy, !!value);
+                visible = this._ShowHideInfoItem(this.lblModifyBy, !!value) || visible;
                 $('tr.divider.modify', this.el)[visible?'show':'hide']();
 
                 value = props.asc_getTitle();
@@ -1052,7 +1052,7 @@ define([
         txtComment: 'Comment',
         txtModifyDate: 'Last Modified',
         txtModifyBy: 'Last Modified By',
-        txtDate: 'Created',
+        txtCreated: 'Created',
         txtAuthor: 'Author',
         txtAddAuthor: 'Add Author',
         txtAddText: 'Add Text',
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 4d158c05b..6fa41b503 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -1345,18 +1345,27 @@
   "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "New Text Document",
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "There are no templates",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Application",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Add Author",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Add Text",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Author",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Change access rights",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Creation Date",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtComment": "Comment",
+  "del_DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Creation Date",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Created",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Loading...",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtModifyDate": "Last Modified",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtModifyBy": "Last Modified By",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtOwner": "Owner",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Pages",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Paragraphs",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Location",
   "DE.Views.FileMenuPanels.DocumentInfo.txtRights": "Persons who have rights",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Symbols with spaces",
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Statistics",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Subject",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Symbols",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Document Title",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Title",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Uploaded",
   "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Words",
   "DE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Change access rights",
   "DE.Views.FileMenuPanels.DocumentRights.txtRights": "Persons who have rights",