From 724afb1e7c9036ea5a70c582e99aa1fe2a1512a3 Mon Sep 17 00:00:00 2001
From: apple502j <33279053+apple502j@users.noreply.github.com>
Date: Sat, 29 Sep 2018 13:40:26 +0900
Subject: [PATCH] Use defineMessages

---
 .../preview-modal/preview-modal.jsx           | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/components/preview-modal/preview-modal.jsx b/src/components/preview-modal/preview-modal.jsx
index 2c946bb42..babfc0a27 100644
--- a/src/components/preview-modal/preview-modal.jsx
+++ b/src/components/preview-modal/preview-modal.jsx
@@ -17,6 +17,21 @@ const messages = defineMessages({
         defaultMessage: 'Welcome to the Scratch 3.0 Beta',
         description: 'Header for Preview Info Modal',
         id: 'gui.previewInfo.welcome'
+    },
+    notNowTooltip: {
+        defaultMessage: 'Not Now',
+        description: 'Tooltip for Not Now button',
+        id: 'gui.previewModal.notnowtooltip'
+    },
+    tryItTooltip: {
+        defaultMessage: 'Try It',
+        description: 'Tooltip for Try It button',
+        id: 'gui.previewModal.tryittooltip'
+    },
+    viewProjectTooltip: {
+        defaultMessage: 'View 2.0 Project',
+        description: 'Tooltip for View 2.0 Project button',
+        id: 'gui.previewModal.viewprojecttooltip'
     }
 });
 
@@ -52,11 +67,7 @@ const PreviewModal = ({intl, ...props}) => (
                 <Box className={styles.buttonRow}>
                     <button
                         className={styles.noButton}
-                        title={intl.formatMessage({
-                            defaultMessage: 'Not Now',
-                            description: 'Tooltip for Not Now button',
-                            id: 'gui.previewModal.notnowtooltip'
-                        })}
+                        title={intl.formatMessage(messages.notNowTooltip)}
                         onClick={props.onCancel}
                     >
                         <FormattedMessage
@@ -67,11 +78,7 @@ const PreviewModal = ({intl, ...props}) => (
                     </button>
                     <button
                         className={styles.okButton}
-                        title={intl.formatMessage({
-                            defaultMessage: 'Try It',
-                            description: 'Tooltip for Try It button',
-                            id: 'gui.previewModal.tryittooltip'
-                        })}
+                        title={intl.formatMessage(messages.tryItTooltip)}
                         onClick={props.onTryIt}
                     >
                         <FormattedMessage
@@ -90,11 +97,7 @@ const PreviewModal = ({intl, ...props}) => (
                     </button>
                     <button
                         className={styles.viewProjectButton}
-                        title={intl.formatMessage({
-                            defaultMessage: 'View 2.0 Project',
-                            description: 'Tooltip for View 2.0 Project button',
-                            id: 'gui.previewModal.viewprojecttooltip'
-                        })}
+                        title={intl.formatMessage(messages.viewProjectTooltip)}
                         onClick={props.onViewProject}
                     >
                         <FormattedMessage
-- 
GitLab