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.

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

Correct plurial Questions or singular question #934

Merged
merged 9 commits into from
Oct 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 24 additions & 10 deletions enterprise/backend/poetry.lock

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

1 change: 1 addition & 0 deletions enterprise/backend/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ readme = "README.md"
[tool.poetry.dependencies]
python = "^3.11"
django = "^5.1"
python-dotenv = "^1.0.1"

[tool.poetry.group.dev.dependencies]
pytest = "^8.3.2"
Expand Down
2 changes: 2 additions & 0 deletions frontend/messages/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,8 @@
"backupLoadingError": "حدث خطأ أثناء تحميل النسخة الاحتياطية.",
"backupGreaterVersionError": "لا يمكن تحميل النسخة الاحتياطية، إصدار النسخة الاحتياطية أعلى من الإصدار الحالي للتطبيق الخاص بك.",
"backupLowerVersionError": "حدث خطأ، قد تكون نسخة النسخ الاحتياطي قديمة جدًا، إذا كان الأمر كذلك فيجب تحديثها قبل إعادة المحاولة.",
"questionSingular": "سؤال",
"questionPlural": "أسئلة",
"NoPreviewMessage": "لا يوجد معاينة متاحة.",
"entityAssessmentEvidenceHelpText": "استبيان خارجي",
"associatedEntities": "الكيانات المرتبطة",
Expand Down
2 changes: 2 additions & 0 deletions frontend/messages/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,8 @@
"backupLoadingError": "Beim Laden der Sicherung ist ein Fehler aufgetreten.",
"backupGreaterVersionError": "Das Backup kann nicht geladen werden, die Version des Backups ist höher als die aktuelle Version Ihrer Anwendung.",
"backupLowerVersionError": "Ein Fehler ist aufgetreten. Die Sicherungsversion ist möglicherweise zu alt. Wenn dies der Fall ist, muss sie vor einem erneuten Versuch aktualisiert werden.",
"questionSingular": "Frage",
"questionPlural": "Fragen",
"NoPreviewMessage": "Keine Vorschau verfügbar.",
"entityAssessmentEvidenceHelpText": "Ein externer Fragebogen",
"associatedEntities": "Verbundene Unternehmen",
Expand Down
2 changes: 2 additions & 0 deletions frontend/messages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -778,6 +778,8 @@
"librariesCanOnlyBeLoadedByAdmin": "Libraries can only be loaded by an administrator",
"catalog": "Catalog",
"operations": "Operations",
"questionSingular": "Question",
"questionPlural": "Questions",
"fillMetadataURL": "Option 1: Fill the metadata url",
"fillSSOSLOURLx509cert": "Option 2: Fill the SSO URL, SLO URL and x509cert"
}
2 changes: 2 additions & 0 deletions frontend/messages/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,8 @@
"backupLoadingError": "Se produjo un error al cargar la copia de seguridad.",
"backupGreaterVersionError": "No se puede cargar la copia de seguridad, la versión de la copia de seguridad es superior a la versión actual de la aplicación.",
"backupLowerVersionError": "Se produjo un error, la versión de respaldo puede ser demasiado antigua, si es así debe actualizarse antes de volver a intentarlo.",
"questionSingular": "Pregunta",
"questionPlural": "Preguntas",
"NoPreviewMessage": "No hay vista previa disponible.",
"entityAssessmentEvidenceHelpText": "Un cuestionario externo",
"associatedEntities": "Entidades asociadas",
Expand Down
2 changes: 2 additions & 0 deletions frontend/messages/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,8 @@
"backupLoadingError": "Une erreur s'est produite lors du chargement de la sauvegarde.",
"backupGreaterVersionError": "Impossible de charger la sauvegarde, la version de la sauvegarde est supérieure à la version actuelle de votre application.",
"backupLowerVersionError": "Une erreur s'est produite, la version de sauvegarde est peut-être trop ancienne, si c'est le cas, elle doit être mise à jour avant de réessayer.",
"questionSingular": "Question",
"questionPlural": "Questions",
"NoPreviewMessage": "Aucun aperçu disponible.",
"entityAssessmentEvidenceHelpText": "Un questionnaire externe",
"associatedEntities": "Entités associées",
Expand Down
2 changes: 2 additions & 0 deletions frontend/messages/hi.json
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,8 @@
"backupLoadingError": "बैकअप लोड करते समय एक त्रुटि हुई.",
"backupGreaterVersionError": "बैकअप लोड नहीं किया जा सकता, बैकअप का संस्करण आपके एप्लिकेशन के वर्तमान संस्करण से अधिक है.",
"backupLowerVersionError": "कोई त्रुटि हुई, बैकअप संस्करण बहुत पुराना हो सकता है, यदि ऐसा है तो पुनः प्रयास करने से पहले उसे अद्यतन करना आवश्यक है।",
"questionSingular": "सवाल",
"questionPlural": "प्रश्न",
"NoPreviewMessage": "कोई पूर्वावलोकन उपलब्ध नहीं है.",
"entityAssessmentEvidenceHelpText": "एक बाहरी प्रश्नावली",
"associatedEntities": "संबद्ध संस्थाएं",
Expand Down
2 changes: 2 additions & 0 deletions frontend/messages/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,8 @@
"backupLoadingError": "Si è verificato un errore durante il caricamento del backup.",
"backupGreaterVersionError": "Impossibile caricare il backup, la versione del backup è successiva alla versione corrente dell'applicazione.",
"backupLowerVersionError": "Si è verificato un errore, la versione di backup potrebbe essere troppo vecchia. In tal caso, è necessario aggiornarla prima di riprovare.",
"questionSingular": "Domanda",
"questionPlural": "Domande",
"NoPreviewMessage": "Nessuna anteprima disponibile.",
"entityAssessmentEvidenceHelpText": "Un questionario esterno",
"associatedEntities": "Entità collegate",
Expand Down
2 changes: 2 additions & 0 deletions frontend/messages/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,8 @@
"backupLoadingError": "Er is een fout opgetreden tijdens het laden van de back-up.",
"backupGreaterVersionError": "De back-up kan niet worden geladen. De versie van de back-up is hoger dan de huidige versie van uw applicatie.",
"backupLowerVersionError": "Er is een fout opgetreden. Mogelijk is de back-upversie te oud. Als dat zo is, moet u deze bijwerken voordat u het opnieuw probeert.",
"questionSingular": "Vraag",
"questionPlural": "Vragen",
"NoPreviewMessage": "Geen voorbeeld beschikbaar.",
"entityAssessmentEvidenceHelpText": "Een externe vragenlijst",
"associatedEntities": "Geassocieerde entiteiten",
Expand Down
2 changes: 2 additions & 0 deletions frontend/messages/pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,8 @@
"backupLoadingError": "Wystąpił błąd podczas ładowania kopii zapasowej.",
"backupGreaterVersionError": "Nie można załadować kopii zapasowej. Wersja kopii zapasowej jest nowsza niż bieżąca wersja aplikacji.",
"backupLowerVersionError": "Wystąpił błąd. Wersja kopii zapasowej może być za stara. Jeśli tak, należy ją zaktualizować przed ponowną próbą.",
"questionSingular": "Pytanie",
"questionPlural": "Pytania",
"NoPreviewMessage": "Podgląd niedostępny.",
"entityAssessmentEvidenceHelpText": "Kwestionariusz zewnętrzny",
"associatedEntities": "Podmioty powiązane",
Expand Down
2 changes: 2 additions & 0 deletions frontend/messages/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,8 @@
"backupLoadingError": "Ocorreu um erro ao carregar o backup.",
"backupGreaterVersionError": "Não é possível carregar o backup, a versão do backup é superior à versão atual do seu aplicativo.",
"backupLowerVersionError": "Ocorreu um erro, a versão de backup pode ser muito antiga. Se for o caso, ela deve ser atualizada antes de tentar novamente.",
"questionSingular": "Pergunta",
"questionPlural": "Questões",
"NoPreviewMessage": "Nenhuma pré-visualização disponível.",
"entityAssessmentEvidenceHelpText": "Um questionário externo",
"associatedEntities": "Entidades associadas",
Expand Down
2 changes: 2 additions & 0 deletions frontend/messages/ro.json
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,8 @@
"backupLoadingError": "A apărut o eroare la încărcarea copiei de rezervă.",
"backupGreaterVersionError": "Nu se poate încărca copia de rezervă, versiunea copiei de rezervă este mai mare decât versiunea curentă a aplicației dvs.",
"backupLowerVersionError": "A apărut o eroare, versiunea de rezervă poate fi prea veche, dacă da, trebuie actualizată înainte de a reîncerca.",
"questionSingular": "Întrebare",
"questionPlural": "Întrebări",
"NoPreviewMessage": "Nicio previzualizare disponibilă.",
"entityAssessmentEvidenceHelpText": "Un chestionar extern",
"associatedEntities": "Entități asociate",
Expand Down
2 changes: 2 additions & 0 deletions frontend/messages/ur.json
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,8 @@
"backupLoadingError": "بیک اپ لوڈ کرتے وقت ایک خرابی پیش آگئی۔",
"backupGreaterVersionError": "بیک اپ لوڈ نہیں ہو سکتا، بیک اپ کا ورژن آپ کی ایپلیکیشن کے موجودہ ورژن سے زیادہ ہے۔",
"backupLowerVersionError": "ایک خرابی پیش آ گئی، بیک اپ ورژن بہت پرانا ہو سکتا ہے، اگر ایسا ہے تو اسے دوبارہ کوشش کرنے سے پہلے اپ ڈیٹ کرنا ضروری ہے۔",
"questionSingular": "سوال",
"questionPlural": "سوالات",
"NoPreviewMessage": "کوئی پیش نظارہ دستیاب نہیں ہے۔",
"entityAssessmentEvidenceHelpText": "ایک بیرونی سوالنامہ",
"associatedEntities": "وابستہ ادارے",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@
export let data: PageData;
export let form: ActionData;

