wip and change i18n

packages/app/resource/locales/en_US/translation.json

@@ -462,6 +462,7 @@
   },
   "modal_resolve_conflict": {
     "file_conflicting_with_newer_remote": "This file is conflicting with newer remote file",
+    "reload": "Reload",
     "resolve_conflict": "Resolve Conflict",
     "resolve_and_save" : "Resolve and save"
   },

packages/app/resource/locales/ja_JP/translation.json

@@ -462,7 +462,8 @@
   },
   "modal_resolve_conflict": {
     "file_conflicting_with_newer_remote": "サーバー側の新しいファイルと衝突します。",
-    "resolve_conflict": "衝突を解消する",
+    "reload": "再読み込み",
+    "resolve_conflict": "衝突を解消",
     "resolve_and_save" : "解消し保存する"
   },
   "link_edit": {

packages/app/resource/locales/zh_CN/translation.json

@@ -440,6 +440,7 @@
   },
   "modal_resolve_conflict": {
     "file_conflicting_with_newer_remote": "此文件与较新的远程文件冲突",
+    "reload": "重新加载",
     "resolve_conflict": "解决冲突",
     "resolve_and_save" : "解决冲突并保存"
   },

packages/app/src/client/services/PageContainer.js

@@ -93,6 +93,8 @@ export default class PageContainer extends Container {
       isHackmdDraftUpdatingInRealtime: false,
       isConflictingOnSave: false,
       isConflictDiffModalOpen: false,
+
+      revisionsOnConflict: {},
     };
 
     // parse creator, lastUpdateUser and revisionAuthor

packages/app/src/components/PageEditor/ConflictDiffModal.tsx

@@ -30,7 +30,7 @@ export const ConflictDiffModal: FC<ConflictDiffModalProps> = (props) => {
       CodeMirror.MergeView(codeMirrorRef, {
         value: val,
         origLeft: orig,
-        origRight: null,
+        origRight: 'test!',
         connect: 'align',
         lineNumbers: true,
         collapseIdentical: true,
@@ -59,6 +59,7 @@ export const ConflictDiffModal: FC<ConflictDiffModalProps> = (props) => {
       </ModalHeader>
       <ModalBody>
         <div ref={(el) => { setCodeMirrorRef(el) }}></div>
+        <div className="bg-danger">body test</div>
       </ModalBody>
       <ModalFooter>
         <button

packages/app/src/components/PageStatusAlert.jsx

@@ -61,7 +61,7 @@ class PageStatusAlert extends React.Component {
       <>
         <button type="button" onClick={() => { }} className="btn btn-outline-white mr-4">
           <i className="icon-fw icon-reload mr-1"></i>
-          Reload
+          {t('modal_resolve_conflict.reload')}
         </button>
         <button type="button" onClick={() => pageContainer.setState({ isConflictDiffModalOpen: true })} className="btn btn-outline-white">
           <i className="fa fa-fw fa-file-text-o mr-1"></i>

packages/app/src/components/SavePageControls.jsx

@@ -44,14 +44,17 @@ class SavePageControls extends React.Component {
 
     try {
       // save
+      console.log('editorContainer.getCurrentOptionsToSave():', editorContainer.getCurrentOptionsToSave());
       await pageContainer.saveAndReload(editorContainer.getCurrentOptionsToSave());
     }
     catch (error) {
       logger.error('failed to save', error);
+      console.log(error);
       pageContainer.showErrorToastr(error);
       if (error.code === 'conflict') {
         pageContainer.setState({
           isConflictingOnSave: true,
+          revisionsOnConflict: error.data,
         });
       }
     }