Merge branch 'main' into leo/9311-qa-inbox-unable-to-fetch-more-notif…

…ications-after-archiving-all-that-were-displayed
ORCID · Jul 18, 2024 · a3b1c33 · a3b1c33
2 parents 55ccc57 + c882b0f
commit a3b1c33
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v2.102.1 - 2024-07-17
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.102.0...v2.102.1)
+
+- [#2300](https://github.com/ORCID/orcid-angular/pull/2300): Lmendoza/9306 notification email frequency account settings v2
+
 ## v2.102.0 - 2024-07-15
 
 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.101.12...v2.102.0)

diff --git a/...onents/settings-defaults-email-frequency/settings-defaults-email-frequency.component.scss b/...onents/settings-defaults-email-frequency/settings-defaults-email-frequency.component.scss
@@ -91,4 +91,4 @@ h4 {
 
 .margin-bottom-32 {
   margin-bottom: 32px;
-}
+}
diff --git a/src/locale/properties/account/account.en.properties b/src/locale/properties/account/account.en.properties
@@ -213,4 +213,4 @@ account.privacypolicy=Privacy Policy
 account.setTheFrequency=Set the frequency for update notifications
 account.setTheFrequencyAdministrative=Set the frequency for administrative change notifications
 account.setTheFrequencyMember=Set the frequency for permission request notifications
-  
+=
diff --git a/src/locale/properties/account/account.lr.properties b/src/locale/properties/account/account.lr.properties
@@ -211,3 +211,8 @@ account.howOftenShouldWeSend=LR
 account.administrativeChangesSuchAs=LR
 account.tipsAndFeatures=LR
 account.idLikeToReceiveTheOrcidTips=LR
+account.privacypolicy=LR
+account.setTheFrequency=LR
+account.setTheFrequencyAdministrative=LR
+account.setTheFrequencyMember=LR
+=LR
diff --git a/src/locale/properties/account/account.rl.properties b/src/locale/properties/account/account.rl.properties
@@ -211,3 +211,8 @@ account.howOftenShouldWeSend=RL
 account.administrativeChangesSuchAs=RL
 account.tipsAndFeatures=RL
 account.idLikeToReceiveTheOrcidTips=RL
+account.privacypolicy=RL
+account.setTheFrequency=RL
+account.setTheFrequencyAdministrative=RL
+account.setTheFrequencyMember=RL
+=RL
diff --git a/src/locale/properties/account/account.xx.properties b/src/locale/properties/account/account.xx.properties
@@ -211,3 +211,8 @@ account.howOftenShouldWeSend=X
 account.administrativeChangesSuchAs=X
 account.tipsAndFeatures=X
 account.idLikeToReceiveTheOrcidTips=X
+account.privacypolicy=X
+account.setTheFrequency=X
+account.setTheFrequencyAdministrative=X
+account.setTheFrequencyMember=X
+=X
-Original file line number
+Diff line change
@@ Expand Up / @@ -91,4 +91,4 @@ h4 { @@
     .margin-bottom-32 {
       margin-bottom: 32px;
-    }
+    }