From c40bda7c2aaf480402a231e26b437cff84730b77 Mon Sep 17 00:00:00 2001
From: ValD <maghtpol@gmail.com>
Date: Mon, 3 Dec 2018 22:42:43 +0530
Subject: [PATCH 1/2] added tooltip

---
 src/App.vue                                        | 2 +-
 src/components/favorite_button/favorite_button.vue | 4 ++--
 src/components/media_upload/media_upload.vue       | 2 +-
 src/components/notification/notification.vue       | 2 +-
 src/components/retweet_button/retweet_button.vue   | 4 ++--
 src/components/status/status.vue                   | 6 +++---
 src/components/user_finder/user_finder.vue         | 2 +-
 src/components/user_settings/user_settings.vue     | 8 ++++----
 src/i18n/en.json                                   | 9 ++++++++-
 9 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index a7c2bedaf8..4f71034c71 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -11,7 +11,7 @@
         </div>
         <div class='item right'>
           <user-finder class="nav-icon"></user-finder>
-          <router-link @click.native="activatePanel('timeline')" :to="{ name: 'settings'}"><i class="icon-cog nav-icon"></i></router-link>
+          <router-link @click.native="activatePanel('timeline')" :to="{ name: 'settings'}"><i class="icon-cog nav-icon" :title="$t('nav.instance_settings')"></i></router-link>
           <a href="#" v-if="currentUser" @click.prevent="logout"><i class="icon-logout nav-icon" :title="$t('login.logout')"></i></a>
         </div>
       </div>
diff --git a/src/components/favorite_button/favorite_button.vue b/src/components/favorite_button/favorite_button.vue
index 71cb875ea8..f0b40509ec 100644
--- a/src/components/favorite_button/favorite_button.vue
+++ b/src/components/favorite_button/favorite_button.vue
@@ -1,10 +1,10 @@
 <template>
   <div v-if="loggedIn">
-    <i :class='classes' class='favorite-button fav-active' @click.prevent='favorite()'/>
+    <i :class='classes' class='favorite-button fav-active' @click.prevent='favorite()' :title="$t('tool_tip.star')"/>
     <span v-if='!hidePostStatsLocal && status.fave_num > 0'>{{status.fave_num}}</span>
   </div>
   <div v-else>
-    <i :class='classes' class='favorite-button'/>
+    <i :class='classes' class='favorite-button' :title="$t('tool_tip.star')"/>
     <span v-if='!hidePostStatsLocal && status.fave_num > 0'>{{status.fave_num}}</span>
   </div>
 </template>
diff --git a/src/components/media_upload/media_upload.vue b/src/components/media_upload/media_upload.vue
index 88094ebbac..768d356503 100644
--- a/src/components/media_upload/media_upload.vue
+++ b/src/components/media_upload/media_upload.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="media-upload" @drop.prevent @dragover.prevent="fileDrag" @drop="fileDrop">
-    <label class="btn btn-default">
+    <label class="btn btn-default" :title="$t('tool_tip.media_upload')">
       <i class="icon-spin4 animate-spin" v-if="uploading"></i>
       <i class="icon-upload" v-if="!uploading"></i>
       <input type="file" style="position: fixed; top: -100em" multiple="true"></input>
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index 72c1ca6941..13a5c0aa04 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -17,7 +17,7 @@
             <small>{{$t('notifications.favorited_you')}}</small>
           </span>
           <span v-if="notification.type === 'repeat'">
-            <i class="fa icon-retweet lit"></i>
+            <i class="fa icon-retweet lit" :title="$t('tool_tip.repeat')"></i>
             <small>{{$t('notifications.repeated_you')}}</small>
           </span>
           <span v-if="notification.type === 'follow'">
diff --git a/src/components/retweet_button/retweet_button.vue b/src/components/retweet_button/retweet_button.vue
index c9ed12ebc2..c957fb778a 100644
--- a/src/components/retweet_button/retweet_button.vue
+++ b/src/components/retweet_button/retweet_button.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-if="loggedIn">
     <template v-if="visibility !== 'private' && visibility !== 'direct'">
