Merge remote-tracking branch 'origin/UICAL-271' into uical-268

folio-org · Sep 20, 2023 · 39c80af · 39c80af
2 parents 1df09ee + df57a75
commit 39c80af
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/build-npm-release.yml b/.github/workflows/build-npm-release.yml
@@ -27,7 +27,7 @@ jobs:
       PUBLISH_MOD_DESCRIPTOR: 'true'
       FOLIO_NPM_REGISTRY: 'https://repository.folio.org/repository/npm-folio/'
       FOLIO_MD_REGISTRY: 'https://folio-registry.dev.folio.org'
-      NODEJS_VERSION: '16'
+      NODEJS_VERSION: '18'
       JEST_JUNIT_OUTPUT_DIR: 'artifacts/jest-junit'
       JEST_COVERAGE_REPORT_DIR: 'artifacts/coverage-jest/lcov-report/'
       BIGTEST_JUNIT_OUTPUT_DIR: 'artifacts/runTest'
@@ -203,6 +203,7 @@ jobs:
 
       - name: Exclude some CI-generated artifacts in package
         run: |
+          echo "artifacts" >> .npmignore
           echo ".github" >> .npmignore
           echo ".scannerwork" >> .npmignore
           cat .npmignore

diff --git a/.github/workflows/build-npm.yml b/.github/workflows/build-npm.yml
@@ -22,7 +22,7 @@ jobs:
       PUBLISH_MOD_DESCRIPTOR: 'true'
       FOLIO_NPM_REGISTRY: 'https://repository.folio.org/repository/npm-folioci/'
       FOLIO_MD_REGISTRY: 'https://folio-registry.dev.folio.org'
-      NODEJS_VERSION: '16'
+      NODEJS_VERSION: '18'
       JEST_JUNIT_OUTPUT_DIR: 'artifacts/jest-junit'
       JEST_COVERAGE_REPORT_DIR: 'artifacts/coverage-jest/lcov-report/'
       SQ_LCOV_REPORT: 'artifacts/coverage-jest/lcov.info'
@@ -145,6 +145,7 @@ jobs:
       - name: Exclude some CI-generated artifacts in package
         if: ${{ github.ref == 'refs/heads/master' || github.ref  == 'refs/heads/main' }}
         run: |
+          echo "artifacts" >> .npmignore
           echo ".github" >> .npmignore
           echo ".scannerwork" >> .npmignore
           cat .npmignore

diff --git a/translations/ui-calendar/en_GB.json b/translations/ui-calendar/en_GB.json
@@ -1,6 +1,6 @@
 {
     "meta.title": "Calendar",
-    "permission.view": "Settings (Calendar): Can view calendar events",
+    "permission.view": "Settings (Calendar): Can view existing calendars",
     "midnight": "Midnight",
     "calendarForm.title.create": "New calendar",
     "calendarForm.title.edit": "Edit calendar",

diff --git a/translations/ui-calendar/en_SE.json b/translations/ui-calendar/en_SE.json
@@ -1,6 +1,6 @@
 {
     "meta.title": "Calendar",
-    "permission.view": "Settings (Calendar): Can view calendar events",
+    "permission.view": "Settings (Calendar): Can view existing calendars",
     "midnight": "Midnight",
     "calendarForm.title.create": "New calendar",
     "calendarForm.title.edit": "Edit calendar",