import ConfirmModal from '$lib/components/Modals/ConfirmModal.svelte';
import { displayScoreColor } from '$lib/utils/helpers';
import { expandedNodesState } from '$lib/utils/stores';
import { ProgressRadial } from '@skeletonlabs/skeleton';
import List from '$lib/components/List/List.svelte';

breadcrumbObject.set(data.compliance_assessment);
const tree = data.tree;

Expand Down Expand Up @@ -118,12 +124,6 @@

let expandedNodes: TreeViewNode[] = [];

import ConfirmModal from '$lib/components/Modals/ConfirmModal.svelte';
import { displayScoreColor } from '$lib/utils/helpers';
import { expandedNodesState } from '$lib/utils/stores';
import { ProgressRadial } from '@skeletonlabs/skeleton';
import List from '$lib/components/List/List.svelte';

expandedNodes = $expandedNodesState;
$: expandedNodesState.set(expandedNodes);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,19 @@
{/each}
{/if}
{#if node.question && node.question.questions}
<span class="badge" style="background-color: pink; color: {darkenColor('#FFC0CB', 0.5)}"
>{node.question.questions.length} {m.questionOrQuestions()}</span
>
{#if node.question.questions.length > 1}
<span
class="badge"
style="background-color: pink; color: {darkenColor('#FFC0CB', 0.5)}"
>{node.question.questions.length} {m.questionPlural()}</span
>
{:else}
<span
class="badge"
style="background-color: pink; color: {darkenColor('#FFC0CB', 0.5)}"
>{node.question.questions.length} {m.questionSingular()}</span
>
{/if}
{/if}
</div>
</div>
Expand Down
Loading