From f0ad47100748ba5f660b597787422b1b302e64c0 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 21 Jan 2020 14:05:22 +0100
Subject: Update a little bit user dropdown message

---
 client/src/app/+admin/users/user-list/user-list.component.ts        | 2 +-
 client/src/app/shared/buttons/action-dropdown.component.html        | 1 +
 .../src/app/shared/moderation/user-moderation-dropdown.component.ts | 6 +++---
 .../src/app/shared/user-subscription/remote-subscribe.component.ts  | 1 +
 server/initializers/database.ts                                     | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/client/src/app/+admin/users/user-list/user-list.component.ts b/client/src/app/+admin/users/user-list/user-list.component.ts
index a596251f6..7c5e8eaa4 100644
--- a/client/src/app/+admin/users/user-list/user-list.component.ts
+++ b/client/src/app/+admin/users/user-list/user-list.component.ts
@@ -63,7 +63,7 @@ export class UserListComponent extends RestTable implements OnInit {
         },
         {
           label: this.i18n('Ban'),
-          description: this.i18n('Videos will be kept as private, comments will be kept as is.'),
+          description: this.i18n('User won\'t be able to login anymore, but videos and comments will be kept as is.'),
           handler: users => this.openBanUserModal(users),
           isDisplayed: users => users.every(u => this.authUser.canManage(u) && u.blocked === false)
         },
diff --git a/client/src/app/shared/buttons/action-dropdown.component.html b/client/src/app/shared/buttons/action-dropdown.component.html
index 54f5bf97c..cd993db9f 100644
--- a/client/src/app/shared/buttons/action-dropdown.component.html
+++ b/client/src/app/shared/buttons/action-dropdown.component.html
@@ -17,6 +17,7 @@
 
           <ng-template #templateActionLabel let-action>
             <my-global-icon *ngIf="action.iconName" [iconName]="action.iconName" [ngClass]="'icon-' + action.iconName"></my-global-icon>
+
             <div class="d-flex flex-column">
               <span i18n>{{ action.label }}</span>
               <small class="text-muted" *ngIf="action.description">{{ action.description }}</small>
diff --git a/client/src/app/shared/moderation/user-moderation-dropdown.component.ts b/client/src/app/shared/moderation/user-moderation-dropdown.component.ts
index 7ae5f40e3..11d8588f4 100644
--- a/client/src/app/shared/moderation/user-moderation-dropdown.component.ts
+++ b/client/src/app/shared/moderation/user-moderation-dropdown.component.ts
@@ -243,18 +243,18 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
       if (this.user && authUser.hasRight(UserRight.MANAGE_USERS) && authUser.canManage(this.user)) {
         this.userActions.push([
           {
-            label: this.i18n('Edit'),
+            label: this.i18n('Edit user'),
             description: this.i18n('Change quota, role, and more.'),
             linkBuilder: ({ user }) => this.getRouterUserEditLink(user)
           },
           {
-            label: this.i18n('Delete'),
+            label: this.i18n('Delete user'),
             description: this.i18n('Videos will be deleted, comments will be tombstoned.'),
             handler: ({ user }) => this.removeUser(user)
           },
           {
             label: this.i18n('Ban'),
-            description: this.i18n('Videos will be kept as private, comments will be kept as is.'),
+            description: this.i18n('User won\'t be able to login anymore, but videos and comments will be kept as is.'),
             handler: ({ user }) => this.openBanUserModal(user),
             isDisplayed: ({ user }) => !user.blocked
           },
diff --git a/client/src/app/shared/user-subscription/remote-subscribe.component.ts b/client/src/app/shared/user-subscription/remote-subscribe.component.ts
index 63e7cd5d9..befdb7157 100644
--- a/client/src/app/shared/user-subscription/remote-subscribe.component.ts
+++ b/client/src/app/shared/user-subscription/remote-subscribe.component.ts
@@ -39,6 +39,7 @@ export class RemoteSubscribeComponent extends FormReactive implements OnInit {
     const address = this.form.value['text']
     const [ username, hostname ] = address.split('@')
 
+    // Should not have CORS error because https://tools.ietf.org/html/rfc7033#section-5
     fetch(`https://${hostname}/.well-known/webfinger?resource=acct:${username}@${hostname}`)
       .then(response => response.json())
       .then(data => new Promise((resolve, reject) => {
diff --git a/server/initializers/database.ts b/server/initializers/database.ts
index a7988d75b..9ec146ab1 100644
--- a/server/initializers/database.ts
+++ b/server/initializers/database.ts
@@ -163,7 +163,7 @@ async function checkPostgresExtension (extension: string) {
   }
 }
 
-async function createFunctions () {
+function createFunctions () {
   const query = `CREATE OR REPLACE FUNCTION immutable_unaccent(text)
   RETURNS text AS
 $func$
-- 
cgit v1.2.3