From eaf3367549f7e12d464c0fda5251640209e924cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Miko=C5=82ajczak?= <me@mkljczk.pl>
Date: Fri, 8 Jan 2021 23:16:22 +0100
Subject: [PATCH 1/2] Mark 'These settings apply only to' string as i18n-able

---
 client/src/app/modal/quick-settings-modal.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/app/modal/quick-settings-modal.component.html b/client/src/app/modal/quick-settings-modal.component.html
index 62013c733..7794e10c4 100644
--- a/client/src/app/modal/quick-settings-modal.component.html
+++ b/client/src/app/modal/quick-settings-modal.component.html
@@ -5,7 +5,7 @@
   </div>
 
   <div class="modal-body">
-    <div class="mb-4 font-italic">These settings apply only to your session on this instance.</div>
+    <div i18n class="mb-4 font-italic">These settings apply only to your session on this instance.</div>
 
     <div i18n class="mb-4 quick-settings-title">Display settings</div>
 

From 04b2996bb0d7407ff500ab39fadd8e5b596c05e2 Mon Sep 17 00:00:00 2001
From: Rigel Kent <sendmemail@rigelk.eu>
Date: Sun, 10 Jan 2021 22:19:51 +0100
Subject: [PATCH 2/2] reflect location origin for application feed url in
 production

---
 .../my-account-applications.component.ts                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/app/+my-account/my-account-applications/my-account-applications.component.ts b/client/src/app/+my-account/my-account-applications/my-account-applications.component.ts
index 756644990..5e9525fbb 100644
--- a/client/src/app/+my-account/my-account-applications/my-account-applications.component.ts
+++ b/client/src/app/+my-account/my-account-applications/my-account-applications.component.ts
@@ -14,7 +14,7 @@ export class MyAccountApplicationsComponent implements OnInit {
   feedUrl: string
   feedToken: string
 
-  private baseURL = environment.originServerUrl
+  private baseURL = environment.originServerUrl || window.location.origin
 
   constructor (
     private authService: AuthService,