-      <i :class='classes' class='retweet-button icon-retweet rt-active' v-on:click.prevent='retweet()'></i>
+      <i :class='classes' class='retweet-button icon-retweet rt-active' v-on:click.prevent='retweet()' :title="$t('tool_tip.repeat')"></i>
       <span v-if='!hidePostStatsLocal && status.repeat_num > 0'>{{status.repeat_num}}</span>
     </template>
     <template v-else>
@@ -9,7 +9,7 @@
     </template>
   </div>
   <div v-else-if="!loggedIn">
-    <i :class='classes' class='icon-retweet'></i>
+    <i :class='classes' class='icon-retweet' :title="$t('tool_tip.repeat')"></i>
     <span v-if='!hidePostStatsLocal && status.repeat_num > 0'>{{status.repeat_num}}</span>
   </div>
 </template>
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 8087d39213..9f65f28187 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -13,7 +13,7 @@
         <div class="media-body faint">
           <a v-if="retweeterHtml" :href="statusoid.user.statusnet_profile_url" class="user-name" :title="'@'+statusoid.user.screen_name" v-html="retweeterHtml"></a>
           <a v-else :href="statusoid.user.statusnet_profile_url" class="user-name" :title="'@'+statusoid.user.screen_name">{{retweeter}}</a>
-          <i class='fa icon-retweet retweeted'></i>
+          <i class='fa icon-retweet retweeted' :title="$t('tool_tip.repeat')"></i>
           {{$t('timeline.repeated')}}
         </div>
       </div>
@@ -41,7 +41,7 @@
                       {{status.in_reply_to_screen_name}}
                     </router-link>
                   </span>
-                  <a v-if="isReply && !noReplyLinks" href="#" @click.prevent="gotoOriginal(status.in_reply_to_status_id)">
+                  <a v-if="isReply && !noReplyLinks" href="#" @click.prevent="gotoOriginal(status.in_reply_to_status_id)" :title="$t('tool_tip.reply')">
                     <i class="icon-reply" @mouseenter="replyEnter(status.in_reply_to_status_id, $event)" @mouseout="replyLeave()"></i>
                   </a>
                 </span>
@@ -94,7 +94,7 @@
 
           <div v-if="!noHeading && !noReplyLinks" class='status-actions media-body'>
             <div v-if="loggedIn">
-              <a href="#" v-on:click.prevent="toggleReplying">
+              <a href="#" v-on:click.prevent="toggleReplying" :title="$t('tool_tip.reply')">
                 <i class="icon-reply" :class="{'icon-reply-active': replying}"></i>
               </a>
             </div>
diff --git a/src/components/user_finder/user_finder.vue b/src/components/user_finder/user_finder.vue
index f25565697a..8786f6c765 100644
--- a/src/components/user_finder/user_finder.vue
+++ b/src/components/user_finder/user_finder.vue
@@ -1,7 +1,7 @@
 <template>
   <span class="user-finder-container">
     <i class="icon-spin4 user-finder-icon animate-spin-slow" v-if="loading" />
-    <a href="#" v-if="hidden"><i class="icon-user-plus user-finder-icon" @click.prevent.stop="toggleHidden"/></a>
+    <a href="#" v-if="hidden"  :title="$t('finder.find_user')" ><i class="icon-user-plus user-finder-icon" @click.prevent.stop="toggleHidden" /></a>
     <span v-else>
       <input class="user-finder-input" @keyup.enter="findUser(username)" v-model="username" :placeholder="$t('finder.find_user')" id="user-finder-input" type="text"/>
       <i class="icon-cancel user-finder-icon" @click.prevent.stop="toggleHidden"/>
diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue
index a2a101dc28..234a7d8628 100644
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@@ -19,10 +19,10 @@
             <div v-if="scopeOptionsEnabled">
               <label for="default-vis">{{$t('settings.default_vis')}}</label>
               <div id="default-vis" class="visibility-tray">
