mizozobu 7 лет назад
Родитель
Сommit
233bc6d815

+ 4 - 3
resource/locales/en-US/translation.json

@@ -274,7 +274,8 @@
   },
 
   "sandbox": {
-    "header": "Header {{index}}",
+    "header": "Header",
+    "header_x": "Header {{index}}",
     "block": "Paragraph",
     "block_detail": "makes a paragraph",
     "empty_line": "Empty Line",
@@ -288,8 +289,8 @@
     "link": "Link",
     "code_highlight": "Code Highlight",
     "list": "List",
-    "unordered_list": "Unordered List {{index}}",
-    "ordered_list": "Ordered List {{index}}",
+    "unordered_list_x": "Unordered List {{index}}",
+    "ordered_list_x": "Ordered List {{index}}",
     "task": "Task",
     "task_checked": "Checked",
     "task_unchecked": "Unchecked",

+ 4 - 3
resource/locales/ja/translation.json

@@ -287,7 +287,8 @@
   },
 
   "sandbox": {
-    "header": "見出し {{index}}",
+    "header": "見出し",
+    "header_x": "見出し {{index}}",
     "block": "ブロック",
     "block_detail": "を挟むことで段落になります",
     "empty_line": "空白行",
@@ -301,8 +302,8 @@
     "link": "リンク",
     "code_highlight": "コードハイライト",
     "list": "リスト",
-    "unordered_list": "リスト {{index}}",
-    "ordered_list": "番号付きリスト {{index}}",
+    "unordered_list_x": "リスト {{index}}",
+    "ordered_list_x": "番号付きリスト {{index}}",
     "task": "タスク",
     "task_checked": "チェック付き",
     "task_unchecked": "チェックなし",

+ 8 - 8
src/client/js/components/PageEditor/Cheatsheet.js

@@ -11,9 +11,9 @@ class Cheatsheet extends React.Component {
         <div className="col-sm-6">
           <h4>{t('sandbox.header')}</h4>
           <ul className="hljs">
-            <li><code># </code>{t('sandbox.header', {index: '1'})}</li>
-            <li><code>## </code>{t('sandbox.header', {index: '2'})}</li>
-            <li><code>### </code>{t('sandbox.header', {index: '3'})}</li>
+            <li><code># </code>{t('sandbox.header_x', {index: '1'})}</li>
+            <li><code>## </code>{t('sandbox.header_x', {index: '2'})}</li>
+            <li><code>### </code>{t('sandbox.header_x', {index: '3'})}</li>
           </ul>
           <h4>{t('sandbox.block')}</h4>
           <p className="mb-1"><code>[{t('sandbox.empty_line')}]</code>{t('sandbox.block_detail')}</p>
@@ -50,13 +50,13 @@ class Cheatsheet extends React.Component {
         <div className="col-sm-6">
           <h4>{t('sandbox.list')}</h4>
           <ul className="hljs">
-            <li>- {t('sandbox.unordered_list', {index: '1'})}</li>
-            <li>&nbsp;&nbsp;- {t('sandbox.unordered_list', {index: '1_1'})}</li>
-            <li>- {t('sandbox.unordered_list', {index: '2'})}</li>
+            <li>- {t('sandbox.unordered_list_x', {index: '1'})}</li>
+            <li>&nbsp;&nbsp;- {t('sandbox.unordered_list_x', {index: '1.1'})}</li>
+            <li>- {t('sandbox.unordered_list_x', {index: '2'})}</li>
           </ul>
           <ul className="hljs">
-            <li>1. {t('sandbox.ordered_list', {index: '1'})}</li>
-            <li>1. {t('sandbox.ordered_list', {index: '2'})}</li>
+            <li>1. {t('sandbox.ordered_list_x', {index: '1'})}</li>
+            <li>1. {t('sandbox.ordered_list_x', {index: '2'})}</li>
           </ul>
           <ul className="hljs">
             <li>- [ ] {t('sandbox.task')}({t('sandbox.task_unchecked')})</li>

+ 7 - 7
src/client/js/components/PageEditor/SimpleCheatsheet.js

@@ -12,8 +12,8 @@ class SimpleCheatsheet extends React.Component {
           <div className="row">
             <div className="col-xs-6">
               <p>
-                # {t('sandbox.header', {index: '1'})}<br />
-                ## {t('sandbox.header', {index: '2'})}
+                # {t('sandbox.header_x', {index: '1'})}<br />
+                ## {t('sandbox.header_x', {index: '2'})}
               </p>
               <p><i>*{t('sandbox.italics')}*</i>&nbsp;&nbsp;<b>**{t('sandbox.bold')}**</b></p>
               <p>
@@ -28,11 +28,11 @@ class SimpleCheatsheet extends React.Component {
             </div>
             <div className="col-xs-6">
               <p>
-                - {t('sandbox.unordered_list', {index: '1'})}<br />
-                &nbsp;&nbsp;&nbsp;- {t('sandbox.unordered_list', {index: '1_1'})}<br />
-                - {t('sandbox.unordered_list', {index: '2'})}<br />
-                1. {t('sandbox.ordered_list', {index: '1'})}<br />
-                1. {t('sandbox.ordered_list', {index: '2'})}
+                - {t('sandbox.unordered_list_x', {index: '1'})}<br />
+                &nbsp;&nbsp;&nbsp;- {t('sandbox.unordered_list_x', {index: '1.1'})}<br />
+                - {t('sandbox.unordered_list_x', {index: '2'})}<br />
+                1. {t('sandbox.ordered_list_x', {index: '1'})}<br />
+                1. {t('sandbox.ordered_list_x', {index: '2'})}
               </p>
               <hr />
               <p>[ ][ ] {t('sandbox.block_detail')}</p>