Rename config key

diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts b/client/src/app/shared/shared-video-miniature/video-miniature.component.ts
index 69f00fb1017d79d844b8e41ba81338a7551dafcf..37ff224abc942503d35c076191f0a56b17d2c1cd 100644 (file)
--- a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts
+++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.ts
@@ -101,11 +101,15 @@ export class VideoMiniatureComponent implements OnInit {
   ) {}
 
   get authorAccount () {
-    return this.serverConfig.client.videos.miniature.showAuthorDisplayName ? this.video.account.displayName : this.video.byAccount
+    return this.serverConfig.client.videos.miniature.preferAuthorDisplayName
+      ? this.video.account.displayName
+      : this.video.byAccount
   }
 
   get authorChannel () {
-    return this.serverConfig.client.videos.miniature.showAuthorDisplayName ? this.video.channel.displayName : this.video.byVideoChannel
+    return this.serverConfig.client.videos.miniature.preferAuthorDisplayName
+      ? this.video.channel.displayName
+      : this.video.byVideoChannel
   }
 
   get isVideoBlur () {

diff --git a/config/default.yaml b/config/default.yaml
index dec34affdbf4ab6429d1e93dad9df5da8f459e57..8ad1d915fda13675303f9848af9cdcde2d33b1bb 100644 (file)
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -75,10 +75,12 @@ email:
   subject:
     prefix: "[PeerTube]"
 
+# PeerTube client/interface configuration
 client:
   videos:
     miniature:
-      show_author_display_name: false
+      # By default PeerTube client displays author username
+      prefer_author_display_name: false
 
 # From the project root directory
 storage:

diff --git a/config/production.yaml.example b/config/production.yaml.example
index a55c99eaa9d2f69084a51bedd05f5446e833ad66..5b87cbf5f2a42d9ffe96f5c72edbb2fd36c6c006 100644 (file)
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -73,10 +73,12 @@ email:
   subject:
     prefix: "[PeerTube]"
 
+# PeerTube client/interface configuration
 client:
   videos:
     miniature:
-      show_author_display_name: false
+      # By default PeerTube client displays author username
+      prefer_author_display_name: false
 
 # From the project root directory
 storage:

diff --git a/server/initializers/config.ts b/server/initializers/config.ts
index 5ee08cf1212486a58678572d1a20babcd50231bf..a37aae5517749359deafb32d8f86732eed7e08c3 100644 (file)
--- a/server/initializers/config.ts
+++ b/server/initializers/config.ts
@@ -62,7 +62,7 @@ const CONFIG = {
   CLIENT: {
     VIDEOS: {
       MINIATURE: {
-        get SHOW_AUTHOR_DISPLAY_NAME () { return config.get<boolean>('client.videos.miniature.show_author_display_name') }
+        get PREFER_AUTHOR_DISPLAY_NAME () { return config.get<boolean>('client.videos.miniature.prefer_author_display_name') }
       }
     }
   },

diff --git a/server/lib/server-config-manager.ts b/server/lib/server-config-manager.ts
index 72fcf54cd0285a35197a06c236e2825cd75b09a8..58a37b56c95f07dad53a66af19eef227351d383d 100644 (file)
--- a/server/lib/server-config-manager.ts
+++ b/server/lib/server-config-manager.ts
@@ -46,7 +46,7 @@ class ServerConfigManager {
       client: {
         videos: {
           miniature: {
-            showAuthorDisplayName: CONFIG.CLIENT.VIDEOS.MINIATURE.SHOW_AUTHOR_DISPLAY_NAME
+            preferAuthorDisplayName: CONFIG.CLIENT.VIDEOS.MINIATURE.PREFER_AUTHOR_DISPLAY_NAME
           }
         }
       },

diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts
index df9380844cf8a1a4c263f02018b360d1ea1b40bb..4bd4b0cb45101c9ace1b110985bf98474ea08558 100644 (file)
--- a/shared/models/server/server-config.model.ts
+++ b/shared/models/server/server-config.model.ts
@@ -37,7 +37,7 @@ export interface ServerConfig {
   client: {
     videos: {
       miniature: {
-        showAuthorDisplayName: boolean
+        preferAuthorDisplayName: boolean
       }
     }
   }