Merge branch 'bpatrik:master' into gpx_wpt_mappoints

src/common/config/public/ClientConfig.ts

@@ -59,8 +59,8 @@ export class ClientSharingConfig {
 
 @SubConfigClass()
 export class ClientRandomPhotoConfig {
-  @ConfigProperty({description: 'Enables random link generation. NOTE: With the current implementation, it poses a security risk. See https://github.com/bpatrik/pigallery2/issues/392'})
+  @ConfigProperty({description: 'Enables random link generation.'})
-  enabled: boolean = false;
+  enabled: boolean = true;
 }
 
 @SubConfigClass()

src/frontend/app/ui/language/language.component.ts

@@ -15,7 +15,7 @@ export class LanguageComponent {
   current: string = null;
 
   constructor(private cookieService: CookieService) {
-    this.languages = Config.Client.languages;
+    this.languages = Config.Client.languages.sort();
     if (this.cookieService.get(CookieNames.lang) != null) {
       this.current = this.cookieService.get(CookieNames.lang);
     }

src/frontend/app/ui/settings/database/database.settings.component.html

@@ -8,6 +8,7 @@
 
       <app-settings-entry
         name="Type"
+        [optionMap]="dbTypesMap"
         [ngModel]="states.type"
         i18n-name
         required="true">

src/frontend/app/ui/settings/database/database.settings.component.ts

@@ -31,6 +31,14 @@ export class DatabaseSettingsComponent extends SettingsComponentDirective<Server
   }
 
 
+  dbTypesMap = (v: { key: number, value: string }) => {
+    if (v.key === DatabaseType.sqlite) {
+      v.value += ' ' + $localize`(recommended)`;
+    } else if (v.value === DatabaseType[DatabaseType.memory]) {
+      v.value += ' ' + $localize`(deprecated, will be removed)`;
+    }
+    return v;
+  };
 }
 
 

src/frontend/app/ui/settings/photo/photo.settings.component.ts

@@ -48,14 +48,6 @@ export class PhotoSettingsComponent extends SettingsComponentDirective<{
     return this.jobsService.progress.value[JobDTOUtils.getHashName(DefaultsJobs[DefaultsJobs['Photo Converting']])];
   }
 
-  libTypesMap = (v: { key: number, value: string }) => {
-    if (v.value.toLowerCase() === 'sharp') {
-      v.value += ' ' + $localize`(recommended)`;
-    } else {
-      v.value += ' ' + $localize`(deprecated, will be removed)`;
-    }
-    return v;
-  };
 }
 
 

src/frontend/app/ui/settings/random-photo/random-photo.settings.component.html

@@ -33,7 +33,7 @@
           </ng-container>
           <br/>
           <ng-container i18n>
-            Note: With the current implementation, it poses a security risk. See:
+            Note: With the current implementation, random link also requires login. See:
           </ng-container>
           <a href="https://github.com/bpatrik/pigallery2/issues/392">#392</a>
         </div>