Merge branch 'main' into lmendoza/jun-4-2025-multiple-fixes

Author: cryptalith

.github/workflows/sast.yml

@@ -0,0 +1,54 @@
+name: SAST
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+  schedule:
+    - cron: '45 6 * * *'
+jobs:
+  buildmavenDepTree:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+          cache: 'maven'
+      - name: Generate dependency tree
+        run: |
+          find . -name "pom.xml" -execdir mvn -q dependency:tree -DoutputFile=maven_dep_tree.txt -Dmaven.test.skip=true \;
+      - name: Create zip with all dependency trees
+        run: find . -type f -name 'maven_dep_tree.txt' -exec zip -r deptree.zip {} +
+      - name: Upload zip
+        uses: actions/upload-artifact@v4
+        with:
+          name: deptree
+          path: deptree.zip
+  sast:
+    needs: buildmavenDepTree
+    name: sast
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    env:
+      SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
+    container:
+      image: semgrep/semgrep
+    if: (github.actor != 'dependabot[bot]')
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Download Maven Dependencies
+        uses: actions/download-artifact@v4
+        with:
+          name: deptree
+      - name: Extract zip and run Semgrep
+        run: |
+          unzip -o deptree.zip
+          semgrep ci > /dev/null 2>&1 || exit $?

CHANGELOG.md

@@ -1,3 +1,9 @@
+## v2.115.7 - 2025-06-03
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.115.6...v2.115.7)
+
+- [#2529](https://github.com/ORCID/orcid-angular/pull/2529): lmendoza/jun-2025-multiple-changes
+
 ## v2.115.6 - 2025-05-29
 
 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.115.5...v2.115.6)

src/locale/properties/layout/layout.en.properties

@@ -117,4 +117,4 @@ layout.ariaLabelSearchRegistry=Search the ORCID registry...
 layout.notificationTooltip=You have unread notifications
 layout.notificationTooltipInactive=Notifications inbox
 layout.notifications=Open notification inbox
-layout.notificationsActive=You have unread notifications. Open notification inbox
+layout.notificationsActive=You have unread notifications. Open notification inbox

src/locale/properties/layout/layout.lr.properties

@@ -116,3 +116,5 @@ footer.cookieSettings=LR
 footer.ariaLabelLicense=LR
 layout.ariaLabelConnectingResearchers=LR
 layout.ariaLabelSearchRegistry=LR
+layout.notificationTooltip=LR
+layout.notificationTooltipInactive=LR

src/locale/properties/layout/layout.rl.properties

@@ -117,3 +117,5 @@ footer.ariaLabelLicense=RL
 layour.ariaLabelConnectingResearchers=RL
 layout.ariaLabelSearchRegistry=RL
 layout.ariaLabelConnectingResearchers=RL
+layout.notificationTooltip=RL
+layout.notificationTooltipInactive=RL

src/locale/properties/layout/layout.xx.properties

@@ -116,3 +116,5 @@ footer.cookieSettings=X
 footer.ariaLabelLicense=X
 layout.ariaLabelConnectingResearchers=X
 layout.ariaLabelSearchRegistry=X
+layout.notificationTooltip=X
+layout.notificationTooltipInactive=X