-                <i v-on:click="changeVis('direct')" class="icon-mail-alt" :class="vis.direct"></i>
-                <i v-on:click="changeVis('private')" class="icon-lock" :class="vis.private"></i>
-                <i v-on:click="changeVis('unlisted')" class="icon-lock-open-alt" :class="vis.unlisted"></i>
-                <i v-on:click="changeVis('public')" class="icon-globe" :class="vis.public"></i>
+                <i v-on:click="changeVis('direct')" class="icon-mail-alt" :class="vis.direct" :title="$t('post_status.scope.direct')" ></i>
+                <i v-on:click="changeVis('private')" class="icon-lock" :class="vis.private" :title="$t('post_status.scope.private')"></i>
+                <i v-on:click="changeVis('unlisted')" class="icon-lock-open-alt" :class="vis.unlisted" :title="$t('post_status.scope.unlisted')"></i>
+                <i v-on:click="changeVis('public')" class="icon-globe" :class="vis.public" :title="$t('post_status.scope.public')"></i>
               </div>
             </div>
             <p>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index ae4f93d9ab..99c8837f10 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -36,7 +36,8 @@
     "public_tl": "Public Timeline",
     "timeline": "Timeline",
     "twkn": "The Whole Known Network",
-    "user_search": "User Search"
+    "user_search": "User Search",
+    "instance_settings": "Instance Settings"
   },
   "notifications": {
     "broken_favorite": "Unknown status, searching for it...",
@@ -208,5 +209,11 @@
   "who_to_follow": {
     "more": "More",
     "who_to_follow": "Who to follow"
+  },
+  "tool_tip": {
+    "media_upload": "Upload Media",
+    "repeat": "Repeat",
+    "reply": "Reply",
+    "star": "Star"
   }
 }

From c142f7b7b64ae1b4cc60340e2bbe43fe774bcd3b Mon Sep 17 00:00:00 2001
From: ValD <maghtpol@gmail.com>
Date: Tue, 4 Dec 2018 00:39:02 +0530
Subject: [PATCH 2/2] addressed PR comments

---
 src/App.vue                                        | 2 +-
 src/components/favorite_button/favorite_button.vue | 4 ++--
 src/i18n/en.json                                   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 4f71034c71..2f7dc4fe54 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -11,7 +11,7 @@
         </div>
         <div class='item right'>
           <user-finder class="nav-icon"></user-finder>
-          <router-link @click.native="activatePanel('timeline')" :to="{ name: 'settings'}"><i class="icon-cog nav-icon" :title="$t('nav.instance_settings')"></i></router-link>
+          <router-link @click.native="activatePanel('timeline')" :to="{ name: 'settings'}"><i class="icon-cog nav-icon" :title="$t('nav.preferences')"></i></router-link>
           <a href="#" v-if="currentUser" @click.prevent="logout"><i class="icon-logout nav-icon" :title="$t('login.logout')"></i></a>
         </div>
       </div>
diff --git a/src/components/favorite_button/favorite_button.vue b/src/components/favorite_button/favorite_button.vue
index f0b40509ec..1decd07058 100644
--- a/src/components/favorite_button/favorite_button.vue
+++ b/src/components/favorite_button/favorite_button.vue
@@ -1,10 +1,10 @@
 <template>
   <div v-if="loggedIn">
-    <i :class='classes' class='favorite-button fav-active' @click.prevent='favorite()' :title="$t('tool_tip.star')"/>
+    <i :class='classes' class='favorite-button fav-active' @click.prevent='favorite()' :title="$t('tool_tip.favorite')"/>
     <span v-if='!hidePostStatsLocal && status.fave_num > 0'>{{status.fave_num}}</span>
   </div>
   <div v-else>
-    <i :class='classes' class='favorite-button' :title="$t('tool_tip.star')"/>
+    <i :class='classes' class='favorite-button' :title="$t('tool_tip.favorite')"/>
     <span v-if='!hidePostStatsLocal && status.fave_num > 0'>{{status.fave_num}}</span>
   </div>
 </template>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 99c8837f10..893db9317c 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -37,7 +37,7 @@
     "timeline": "Timeline",
     "twkn": "The Whole Known Network",
     "user_search": "User Search",
-    "instance_settings": "Instance Settings"
+    "preferences": "Preferences"
   },
   "notifications": {
     "broken_favorite": "Unknown status, searching for it...",
@@ -214,6 +214,6 @@
     "media_upload": "Upload Media",
     "repeat": "Repeat",
     "reply": "Reply",
-    "star": "Star"
+    "favorite": "Favorite"
   }
 }