From 8f999652cc1b1d65f6504a174a7cc31d700ff8c3 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 30 Sep 2021 14:07:53 -0400
Subject: [PATCH] fix(web): contextualize title in subscription dialog

---
 UI/Contacts/English.lproj/Localizable.strings            | 2 +-
 UI/Scheduler/English.lproj/Localizable.strings           | 2 +-
 UI/Templates/ContactsUI/UIxContactsUserFolders.wox       | 2 +-
 UI/WebServerResources/js/Common/sgSubscribe.directive.js | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/UI/Contacts/English.lproj/Localizable.strings b/UI/Contacts/English.lproj/Localizable.strings
index 7a3e3ed3f..20a700c89 100644
--- a/UI/Contacts/English.lproj/Localizable.strings
+++ b/UI/Contacts/English.lproj/Localizable.strings
@@ -221,7 +221,7 @@
 "New Addressbook..." = "New Addressbook...";
 "Subscribe to an Addressbook..." = "Subscribe to an Addressbook...";
 "Remove the selected Addressbook" = "Remove the selected Addressbook";
-"Subscribe to a shared folder" = "Subscribe to a shared folder";
+"Subscribe to a shared contact" = "Subscribe to a shared addressbook";
 "Search User" = "Search User";
 "Name of the Address Book" = "Name of the Address Book";
 "Are you sure you want to delete the selected address book?"
diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings
index f20be5a07..dae1a0e8e 100644
--- a/UI/Scheduler/English.lproj/Localizable.strings
+++ b/UI/Scheduler/English.lproj/Localizable.strings
@@ -579,7 +579,7 @@ vtodo_class2 = "(Confidential task)";
 "Move To" = "Move To";
 "Copy To" = "Copy To";
 "Subscriptions" = "Subscriptions";
-"Subscribe to a shared folder" = "Subscribe to a shared folder";
+"Subscribe to a shared calendar" = "Subscribe to a shared calendar";
 "Subscribe to a web calendar..." = "Subscribe to a web calendar...";
 "URL of the Calendar" = "URL of the Calendar";
 "Web Calendar" = "Web Calendar";
diff --git a/UI/Templates/ContactsUI/UIxContactsUserFolders.wox b/UI/Templates/ContactsUI/UIxContactsUserFolders.wox
index 943e8b71a..ff13e924b 100644
--- a/UI/Templates/ContactsUI/UIxContactsUserFolders.wox
+++ b/UI/Templates/ContactsUI/UIxContactsUserFolders.wox
@@ -9,7 +9,7 @@
   <md-dialog flex="50" flex-sm="80" flex-xs="100">
     <md-toolbar>
       <div class="md-toolbar-tools">
-        <div class="sg-md-title md-flex"><var:string label:value="Subscribe to a shared folder"/></div>
+        <div class="sg-md-title md-flex">{{ 'Subscribe to a shared ' + subscribe.folderType | loc }}</div>
         <md-button class="md-icon-button" ng-click="subscribe.close()">
           <md-icon label:aria-label="Close">close</md-icon>
         </md-button>
diff --git a/UI/WebServerResources/js/Common/sgSubscribe.directive.js b/UI/WebServerResources/js/Common/sgSubscribe.directive.js
index 0308a37fe..6a3823134 100644
--- a/UI/WebServerResources/js/Common/sgSubscribe.directive.js
+++ b/UI/WebServerResources/js/Common/sgSubscribe.directive.js
@@ -65,6 +65,7 @@
 
     vm.selectedUser = null;
     vm.users = [];
+    vm.folderType = folderType;
 
     vm.searchTextOptions = {
       updateOn: 'default blur',