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

Refactored the "menu" items in the language json files #3736

Merged
merged 1 commit into from
Feb 12, 2024
Merged

Refactored the "menu" items in the language json files #3736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
62 changes: 31 additions & 31 deletions CSETWebNg/src/app/layout/top-menus/top-menus.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
class="dropdown-toggle navbar-menu-header" (keyup.arrowdown)="toolsTrigger.openMenu()"
*ngIf="configSvc.installationMode !== 'RRA'">
<span class="cset-icons-tools fs-base-4 mr-2 align-middle"></span>
<span>{{ t('tools.tools') }}</span>
<span>{{ t('menu.tools.tools') }}</span>
</button>

<mat-menu #tools="matMenu" class="menu-panel">
<button mat-menu-item (click)="enableProtectedFeature()" *ngIf="showMenuItem('enable protected features')">
<span class="cset-icons-key-shield fs-base mr-2 align-middle"></span>
<span>{{ t('tools.enable protected features') }}</span>
<span>{{ t('menu.tools.enable protected features') }}</span>
</button>

<button mat-menu-item (click)="setMeritExportPath()"
Expand All @@ -46,41 +46,41 @@
<button mat-menu-item [disabled]="!inAssessment()" *ngIf="showItemForCurrentSkin('assessment documents')"
[ngClass]="{'disabled-menu-item' : !inAssessment()}" (click)="showAssessDocs()">
<span class="cset-icons-books-stack-1 fs-base mr-2 align-middle"></span>
<span>{{ t('tools.assessment documents') }}</span>
<span>{{ t('menu.tools.assessment documents') }}</span>
</button>
<button mat-menu-item [disabled]="!inAssessment()" *ngIf="showMenuItem('parameter editor')"
[ngClass]="{'disabled-menu-item' : !inAssessment()}" (click)="editParameters()">
<span class="cset-icons-puzzle fs-base mr-2 align-middle"></span>
<span>{{ t('tools.parameter editor') }}</span>
<span>{{ t('menu.tools.parameter editor') }}</span>
</button>
<button mat-menu-item [disabled]="!inAssessment()" [ngClass]="{'disabled-menu-item' : !inAssessment()}"
(click)="showExcelExportDialog()">
<span class="cset-icons-export-excel fs-base mr-2 align-middle"></span>
<span>{{ t('tools.export assessment to excel') }}</span>
<span>{{ t('menu.tools.export assessment to excel') }}</span>
</button>

<hr class="menu-divider" />

<button mat-menu-item [routerLink]="['/importModule']" *ngIf="showMenuItem('import modules')">
<span class="cset-icons-module fs-base mr-2 align-middle"></span>
<span>{{ t('tools.import modules') }}</span>
<span>{{ t('menu.tools.import modules') }}</span>
</button>
<button mat-menu-item [routerLink]="['/set-list']" *ngIf="showMenuItem('module builder')">
<span class="cset-icons-module fs-base mr-2 align-middle"></span>
<span>{{ t('tools.module builder') }}</span>
<span>{{ t('menu.tools.module builder') }}</span>
</button>
<button mat-menu-item [routerLink]="['/module-content-launch']"
*ngIf="showMenuItem('module content report')">
<span class="cset-icons-module fs-base mr-2 align-middle"></span>
<span>{{ t('tools.module content report') }}</span>
<span>{{ t('menu.tools.module content report') }}</span>
</button>
<button mat-menu-item (click)="navigateTrend()" *ngIf="showMenuItem('trend')">
<span class="cset2-icons-trend fs-base mr-2 align-middle"></span>
<span>{{ t('tools.trend') }}</span>
<span>{{ t('menu.tools.trend') }}</span>
</button>
<button mat-menu-item (click)="navigateCompare()" *ngIf="showMenuItem('compare')">
<span class="cset2-icons-compare fs-base mr-2 align-middle"></span>
<span>{{ t('tools.compare') }}</span>
<span>{{ t('menu.tools.compare') }}</span>
</button>
</mat-menu>
</ng-container>
Expand All @@ -90,7 +90,7 @@
<a mat-button class="navbar-menu-header ws-no-wrap"
href="index.html?returnPath=resource-library" target="_blank">
<span class="cset-icons-library fs-base-4 mr-2 align-middle"></span>
<span>{{t('resource library')}}</span>
<span>{{t('menu.resource library')}}</span>
</a>
</div>

