Ensure that translated strings including page titles are in the corre…

…ct order for all languages, and add quote marks around the page title for consistency with other labels
wagtail · Jun 19, 2019 · f35e27c · f35e27c
1 parent 5ac353d
commit f35e27c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/client/src/components/Explorer/ExplorerItem.js b/client/src/components/Explorer/ExplorerItem.js
@@ -39,15 +39,15 @@ const ExplorerItem = ({ item, onClick }) => {
         href={`${ADMIN_URLS.PAGES}${id}/edit/`}
         className="c-explorer__item__action c-explorer__item__action--small"
       >
-        <Icon name="edit" title={`${STRINGS.EDIT} ${title}`} />
+        <Icon name="edit" title={STRINGS.EDIT_PAGE.replace('{0}', `'${title}'`)} />
       </Button>
       {hasChildren ? (
         <Button
           className="c-explorer__item__action"
           onClick={onClick}
           href={`${ADMIN_URLS.PAGES}${id}/`}
         >
-          <Icon name="arrow-right" title={`${STRINGS.VIEW_CHILD_PAGES_OF} ${title}`} />
+          <Icon name="arrow-right" title={STRINGS.VIEW_CHILD_PAGES_OF_PAGE.replace('{0}', `'${title}'`)} />
         </Button>
       ) : null}
     </div>

diff --git a/client/src/components/Explorer/__snapshots__/ExplorerItem.test.js.snap b/client/src/components/Explorer/__snapshots__/ExplorerItem.test.js.snap
@@ -38,7 +38,7 @@ exports[`ExplorerItem children 1`] = `
     <Icon
       className={null}
       name="edit"
-      title="Edit test"
+      title="Edit 'test'"
     />
   </Button>
   <Button
@@ -54,7 +54,7 @@ exports[`ExplorerItem children 1`] = `
     <Icon
       className={null}
       name="arrow-right"
-      title="View child pages of test"
+      title="View child pages of 'test'"
     />
   </Button>
 </div>
@@ -93,7 +93,7 @@ exports[`ExplorerItem renders 1`] = `
     <Icon
       className={null}
       name="edit"
-      title="Edit test"
+      title="Edit 'test'"
     />
   </Button>
 </div>
@@ -150,7 +150,7 @@ exports[`ExplorerItem should show a publication status if not live 1`] = `
     <Icon
       className={null}
       name="edit"
-      title="Edit test"
+      title="Edit 'test'"
     />
   </Button>
   <Button
@@ -166,7 +166,7 @@ exports[`ExplorerItem should show a publication status if not live 1`] = `
     <Icon
       className={null}
       name="arrow-right"
-      title="View child pages of test"
+      title="View child pages of 'test'"
     />
   </Button>
 </div>
@@ -223,7 +223,7 @@ exports[`ExplorerItem should show a publication status with unpublished changes
     <Icon
       className={null}
       name="edit"
-      title="Edit test"
+      title="Edit 'test'"
     />
   </Button>
   <Button
@@ -239,7 +239,7 @@ exports[`ExplorerItem should show a publication status with unpublished changes
     <Icon
       className={null}
       name="arrow-right"
-      title="View child pages of test"
+      title="View child pages of 'test'"
     />
   </Button>
 </div>

diff --git a/client/tests/stubs.js b/client/tests/stubs.js
@@ -43,7 +43,8 @@ global.wagtailConfig = {
     EDITOR_CRASH: 'The editor just crashed. Content has been reset to the last saved version.',
     BROKEN_LINK: 'Broken link',
     MISSING_DOCUMENT: 'Missing document',
-    VIEW_CHILD_PAGES_OF: 'View child pages of',
+    EDIT_PAGE: 'Edit {0}',
+    VIEW_CHILD_PAGES_OF_PAGE: 'View child pages of {0}',
   },
 };
 

diff --git a/wagtail/admin/templates/wagtailadmin/admin_base.html b/wagtail/admin/templates/wagtailadmin/admin_base.html
@@ -51,7 +51,8 @@
                 EDITOR_CRASH: "{% trans 'The editor just crashed. Content has been reset to the last saved version.' %}",
                 BROKEN_LINK: "{% trans 'Broken link' %}",
                 MISSING_DOCUMENT: "{% trans 'Missing document' %}",
-                VIEW_CHILD_PAGES_OF: "{% trans 'View child pages of' %}",
+                EDIT_PAGE: "{% trans 'Edit {0}' %}",
+                VIEW_CHILD_PAGES_OF_PAGE: "{% trans 'View child pages of {0}' %}",
 
                 MONTHS: [
                     "{% trans 'January' %}",