Merge branch 'main' into feature/improve-automatic-deletion-of-unused-asset-profiles

8 months ago · f822820717
15 changed files with 206 additions and 25 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed

 - Improved support for automatic deletion of unused asset profiles when deleting activities
+- Improved the language localization for German (`de`)
 - Upgraded `husky` from version `9.1.6` to `9.1.7`

 ## 2.131.0 - 2024-12-25
--- a/apps/client/src/app/components/admin-settings/admin-settings.component.ts
+++ b/apps/client/src/app/components/admin-settings/admin-settings.component.ts
@ -100,7 +100,8 @@ export class AdminSettingsComponent implements OnDestroy, OnInit {
        autoFocus: false,
        data: {
          deviceType: this.deviceType,
-          pricingUrl: this.pricingUrl
+          pricingUrl: this.pricingUrl,
+          user: this.user
        },
        height: this.deviceType === 'mobile' ? '98vh' : undefined,
        width: this.deviceType === 'mobile' ? '100vw' : '50rem'
--- a/apps/client/src/app/components/admin-settings/ghostfolio-premium-api-dialog/ghostfolio-premium-api-dialog.html
+++ b/apps/client/src/app/components/admin-settings/ghostfolio-premium-api-dialog/ghostfolio-premium-api-dialog.html
@ -31,17 +31,19 @@
      mat-flat-button
      >Notify me</a
    >
-    <div>
-      <small class="text-muted" i18n>or</small>
-    </div>
-    <button
-      color="accent"
-      i18n
-      mat-stroked-button
-      (click)="onSetGhostfolioApiKey()"
-    >
-      I have an API key
-    </button>
+    @if (data.user?.settings?.isExperimentalFeatures) {
+      <div>
+        <small class="text-muted" i18n>or</small>
+      </div>
+      <button
+        color="accent"
+        i18n
+        mat-stroked-button
+        (click)="onSetGhostfolioApiKey()"
+      >
+        I have an API key
+      </button>
+    }
  </div>
 </div>

--- a/apps/client/src/app/components/admin-settings/ghostfolio-premium-api-dialog/interfaces/interfaces.ts
+++ b/apps/client/src/app/components/admin-settings/ghostfolio-premium-api-dialog/interfaces/interfaces.ts
@ -1,4 +1,7 @@
+import { User } from '@ghostfolio/common/interfaces';
+
 export interface GhostfolioPremiumApiDialogParams {
  deviceType: string;
  pricingUrl: string;
+  user: User;
 }
--- a/apps/client/src/locales/messages.ca.xlf
+++ b/apps/client/src/locales/messages.ca.xlf
@ -3307,7 +3307,7 @@
        <target state="new">Granted Access</target>
        <context-group purpose="location">
          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.html</context>
-          <context context-type="linenumber">5</context>
+          <context context-type="linenumber">7</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5196970976032945030" datatype="html">
@ -7616,6 +7616,22 @@
          <context context-type="linenumber">82</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="7156797854368699223" datatype="html">
+        <source>Me</source>
+        <target state="new">Me</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.component.ts</context>
+          <context context-type="linenumber">134</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="110cc6cb39e1806d3775fd76f1d0753c9bc0e062" datatype="html">
+        <source>Received Access</source>
+        <target state="new">Received Access</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
    </body>
  </file>
 </xliff>
--- a/apps/client/src/locales/messages.de.xlf
+++ b/apps/client/src/locales/messages.de.xlf
@ -1815,10 +1815,10 @@
      </trans-unit>
      <trans-unit id="9021c579c084e68d9db06a569d76f024111c6c54" datatype="html">
        <source>Granted Access</source>
-        <target state="translated">Zugangsberechtigung</target>
+        <target state="translated">Gewährte Zugangsberechtigung</target>
        <context-group purpose="location">
          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.html</context>
-          <context context-type="linenumber">5</context>
+          <context context-type="linenumber">7</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5e41f1b4c46ad9e0a9bc83fa36445483aa5cc324" datatype="html">
@ -7616,6 +7616,22 @@
          <context context-type="linenumber">82</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="7156797854368699223" datatype="html">
+        <source>Me</source>
+        <target state="translated">Ich</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.component.ts</context>
+          <context context-type="linenumber">134</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="110cc6cb39e1806d3775fd76f1d0753c9bc0e062" datatype="html">
+        <source>Received Access</source>
+        <target state="translated">Erhaltene Zugangsberechtigung</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
    </body>
  </file>
 </xliff>
--- a/apps/client/src/locales/messages.es.xlf
+++ b/apps/client/src/locales/messages.es.xlf
@ -1819,7 +1819,7 @@
        <target state="translated">Acceso concedido</target>
        <context-group purpose="location">
          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.html</context>
-          <context context-type="linenumber">5</context>
+          <context context-type="linenumber">7</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5e41f1b4c46ad9e0a9bc83fa36445483aa5cc324" datatype="html">
@ -7617,6 +7617,22 @@
          <context context-type="linenumber">82</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="7156797854368699223" datatype="html">
+        <source>Me</source>
+        <target state="new">Me</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.component.ts</context>
+          <context context-type="linenumber">134</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="110cc6cb39e1806d3775fd76f1d0753c9bc0e062" datatype="html">
+        <source>Received Access</source>
+        <target state="new">Received Access</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
    </body>
  </file>
 </xliff>
--- a/apps/client/src/locales/messages.fr.xlf
+++ b/apps/client/src/locales/messages.fr.xlf
@ -2174,7 +2174,7 @@
        <target state="translated">Accès donné</target>
        <context-group purpose="location">
          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.html</context>
-          <context context-type="linenumber">5</context>
+          <context context-type="linenumber">7</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5e41f1b4c46ad9e0a9bc83fa36445483aa5cc324" datatype="html">
@ -7616,6 +7616,22 @@
          <context context-type="linenumber">82</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="7156797854368699223" datatype="html">
+        <source>Me</source>
+        <target state="new">Me</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.component.ts</context>
+          <context context-type="linenumber">134</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="110cc6cb39e1806d3775fd76f1d0753c9bc0e062" datatype="html">
+        <source>Received Access</source>
+        <target state="new">Received Access</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
    </body>
  </file>
 </xliff>
--- a/apps/client/src/locales/messages.it.xlf
+++ b/apps/client/src/locales/messages.it.xlf
@ -1819,7 +1819,7 @@
        <target state="translated">Accesso concesso</target>
        <context-group purpose="location">
          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.html</context>
-          <context context-type="linenumber">5</context>
+          <context context-type="linenumber">7</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5e41f1b4c46ad9e0a9bc83fa36445483aa5cc324" datatype="html">
@ -7617,6 +7617,22 @@
          <context context-type="linenumber">82</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="7156797854368699223" datatype="html">
+        <source>Me</source>
+        <target state="new">Me</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.component.ts</context>
+          <context context-type="linenumber">134</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="110cc6cb39e1806d3775fd76f1d0753c9bc0e062" datatype="html">
+        <source>Received Access</source>
+        <target state="new">Received Access</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
    </body>
  </file>
 </xliff>
--- a/apps/client/src/locales/messages.nl.xlf
+++ b/apps/client/src/locales/messages.nl.xlf
@ -1818,7 +1818,7 @@
        <target state="translated">Verleende toegang</target>
        <context-group purpose="location">
          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.html</context>
-          <context context-type="linenumber">5</context>
+          <context context-type="linenumber">7</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5e41f1b4c46ad9e0a9bc83fa36445483aa5cc324" datatype="html">
@ -7616,6 +7616,22 @@
          <context context-type="linenumber">82</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="7156797854368699223" datatype="html">
+        <source>Me</source>
+        <target state="new">Me</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.component.ts</context>
+          <context context-type="linenumber">134</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="110cc6cb39e1806d3775fd76f1d0753c9bc0e062" datatype="html">
+        <source>Received Access</source>
+        <target state="new">Received Access</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
    </body>
  </file>
 </xliff>
--- a/apps/client/src/locales/messages.pl.xlf
+++ b/apps/client/src/locales/messages.pl.xlf
@ -3031,7 +3031,7 @@
        <target state="translated">Przyznano dostęp</target>
        <context-group purpose="location">
          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.html</context>
-          <context context-type="linenumber">5</context>
+          <context context-type="linenumber">7</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5196970976032945030" datatype="html">
@ -3812,7 +3812,7 @@
      </trans-unit>
      <trans-unit id="f251aca95a00756de48b14172b02d33f175661fc" datatype="html">
        <source> Ghostfolio is a privacy-first, open source dashboard for your personal finances. Break down your asset allocation, know your net worth and make solid, data-driven investment decisions. </source>
-        <target state="translated"> Ghostfolio to zapewniający prywatność, open source'owy panel do zarządzania finansami osobistymi. Przeanalizuj szczegółowo swoją alokację aktywów, określ swoją wartość netto i podejmuj przemyślane decyzje inwestycyjne oparte na danych. </target>
+        <target state="translated"> Ghostfolio to zapewniający prywatność, open source&apos;owy panel do zarządzania finansami osobistymi. Przeanalizuj szczegółowo swoją alokację aktywów, określ swoją wartość netto i podejmuj przemyślane decyzje inwestycyjne oparte na danych. </target>
        <context-group purpose="location">
          <context context-type="sourcefile">apps/client/src/app/pages/landing/landing-page.html</context>
          <context context-type="linenumber">9</context>
@ -7616,6 +7616,22 @@
          <context context-type="linenumber">82</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="7156797854368699223" datatype="html">
+        <source>Me</source>
+        <target state="new">Me</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.component.ts</context>
+          <context context-type="linenumber">134</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="110cc6cb39e1806d3775fd76f1d0753c9bc0e062" datatype="html">
+        <source>Received Access</source>
+        <target state="new">Received Access</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
    </body>
  </file>
 </xliff>
--- a/apps/client/src/locales/messages.pt.xlf
+++ b/apps/client/src/locales/messages.pt.xlf
@ -2122,7 +2122,7 @@
        <target state="translated">Acesso Concedido</target>
        <context-group purpose="location">
          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.html</context>
-          <context context-type="linenumber">5</context>
+          <context context-type="linenumber">7</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5e41f1b4c46ad9e0a9bc83fa36445483aa5cc324" datatype="html">
@ -7616,6 +7616,22 @@
          <context context-type="linenumber">82</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="7156797854368699223" datatype="html">
+        <source>Me</source>
+        <target state="new">Me</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.component.ts</context>
+          <context context-type="linenumber">134</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="110cc6cb39e1806d3775fd76f1d0753c9bc0e062" datatype="html">
+        <source>Received Access</source>
+        <target state="new">Received Access</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
    </body>
  </file>
 </xliff>
--- a/apps/client/src/locales/messages.tr.xlf
+++ b/apps/client/src/locales/messages.tr.xlf
@ -5171,7 +5171,7 @@
        <target state="translated">xErişim İzni Verildi</target>
        <context-group purpose="location">
          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.html</context>
-          <context context-type="linenumber">5</context>
+          <context context-type="linenumber">7</context>
        </context-group>
      </trans-unit>
      <trans-unit id="495a0574bd9a3d619a8b16dd5b893c6f617beded" datatype="html">
@ -7616,6 +7616,22 @@
          <context context-type="linenumber">82</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="7156797854368699223" datatype="html">
+        <source>Me</source>
+        <target state="new">Me</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.component.ts</context>
+          <context context-type="linenumber">134</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="110cc6cb39e1806d3775fd76f1d0753c9bc0e062" datatype="html">
+        <source>Received Access</source>
+        <target state="new">Received Access</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
    </body>
  </file>
 </xliff>
--- a/apps/client/src/locales/messages.xlf
+++ b/apps/client/src/locales/messages.xlf
@ -2832,7 +2832,7 @@
        <source>Granted Access</source>
        <context-group purpose="location">
          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.html</context>
-          <context context-type="linenumber">5</context>
+          <context context-type="linenumber">7</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5196970976032945030" datatype="html">
@ -6891,6 +6891,20 @@
          <context context-type="linenumber">82</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="110cc6cb39e1806d3775fd76f1d0753c9bc0e062" datatype="html">
+        <source>Received Access</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7156797854368699223" datatype="html">
+        <source>Me</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.component.ts</context>
+          <context context-type="linenumber">134</context>
+        </context-group>
+      </trans-unit>
    </body>
  </file>
 </xliff>
--- a/apps/client/src/locales/messages.zh.xlf
+++ b/apps/client/src/locales/messages.zh.xlf
@ -3048,7 +3048,7 @@
        <target state="translated">授予访问权限</target>
        <context-group purpose="location">
          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.html</context>
-          <context context-type="linenumber">5</context>
+          <context context-type="linenumber">7</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5196970976032945030" datatype="html">
@ -7617,6 +7617,22 @@
          <context context-type="linenumber">82</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="7156797854368699223" datatype="html">
+        <source>Me</source>
+        <target state="new">Me</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.component.ts</context>
+          <context context-type="linenumber">134</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="110cc6cb39e1806d3775fd76f1d0753c9bc0e062" datatype="html">
+        <source>Received Access</source>
+        <target state="new">Received Access</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/components/user-account-access/user-account-access.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
    </body>
  </file>
 </xliff>