Skip to content

Commit

Permalink
Merge branch 'main' into task/main/CST-15593
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrea Barbasso committed Sep 27, 2024
2 parents e2dc89c + cbd681d commit a2193a1
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 18 deletions.
10 changes: 5 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
"filesize": "^6.1.0",
"http-proxy-middleware": "^1.0.5",
"http-terminator": "^3.2.0",
"isbot": "^3.6.10",
"isbot": "^5.1.17",
"js-cookie": "2.2.1",
"js-yaml": "^4.1.0",
"json5": "^2.2.3",
Expand Down
2 changes: 1 addition & 1 deletion server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import * as expressStaticGzip from 'express-static-gzip';
/* eslint-enable import/no-namespace */
import axios from 'axios';
import LRU from 'lru-cache';
import isbot from 'isbot';
import { isbot } from 'isbot';
import { createCertificate } from 'pem';
import { createServer } from 'https';
import { json } from 'body-parser';
Expand Down
2 changes: 1 addition & 1 deletion src/app/navbar/navbar.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/** Mobile menu styling **/
@media screen and (max-width: map-get($grid-breakpoints, md)-0.02) {
.navbar {
width: 100%;
width: 100vw;
background-color: var(--bs-white);
position: absolute;
overflow: hidden;
Expand Down
18 changes: 12 additions & 6 deletions src/assets/i18n/de.json5
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
// "401.unauthorized": "unauthorized",
"401.unauthorized": "unautorisiert",



// "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.",
"403.help": "Sie sind nicht berechtigt, auf diese Seite zuzugreifen. Über den Button unten auf der Seite gelangen Sie zurück zur Startseite.",

Expand All @@ -20,8 +18,6 @@
// "403.forbidden": "forbidden",
"403.forbidden": "verboten",



// "404.help": "We can't find the page you're looking for. The page may have been moved or deleted. You can use the button below to get back to the home page. ",
"404.help": "Die Seite konnte nicht gefunden werden. Eventuell wurde sie verschoben oder gelöscht. Über den Button unten auf der Seite gelangen Sie zurück zur Startseite.",

Expand All @@ -31,6 +27,16 @@
// "404.page-not-found": "page not found",
"404.page-not-found": "Seite nicht gefunden",

// "500.page-internal-server-error": "Service unavailable",
"500.page-internal-server-error": "Dienst nicht verfügbar",

// "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
"500.help": "Der Dienst steht momentan nicht zur Verfügung. Bitte versuchen Sie es später noch einmal.",

// "500.link.home-page": "Take me to the home page",
"500.link.home-page": "Zur Startseite",


// "admin.access-control.epeople.breadcrumbs": "EPeople",
"admin.access-control.epeople.breadcrumbs": "Personen suchen",

Expand Down Expand Up @@ -5560,10 +5566,10 @@
"submission.sections.general.deposit_error_notice": "Beim Einreichen des Items ist ein Fehler aufgetreten. Bitte versuchen Sie es später noch einmal.",

// "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
"submission.sections.general.deposit_success_notice": "Veröffentlichung erfolgreich eingereicht",
"submission.sections.general.deposit_success_notice": "Veröffentlichung erfolgreich eingereicht.",

// "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
"submission.sections.general.discard_error_notice": "Beim Verwerfen der Einreichung ist ein Fehler aufgetreten. Bitte versuchen Sie es später noch einmal",
"submission.sections.general.discard_error_notice": "Beim Verwerfen der Einreichung ist ein Fehler aufgetreten. Bitte versuchen Sie es später noch einmal.",

// "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
"submission.sections.general.discard_success_notice": "Einreichung erfolgreich verworfen.",
Expand Down
8 changes: 4 additions & 4 deletions src/assets/i18n/en.json5
Original file line number Diff line number Diff line change
Expand Up @@ -1460,7 +1460,7 @@

"community.edit.notifications.unauthorized": "You do not have privileges to make this change",

"community.edit.notifications.error": "An error occured while editing the community",
"community.edit.notifications.error": "An error occurred while editing the community",

"community.edit.return": "Back",

Expand Down Expand Up @@ -1662,7 +1662,7 @@

"curation.form.submit.error.head": "Running the curation task failed",

"curation.form.submit.error.content": "An error occured when trying to start the curation task.",
"curation.form.submit.error.content": "An error occurred when trying to start the curation task.",

"curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",

Expand Down Expand Up @@ -1926,7 +1926,7 @@

"forgot-email.form.error.head": "Error when trying to reset password",

"forgot-email.form.error.content": "An error occured when attempting to reset the password for the account associated with the following email address: {{ email }}",
"forgot-email.form.error.content": "An error occurred when attempting to reset the password for the account associated with the following email address: {{ email }}",

"forgot-password.title": "Forgot Password",

Expand Down Expand Up @@ -4102,7 +4102,7 @@

"register-page.registration.error.head": "Error when trying to register email",

"register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
"register-page.registration.error.content": "An error occurred when registering the following email address: {{ email }}",

"register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",

Expand Down

0 comments on commit a2193a1

Please sign in to comment.