Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update common.json #1147

Merged
merged 6 commits into from
Mar 20, 2024
Merged

Update common.json #1147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
619e1a3
Update common.json
gysimichael Mar 19, 2024
d75c4a7
Merge branch 'main' into gysimichael-patch-2
MiraGeowerkstatt Mar 20, 2024
621d8e1
Merge branch 'main' into gysimichael-patch-2
MiraGeowerkstatt Mar 20, 2024
c5846eb
Merge branch 'main' into gysimichael-patch-2
MiraGeowerkstatt Mar 20, 2024
749d0d9
Merge branch 'main' into gysimichael-patch-2
MiraGeowerkstatt Mar 20, 2024
91c0031
Fix cy tests
MiraGeowerkstatt Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/client/cypress/e2e/editor/completion.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,13 +451,13 @@ describe("completion crud tests", () => {
setSelect("materialId", 1);

addCompletion();
handlePrompt("Backfill: Unsaved changes", "Cancel");
handlePrompt("Sealing/Backfilling: Unsaved changes", "Cancel");
isHeaderTabSelected(0);
isContentTabSelected("backfill");

// reset content changes when switching header tabs
addCompletion();
handlePrompt("Backfill: Unsaved changes", "Reset");
handlePrompt("Sealing/Backfilling: Unsaved changes", "Reset");
isHeaderTabSelected(1);
cancelEditing();
setContentTab("backfill");
Expand All @@ -473,7 +473,7 @@ describe("completion crud tests", () => {
setSelect("kindId", 1);
setSelect("materialId", 1);
addCompletion();
handlePrompt("Backfill: Unsaved changes", "Save");
handlePrompt("Sealing/Backfilling: Unsaved changes", "Save");
isHeaderTabSelected(1);
cancelEditing();
setContentTab("backfill");
Expand Down
12 changes: 6 additions & 6 deletions src/client/public/locale/en/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"addCompletion": "Add completion",
"addCasing": "Add casing",
"addCasingElement": "Add casing element",
"addBackfill": "Add backfill",
"addBackfill": "Add sealing/backfilling",
"addHydrotest": "Add hydrotest",
"addHydrotestResult": "Add result",
"addFieldMeasurement": "Add field measurement",
Expand Down Expand Up @@ -78,7 +78,7 @@
"deletelayer": "Delete this layer",
"deletelayerconfirmation": "You are about to delete this layer, how do you want to proceed?",
"deleteCompletionTitle": "Do you really want to delete this completion?",
"deleteCompletionMessage": "This completion including its casings, instruments and backfills will be permanently deleted from the database.",
"deleteCompletionMessage": "This completion including its casings, instruments and sealing/backfilling will be permanently deleted from the database.",
"deleteTitle": "Do you really want to delete this entry?",
"deleteMessage": "The entry will be permanently deleted from the database.",
"deleting": "Deleting {{what}}",
Expand Down Expand Up @@ -142,7 +142,7 @@
"extendlower": "Extend lower layer to top",
"extendupper": "Extend upper layer to bottom",
"facies_description": "Facies description",
"backfill": "Backfill",
"backfill": "Sealing/Backfilling",
"filterByHierarchicalUnits": "Filter by hierarchical units",
"filterbymap": "Filter by map",
"filterByName": "Filter by name",
Expand Down Expand Up @@ -197,7 +197,7 @@
"italian": "Italian",
"borehole_type": "Borehole type",
"kindCasingLayer": "Casing type",
"kindBackfill": "Type of backfill / sealing",
"kindBackfill": "Type of sealing/backfilling",
"kindInstrument": "Type of instrument",
"lastname": "Surname",
"alteration": "Alteration",
Expand Down Expand Up @@ -250,7 +250,7 @@
"mainStratigraphy": "This is the main stratigraphy",
"map": "Map",
"materialCasingLayer": "Casing material",
"materialBackfill": "Backfill / Sealing material",
"materialBackfill": "Sealing/backfilling material",
"maxfileSizeExceeded": "Maximum file size exceeded",
"meter": "Meter",
"msgAddStratigraphy": "For the recording of a stratigraphic profile please click the plus symbol at the top left",
Expand All @@ -265,7 +265,7 @@
"msgDisclaimer_publish_title": "Publish disclaimer",
"msgEnablingUser": "You are going to re-enable the user \"{{user}}\". This user will be able to login and apply modifications based on its roles.",
"msgEnablingWorkgroup": "You are going to reenable the workgroup \"{{workgroup}}\". Users belonging to this workgroup will be able to again apply modifications based on their roles.",
"msgBackfillEmpty": "No backfill available",
"msgBackfillEmpty": "No sealing/backfilling available",
"msgIdentifierAlreadyUsed": "ID type already in use",
"msgIdentifierDeletionAlreadyUsed": "This ID type is used and therefore cannot be deleted",
"msgInstrumentsEmpty": "No instrumentation available",
Expand Down
Loading