## What

Now workbench displays correct alert message for accessible repositories in French. ## Why Workbench had a typo in the alert message for accessible repositories in French. ## How * Changed the template rendering the alert message because the word order of the sentences in both English and French is different. * Changed the labels in both locale files.
Ontotext-AD · Nov 29, 2023 · 7dfa460 · 7dfa460
1 parent 8a79ebe
commit 7dfa460
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 32 deletions.
diff --git a/src/i18n/locale-en.json b/src/i18n/locale-en.json
@@ -937,10 +937,9 @@
     "core.errors.fedx.repository.warning.msg": " view is not supported by FedX Repository.",
     "core.errors.select.repository.warning.msg": "Click one of the repositories below to connect to it",
     "core.errors.or.create.repository.warning.msg": " or create a new repository",
-    "core.errors.no.accessible.warning.msg": "There are no accessible ",
-    "core.errors.writable": "writable ",
-    "core.errors.repositories": "repositories",
-    "core.errors.create.repository.warning.msg": ". You can create a new repository",
+    "core.errors.no.accessible.repositories.warning.msg": "There are no accessible repositories.",
+    "core.errors.no.accessible.writable.repositories.warning.msg": "There are no accessible writable repositories.",
+    "core.errors.create.repository.warning.msg": " You can create a new repository",
     "core.errors.show.remote.locations.btn": "Show remote locations",
     "core.errors.hide.remote.locations.btn": "Hide remote locations",
     "core.errors.location.local.label": "Local",

diff --git a/src/i18n/locale-fr.json b/src/i18n/locale-fr.json
@@ -937,10 +937,9 @@
     "core.errors.fedx.repository.warning.msg": "n'est pas supporté par FedX Repository.",
     "core.errors.select.repository.warning.msg": "Cliquez sur l'un des dépôts ci-dessous pour vous y connecter",
     "core.errors.or.create.repository.warning.msg": "ou créez un nouveau dépôt",
-    "core.errors.no.accessible.warning.msg": "Il n'y a pas de dépôt accessible",
-    "core.errors.writable": "accessible en écriture",
-    "core.errors.repositories": "accessible en écriture",
-    "core.errors.create.repository.warning.msg": ". Vous pouvez créer un nouveau dépôt",
+    "core.errors.no.accessible.repositories.warning.msg": "Il n'y a pas de dépôts accessibles.",
+    "core.errors.no.accessible.writable.repositories.warning.msg": "Il n'y a pas de dépôts accessibles en écriture.",
+    "core.errors.create.repository.warning.msg": " Vous pouvez créer un nouveau dépôt",
     "core.loading.longer.than.usual.warning": "GraphDB Workbench est en cours de chargement mais cela prend plus de temps que d'habitude, veuillez patienter...",
     "core.loading.refresh.warning": "Si le Workbench n'est pas encore chargé, veuillez essayer de vider le cache de votre navigateur et de recharger la page.",
     "copy.to.clipboard.modal.paragraph": "Copier l'URL dans le presse-papiers",

diff --git a/src/js/angular/core/templates/core-errors.html b/src/js/angular/core/templates/core-errors.html
@@ -13,16 +13,17 @@
                         <strong ng-if="isActiveRepoOntopType()">{{getActiveRepository()}}</strong>
                         <span ng-if="canWriteActiveRepo() && isActiveRepoOntopType()">{{'core.errors.read.only.repository.warning.msg' | translate}}</span>
                         <span ng-if="canWriteActiveRepo() && isActiveRepoFedXType()"> <strong>{{title | translate}}</strong>{{'core.errors.fedx.repository.warning.msg' | translate}}</span></div>
-                    <small>
-                        <span ng-if="getAccessibleRepositories().length && isLicenseValid()">
-                            {{'core.errors.select.repository.warning.msg' | translate}}<span ng-if="canManageRepositories()">{{'core.errors.or.create.repository.warning.msg' | translate}}</span>.
-                        </span>
+                        <small>
+                            <span ng-if="getAccessibleRepositories().length && isLicenseValid()">
+                                {{'core.errors.select.repository.warning.msg' | translate}}<span ng-if="canManageRepositories()">{{'core.errors.or.create.repository.warning.msg' | translate}}</span>.
+                            </span>
 
-                        <span ng-hide="getAccessibleRepositories().length">
-                            {{'core.errors.no.accessible.warning.msg' | translate}}<span ng-if="isRestricted">{{'core.errors.writable' | translate}}
-                        </span>{{'core.errors.repositories' | translate}}<span ng-if="canManageRepositories()">{{'core.errors.create.repository.warning.msg' | translate}}</span>.
-                        </span>
-                    </small>
+                            <span ng-hide="getAccessibleRepositories().length">
+                                <span ng-if="isRestricted">{{'core.errors.no.accessible.writable.repositories.warning.msg' | translate}}</span>
+                                <span ng-if="!isRestricted">{{'core.errors.no.accessible.repositories.warning.msg' | translate}}</span>
+                                <span ng-if="canManageRepositories()">{{'core.errors.create.repository.warning.msg' | translate}}</span>.
+                            </span>
+                        </small>
                 </div>
                 <div ng-if="!getActiveRepository()">
                     <button class="btn btn-link" ng-click="toggleShowRemoteLocations()">

