about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/features/drawer
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-08-31 13:31:45 +0200
committerThibG <thib@sitedethib.com>2018-08-31 18:33:46 +0200
commit70c308c4aa97acaaf6354420bee7d843ddf97d13 (patch)
tree7bea9ea22864081f3bad0d6c314f78f664f9618a /app/javascript/flavours/glitch/features/drawer
parent5d647197ecbda55bdfee5b2462ebb9806b89a927 (diff)
[Glitch] When search enabled, display hint in search popout
Port 7901f9f63e156732ab10154c34f3c2d188471a9d to glitch-soc
Diffstat (limited to 'app/javascript/flavours/glitch/features/drawer')
-rw-r--r--app/javascript/flavours/glitch/features/drawer/search/popout/index.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/drawer/search/popout/index.js b/app/javascript/flavours/glitch/features/drawer/search/popout/index.js
index 6219f46ca..fec090b64 100644
--- a/app/javascript/flavours/glitch/features/drawer/search/popout/index.js
+++ b/app/javascript/flavours/glitch/features/drawer/search/popout/index.js
@@ -9,6 +9,7 @@ import spring from 'react-motion/lib/spring';
 
 //  Utils.
 import Motion from 'flavours/glitch/util/optional_motion';
+import { searchEnabled } from 'flavours/glitch/util/initial_state';
 
 //  Messages.
 const messages = defineMessages({
@@ -28,6 +29,10 @@ const messages = defineMessages({
     defaultMessage: 'Simple text returns matching display names, usernames and hashtags',
     id: 'search_popout.tips.text',
   },
+  full_text: {
+    defaultMessage: 'Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.',
+    id: 'search_popout.tips.full_text',
+  },
   user: {
     defaultMessage: 'user',
     id: 'search_popout.tips.user',
@@ -92,7 +97,7 @@ export default function DrawerSearchPopout ({ style }) {
                 <FormattedMessage {...messages.status} />
               </li>
             </ul>
-            <FormattedMessage {...messages.text} />
+            { searchEnabled ? <FormattedMessage {...messages.full_text} /> : <FormattedMessage {...messages.text} /> }
           </div>
         )}
       </Motion>