Expand All @@ -100,14 +100,14 @@
<button mat-button [matMenuTriggerFor]="help" #helpTrigger="matMenuTrigger"
(keyup.arrowdown)="helpTrigger.openMenu()" class="dropdown-toggle navbar-menu-header">
<span class="cset-icons-question-circle-outline fs-base-4 mr-2 align-middle"></span>
<span>{{ t('help.help') }}</span>
<span>{{ t('menu.help.help') }}</span>
</button>

<mat-menu #help="matMenu" class="menu-panel">
<a *ngIf="configSvc.installationMode !== 'ACET'" mat-menu-item href="{{docUrl}}htmlhelp/index.htm"
target="_blank">
<span class="cset-icons-book-open fs-base mr-2 align-middle"></span>
<span>CSET User Guide</span>
<span>{{ t('menu.help.cset user guide') }}</span>
</a>
<!-- <a *ngIf="isGuideVisible('ACET')" mat-menu-item target="_blank" href="{{docUrl}}htmlhelp_acet/index.htm">
<span class="cset-icons-book-open fs-base mr-2 align-middle"></span>
Expand Down Expand Up @@ -164,16 +164,16 @@

<button mat-menu-item (click)="about()">
<span class="cset-icons-cset-lock fs-base mr-2 align-middle"></span>
<span>{{ t('help.about') }}</span>
<span>{{ t('menu.help.about') }}</span>
</button>
<button mat-menu-item (click)="showKeyboardShortcuts()" *ngIf="!configSvc.isMobile()">
<span class="cset-icons-keyboard-shortcuts-key fs-base mr-2 align-middle"></span>
<span>{{ t('help.keyboard shortcuts') }}</span>
<span>{{ t('menu.help.keyboard shortcuts') }}</span>
</button>

<button mat-menu-item [matMenuTriggerFor]="legal">
<span class="fas fa-balance-scale fs-base mr-2 align-middle"></span>
<span>{{ t('help.legal.legal') }}</span>
<span>{{ t('menu.help.legal.legal') }}</span>
</button>

</mat-menu>
Expand All @@ -183,16 +183,16 @@
<mat-menu #legal="matMenu" class="menu-panel">
<a mat-menu-item target="_blank" href="{{docUrl}}ApplicationDocuments/AccessibilityStatement.pdf">
<span class="cset-icons-accessibility-doc fs-base mr-2 align-middle"></span>
<span>{{ 'help.legal.accessibility document' | transloco }}</span>
<span>{{ 'menu.help.legal.accessibility document' | transloco }}</span>
</a>
<button mat-menu-item (click)="advisory()">
<span class="cset-icons-advisory fs-base mr-2 align-middle"></span>
<span>{{ 'help.legal.advisory' | transloco }}</span>
<span>{{ 'menu.help.legal.advisory' | transloco }}</span>
</button>

<button mat-menu-item (click)="termsOfUse()">
<span class="cset-icons-handshake fs-base mr-2 align-middle"></span>
<span>{{ 'help.legal.terms of use' | transloco }}</span>
<span>{{ 'menu.help.legal.terms of use' | transloco }}</span>
</button>
</mat-menu>
</div>
Expand All @@ -203,7 +203,7 @@
<button mat-button [matMenuTriggerFor]="help" #helpTrigger="matMenuTrigger"
(keyup.arrowdown)="helpTrigger.openMenu()" class="dropdown-toggle navbar-menu-header">
<span class="cset-icons-question-circle-outline fs-base-4 mr-2 align-middle"></span>
<span>{{ t('help.help') }}</span>
<span>{{ t('menu.help.help') }}</span>
</button>

<mat-menu #help="matMenu" class="menu-panel">
Expand All @@ -218,16 +218,16 @@

<button mat-menu-item (click)="about()">
<span class="cset2-icons-hexbug2 fs-base mr-2 align-middle"></span>
<span>{{ t('help.about') }}</span>
<span>{{ t('menu.help.about') }}</span>
</button>
<button mat-menu-item (click)="showKeyboardShortcuts()">
<span class="cset-icons-keyboard-shortcuts-key fs-base mr-2 align-middle"></span>
<span>{{ t('help.keyboard shortcuts') }}</span>
<span>{{ t('menu.help.keyboard shortcuts') }}</span>
</button>

<button mat-menu-item [matMenuTriggerFor]="legal">
<span class="fas fa-balance-scale fs-base mr-2 align-middle"></span>
<span>{{ t('help.legal.legal') }}</span>
<span>{{ t('menu.help.legal.legal') }}</span>
</button>

