Merge branch 'dev' into websocket_scopes

1 files changed, 11 insertions, 27 deletions

diff --git a/ui/src/components/inbox.tsx b/ui/src/components/inbox.tsx
index 5fd9dbdc..6f4d2377 100644
--- a/ui/src/components/inbox.tsx
+++ b/ui/src/components/inbox.tsx
@@ -122,7 +122,7 @@ export class Inbox extends Component<any, InboxState> {
                 <ul class="list-inline mb-1 text-muted small font-weight-bold">
                   <li className="list-inline-item">
                     <span class="pointer" onClick={this.markAllAsRead}>
-                      <T i18nKey="mark_all_as_read">#</T>
+                      {i18n.t('mark_all_as_read')}
                     </span>
                   </li>
                 </ul>
@@ -147,36 +147,20 @@ export class Inbox extends Component<any, InboxState> {
           onChange={linkEvent(this, this.handleUnreadOrAllChange)}
           class="custom-select custom-select-sm w-auto mr-2"
         >
-          <option disabled>
-            <T i18nKey="type">#</T>
-          </option>
-          <option value={UnreadOrAll.Unread}>
-            <T i18nKey="unread">#</T>
-          </option>
-          <option value={UnreadOrAll.All}>
-            <T i18nKey="all">#</T>
-          </option>
+          <option disabled>{i18n.t('type')}</option>
+          <option value={UnreadOrAll.Unread}>{i18n.t('unread')}</option>
+          <option value={UnreadOrAll.All}>{i18n.t('all')}</option>
         </select>
         <select
           value={this.state.unreadType}
           onChange={linkEvent(this, this.handleUnreadTypeChange)}
           class="custom-select custom-select-sm w-auto mr-2"
         >
-          <option disabled>
-            <T i18nKey="type">#</T>
-          </option>
-          <option value={UnreadType.All}>
-            <T i18nKey="all">#</T>
-          </option>
-          <option value={UnreadType.Replies}>
-            <T i18nKey="replies">#</T>
-          </option>
-          <option value={UnreadType.Mentions}>
-            <T i18nKey="mentions">#</T>
-          </option>
-          <option value={UnreadType.Messages}>
-            <T i18nKey="messages">#</T>
-          </option>
+          <option disabled>{i18n.t('type')}</option>
+          <option value={UnreadType.All}>{i18n.t('all')}</option>
+          <option value={UnreadType.Replies}>{i18n.t('replies')}</option>
+          <option value={UnreadType.Mentions}>{i18n.t('mentions')}</option>
+          <option value={UnreadType.Messages}>{i18n.t('messages')}</option>
         </select>
         <SortSelect
           sort={this.state.sort}
@@ -248,14 +232,14 @@ export class Inbox extends Component<any, InboxState> {
             class="btn btn-sm btn-secondary mr-1"
             onClick={linkEvent(this, this.prevPage)}
           >
-            <T i18nKey="prev">#</T>
+            {i18n.t('prev')}
           </button>
         )}
         <button
           class="btn btn-sm btn-secondary"
           onClick={linkEvent(this, this.nextPage)}
         >
-          <T i18nKey="next">#</T>
+          {i18n.t('next')}
         </button>
       </div>
     );