diff --git a/test-cypress/fixtures/locale-en.json b/test-cypress/fixtures/locale-en.json
@@ -168,7 +168,8 @@
         },
         "errors": {
             "loading_rules": "Error during ACL rules",
-            "updating_rules": "Error during ACL rules update"
+            "updating_rules": "Error during ACL rules update",
+            "duplicated_rules": "Every ACL rule should be unique."
         }
     },
     "config.name.label": "Config name",
@@ -926,10 +927,9 @@
     "core.errors.fedx.repository.warning.msg": " view is not supported by FedX Repository.",
     "core.errors.select.repository.warning.msg": "Click one of the repositories below to connect to it",
     "core.errors.or.create.repository.warning.msg": " or create a new repository",
-    "core.errors.no.accessible.warning.msg": "There are no accessible ",
-    "core.errors.writable": "writable ",
-    "core.errors.repositories": "repositories",
-    "core.errors.create.repository.warning.msg": ". You can create a new repository",
+    "core.errors.no.accessible.repositories.warning.msg": "There are no accessible repositories.",
+    "core.errors.no.accessible.writable.repositories.warning.msg": "There are no accessible writable repositories.",
+    "core.errors.create.repository.warning.msg": " You can create a new repository",
     "core.errors.show.remote.locations.btn": "Show remote locations",
     "core.errors.hide.remote.locations.btn": "Hide remote locations",
     "core.errors.location.local.label": "Local",
@@ -1187,6 +1187,7 @@
     "repo.properties": "Repository properties",
     "repo.id.label": "Repository ID*",
     "edit.repo.id.tooltip": "Edit repository id",
+    "edit.repo.id.cannot_edit_in_cluster.tooltip": "Cannot rename repository while in cluster.",
     "invalid.repo.name.error": "Repository name can contain only letters (a-z, A-Z), numbers (0-9), \"-\" and \"_\"",
     "upload.custom.ruleset.file": "Upload a custom ruleset file.",
     "custom.ruleset": "Custom ruleset...",
@@ -1705,6 +1706,7 @@
     "target.label": "Target",
     "show.blank.nodes.label": "Show Blank Nodes",
     "download.as.label": "Download as",
+    "download.as.progress.msg": "Downloading SPARQL result",
     "visual.graph.label": "Visual graph",
     "explore.graph.visually.popover": "Click to explore the graph visually",
     "pred.label": "Predicate",
@@ -1915,20 +1917,13 @@
     "ttyg.settings.topk.tooltip": "Number of results returned to the chat bot when it requests more information. More results will provide more information but they may also introduce noise.",
     "ttyg.settings.echo.vector.query": "Echo vector query",
     "ttyg.settings.echo.vector.query.tooltip": "If enabled the bot will use the generated queries as feedback to the GPT API.",
-    "global.operations_statuses.queries.title": "Running query",
-    "global.operations_statuses.queries.title.plural": "Running queries",
-    "global.operations_statuses.updates.title": "Running update",
-    "global.operations_statuses.updates.title.plural": "Running updates",
-    "global.operations_statuses.imports.title": "Running import",
-    "global.operations_statuses.imports.title.plural": "Running imports",
+    "global.operations_statuses.queries.title": "Running queries",
+    "global.operations_statuses.updates.title": "Running updates",
+    "global.operations_statuses.imports.title": "Running imports",
     "global.operations_statuses.CREATE_BACKUP_IN_PROGRESS.title": "Creating backup",
-    "global.operations_statuses.CREATE_BACKUP_IN_PROGRESS.title.plural": "Creating backups",
     "global.operations_statuses.RESTORE_BACKUP_IN_PROGRESS.title": "Restoring backup",
-    "global.operations_statuses.RESTORE_BACKUP_IN_PROGRESS.title.plural": "Restoring backups",
     "global.operations_statuses.CREATE_CLOUD_BACKUP_IN_PROGRESS.title": "Creating cloud backup",
-    "global.operations_statuses.CREATE_CLOUD_BACKUP_IN_PROGRESS.title.plural": "Creating cloud backups",
     "global.operations_statuses.RESTORE_CLOUD_BACKUP_IN_PROGRESS.title": "Restoring cloud backup",
-    "global.operations_statuses.RESTORE_CLOUD_BACKUP_IN_PROGRESS.title.plural": "Restoring cloud backups",
     "global.operations_statuses.IN_SYNC.title": "In sync",
     "global.operations_statuses.RECOVERING.title": "Recovering",
     "global.operations_statuses.OUT_OF_SYNC.title": "Out of sync",