</mat-menu>
Expand All @@ -237,16 +237,16 @@
<mat-menu #legal="matMenu" class="menu-panel">
<a mat-menu-item target="_blank" href="{{docUrl}}ApplicationDocuments/AccessibilityStatement.pdf">
<span class="cset-icons-accessibility-doc fs-base mr-2 align-middle"></span>
<span>{{ 'help.legal.accessibility document' | transloco }}</span>
<span>{{ 'menu.help.legal.accessibility document' | transloco }}</span>
</a>
<button mat-menu-item (click)="advisory()">
<span class="cset-icons-advisory fs-base mr-2 align-middle"></span>
<span>{{ 'help.legal.advisory' | transloco }}</span>
<span>{{ 'menu.help.legal.advisory' | transloco }}</span>
</button>

<button mat-menu-item (click)="termsOfUse()">
<span class="cset-icons-handshake fs-base mr-2 align-middle"></span>
<span>{{ 'help.legal.terms of use' | transloco }}</span>
<span>{{ 'menu.help.legal.terms of use' | transloco }}</span>
</button>
</mat-menu>
</div>
Expand All @@ -267,23 +267,23 @@
<mat-menu #usermenu="matMenu" class="menu-panel">
<button mat-menu-item *ngIf="showUserMenuItem()" (click)="editUser()">
<span class="cset-icons-profile fs-base mr-2 align-middle"></span>
<span>User Profile</span>
<span>{{ t('menu.user.user profile') }}</span>
</button>
<button mat-menu-item (click)="goHome()">
<span class="cset-icons-clipboard-check fs-base mr-2 align-middle"></span>
<span>{{ t('my assessments') }}</span>
<span>{{ t('menu.user.my assessments') }}</span>
</button>
<button mat-menu-item *ngIf="showUserMenuItem()" (click)="resetPassword()">
<span class="cset-icons-key fs-base mr-2 align-middle"></span>
<span>Change Password</span>
<span>{{ t('menu.user.change password') }}</span>
</button>
<button mat-menu-item *ngIf="showMenuItem('language picker')" (click)="editLanguage()">
<span class="fas fa-language fs-base mr-2 align-middle"></span>
<span>{{t('user language')}}</span>
<span>{{t('menu.user.user language')}}</span>
</button>
<button mat-menu-item *ngIf="showUserMenuItem()" (click)="auth.logout()">
<span class="cset-icons-logout fs-base mr-2 align-middle"></span>
<span>{{t('buttons.logout')}}</span>
<span>{{t('menu.user.logout')}}</span>
</button>
</mat-menu>
</div>
Expand Down
104 changes: 56 additions & 48 deletions CSETWebNg/src/assets/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"my assessments": "My Assessments",
"import": "Import",
"export all": "Export All",
"resource library": "Resource Library",
"new assessment": "New Assessment",
"status": "Status",
"completion-questions": "{{complete}}/{{total}} {{qAlias}} questions answered",
Expand Down Expand Up @@ -372,7 +371,6 @@
"feedback icon": "Π—Π½Π°Ρ‡ΠΎΠΊ Π·Π²ΠΎΡ€ΠΎΡ‚Π½ΡŒΠΎΠ³ΠΎ Π·Π²'язку",
"copy feedback": "ΠšΠΎΠΏΡ–ΡŽΠ²Π°Ρ‚ΠΈ тСкст Π·Π²ΠΎΡ€ΠΎΡ‚Π½ΡŒΠΎΠ³ΠΎ Π·Π²'язку Π² Π±ΡƒΡ„Π΅Ρ€ ΠΎΠ±ΠΌΡ–Π½Ρƒ",
"create feedback email": "Π‘Ρ‚Π²ΠΎΡ€ΠΈΡ‚ΠΈ Π΅Π»Π΅ΠΊΡ‚Ρ€ΠΎΠ½Π½ΠΈΠΉ лист Ρ–Π· Π·Π²ΠΎΡ€ΠΎΡ‚Π½Ρ–ΠΌ Π·Π²'язком Ρƒ стандартному ΠΏΠΎΡˆΡ‚ΠΎΠ²ΠΎΠΌΡƒ ΠΊΠ»Ρ–Ρ”Π½Ρ‚Ρ–",

