pleroma-fe

commit: 29ced0c08b76cd02c05f6bef30adb6495a082819
parent: 480f617c098c831e095a686abb319f4e467e15e4
Author: Henry <spam@hjkos.com>
Date:   Tue,  4 Dec 2018 10:06:36 +0000

Merge branch 'dev_vald_fe/tooltip' into 'develop'

Added user setting tooltip

Closes #156

See merge request pleroma/pleroma-fe!395
Diffstat:
M
src/components/user_card_content/user_card_content.vue
2
+-
M
src/i18n/en.json
3
++-

2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue
@@ -3,7 +3,7 @@
   <div class="panel-heading text-center">
     <div class='user-info'>
       <router-link to='/user-settings' style="float: right; margin-top:16px;" v-if="!isOtherUser">
-        <i class="icon-cog usersettings"></i>
+        <i class="icon-cog usersettings" :title="$t('tool_tip.user_settings')"></i>
       </router-link>
       <a :href="user.statusnet_profile_url" target="_blank" class="floater" v-if="isOtherUser">
         <i class="icon-link-ext usersettings"></i>
diff --git a/src/i18n/en.json b/src/i18n/en.json
@@ -214,6 +214,7 @@
     "media_upload": "Upload Media",
     "repeat": "Repeat",
     "reply": "Reply",
-    "favorite": "Favorite"
+    "favorite": "Favorite",
+    "user_settings": "User Settings"
   }
 }