"risk description": "Risk Description",
"validation approach": "Validation Approach",
"prevent encryption": "Stops the 'enter password' screen from appearing on export",
Expand Down Expand Up @@ -551,32 +549,31 @@
"executive summary": "Executive Summary",
"tab title": "Executive Summary",
"title page title": "EXECUTIVE SUMMARY",
"site information": "Site Information",
"calculated level": "CALCULATED LEVEL",
"overall values": "Overall Values",
"summary percent compliance": "Summary Percent Compliance",
"evaluation": "Evaluation Against Selected Standards and Question Sets",
"standards summary": "Standards Summary",
"standard or question set": "Standard or Question Set",
"areas of concern": "Areas of Concern Top Subjects and Questions",
"top subject areas": "The top subject areas and questions identify those areas where attention will either provide the most immediate impact or protect against the greatest vulnerabilities.",
"concern categories": "Top Categories of Concern",
"concern questions": "Top Questions of Concern",
"analysis of network components": "Analysis of Network Components",
"combined component summary": "Combined Component Summary",
"identified warnings": "The number of identified warnings and recommendations in the basic analysis of the user-defined system diagram is {{count}}",
"see network details": "See the section 'Findings and Recommendations from Basic Network Analysis' for details.",
"answer distribution": "[UK] Answer Distribution by Component Type",
"calculated general security": "Calculated General Security Assurance Levels (SAL)",
"onsite": "Onsite",
"offsite": "Offsite",
"physical injury": "Physical Injury",
"hospital injury": "Hospital Injury",
"death": "Death",
"capital assets": "Capital Assets",
"economic impact": "Economic Impact",
"site information": "Site Information",
"calculated level": "CALCULATED LEVEL",
"overall values": "Overall Values",
"summary percent compliance": "Summary Percent Compliance",
"evaluation": "Evaluation Against Selected Standards and Question Sets",
"standards summary": "Standards Summary",
"standard or question set": "Standard or Question Set",
"areas of concern": "Areas of Concern Top Subjects and Questions",
"top subject areas": "The top subject areas and questions identify those areas where attention will either provide the most immediate impact or protect against the greatest vulnerabilities.",
"concern categories": "Top Categories of Concern",
"concern questions": "Top Questions of Concern",
"analysis of network components": "Analysis of Network Components",
"combined component summary": "Combined Component Summary",
"identified warnings": "The number of identified warnings and recommendations in the basic analysis of the user-defined system diagram is {{count}}",
"see network details": "See the section 'Findings and Recommendations from Basic Network Analysis' for details.",
"answer distribution": "[UK] Answer Distribution by Component Type",
"calculated general security": "Calculated General Security Assurance Levels (SAL)",
"onsite": "Onsite",
"offsite": "Offsite",
"physical injury": "Physical Injury",
"hospital injury": "Hospital Injury",
"death": "Death",
"capital assets": "Capital Assets",
"economic impact": "Economic Impact",
"environmental impact": "Environmental Impact"

},
"site summary": {
"site summary": "Site Summary",
Expand Down Expand Up @@ -701,27 +698,38 @@
"section": "Section",
"no reference documents available": "no reference documents available"
},
"tools": {
"tools": "Tools",
"enable protected features": "Enable Protected Features",
"assessment documents": "Assessment Documents",
"parameter editor": "Parameter Editor",
"export assessment to excel": "Export Assessment to Excel",
"import modules": "Import Modules",
"module builder": "Module Builder",
"module content report": "Module Content Report",
"trend": "Trend",
"compare": "Compare"
},
"help": {
"help": "Help",
"about": "About",
"keyboard shortcuts": "Keyboard Shortcuts",
"legal": {
"legal": "Legal",
"accessibility document": "Accessibility Document",
"advisory": "Advisory",
"terms of use": "Terms of Use"
"menu": {
"tools": {
"tools": "Tools",
"enable protected features": "Enable Protected Features",
"assessment documents": "Assessment Documents",
"parameter editor": "Parameter Editor",
"export assessment to excel": "Export Assessment to Excel",
"import modules": "Import Modules",
"module builder": "Module Builder",
"module content report": "Module Content Report",
"trend": "Trend",
"compare": "Compare"
},
"resource library": "Resource Library",
"help": {
"help": "Help",
"cset user guide": "CSET User Guide",
"about": "About",
"keyboard shortcuts": "Keyboard Shortcuts",
"legal": {
"legal": "Legal",
"accessibility document": "Accessibility Document",
"advisory": "Advisory",
"terms of use": "Terms of Use"
}
},
"user": {
"user profile": "User Profile",
"my assessments": "My Assessments",
"change password": "Change Password",
"user language": "User Language",
"logout": "Logout"
}
},
"merge examinations": {
Expand Down
Loading
Loading