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

Jump to bottom

Add locale strings (and some missing strings) for group view #6816

Open
wants to merge 5 commits into
base: vega
Choose a base branch
from
Open

Add locale strings (and some missing strings) for group view #6816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2648f2c
Fix items to be of type array
Nov 4, 2023
47d9917
add strings
Nov 6, 2023
9b12613
Merge branch 'vega' into add-locale-strings
Nov 6, 2023
5f79c8d
.
Nov 6, 2023
2aad556
.
Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 40 additions & 0 deletions server/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,9 +329,17 @@
"admin.groups.importSuccess": "Rules imported successfully!",
"admin.groups.info": "Group Info",
"admin.groups.name": "Group Name",
"admin.groups.nameInvalidChars": "The group name contains invalid characters.",
"admin.groups.nameHint": "Name of the group",
"admin.groups.overview": "Overview",
"admin.groups.permissions": "Permissions",
"admin.groups.permissions.adminHint": "Can access the administration area.",
"admin.groups.permissions.userHint": "Can create / manage users (but not users with administrative permissions)",
"admin.groups.permissions.groupHint": "Can create / manage groups and assign permissions (but not manage:system) / page rules",
"admin.groups.permissions.navigationHint": "Can manage site navigation",
"admin.groups.permissions.themeHint": "Can modify site theme settings",
"admin.groups.permissions.sitesHint": "Can create / manage sites",
"admin.groups.permissions.systemHint": "Can manage and access everything. Root administrator.",
Comment on lines 335 to +342
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can't add sub-keys to a key that already has a value.

Subsequent keys should instead use the format admin.groups.permissionsAdminHint

"admin.groups.redirectOnFirstLogin": "First-time Login Redirect",
"admin.groups.redirectOnFirstLoginHint": "Optionally redirect the user to a specific page when he/she login for the first time. Leave empty to use the site-defined value.",
"admin.groups.redirectOnLogin": "Redirect on Login",
Expand All @@ -343,15 +351,47 @@
"admin.groups.ruleDeny": "Deny",
"admin.groups.ruleForceAllow": "Force Allow",
"admin.groups.ruleLocales": "Locale(s)",
"admin.groups.ruleMatch": "Match",
"admin.groups.ruleMatchEnd": "Path Ends With...",
"admin.groups.ruleMatchExact": "Path Is Exactly...",
"admin.groups.ruleMatchRegex": "Path Matches Regex...",
"admin.groups.ruleMatchStart": "Path Starts With...",
"admin.groups.ruleMatchTag": "Has Any Tag...",
"admin.groups.ruleMatchTagAll": "Has All Tags...",
"admin.groups.rulePath": "Path",
"admin.groups.ruleSites": "Site(s)",
"admin.groups.ruleUntitled": "Untitled Rule",
"admin.groups.rules": "Rules",
"admin.groups.rules.read.pages.hint": "Can view and search pages.",
"admin.groups.rules.read.pages.title": "Read Pages",
"admin.groups.rules.write.pages.hint": "Can create and edit pages.",
"admin.groups.rules.write.pages.title": "Write Pages",
"admin.groups.rules.review.pages.hint": "Can review and approve edits submitted by users.",
"admin.groups.rules.review.pages.title": "Review Pages",
"admin.groups.rules.manage.pages.hint": "Can move existing pages to other locations the user has write access to.",
"admin.groups.rules.manage.pages.title": "Manage Pages",
"admin.groups.rules.delete.pages.hint": "Can delete existing pages.",
"admin.groups.rules.delete.pages.title": "Delete Pages",
"admin.groups.rules.write.styles.hint": "Can insert CSS styles in pages.",
"admin.groups.rules.write.styles.title": "Use CSS",
"admin.groups.rules.write.scripts.hint": "Can insert JavaScript in pages.",
"admin.groups.rules.write.scripts.title": "Use JavaScript",
"admin.groups.rules.read.source.hint": "Can view pages source.",
"admin.groups.rules.read.source.title": "View Page Source",
"admin.groups.rules.read.history.hint": "Can view previous versions of pages.",
"admin.groups.rules.read.history.title": "View Page History",
"admin.groups.rules.read.assets.hint": "Can view / use assets (such as images and files) in pages.",
"admin.groups.rules.read.assets.title": "View Assets",
"admin.groups.rules.write.assets.hint": "Can upload new assets (such as images and files).",
"admin.groups.rules.write.assets.title": "Upload Assets",
"admin.groups.rules.manage.assets.hint": "Can edit and delete existing assets (such as images and files).",
"admin.groups.rules.manage.assets.title": "Manage Assets",
"admin.groups.rules.read.comments.hint": "Can view page comments.",
"admin.groups.rules.read.comments.title": "Read Comments",
"admin.groups.rules.write.comments.hint": "Can post new comments on pages.",
"admin.groups.rules.write.comments.title": "Write Comments",
"admin.groups.rules.manage.comments.hint": "Can edit and delete existing page comments.",
"admin.groups.rules.manage.comments.title": "Manage Comments",
Comment on lines +365 to +394
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above. use camelCase instead of dots, e.g. admin.groups.ruleReadPagesHint

"admin.groups.rulesNone": "This group doesn't have any rules yet.",
"admin.groups.selectedLocales": "Any Locale | {n} locale only | {count} locales selected",
"admin.groups.selectedSites": "Any Site | 1 site selected | {count} sites selected",
Expand Down
74 changes: 37 additions & 37 deletions ux/src/components/GroupEditOverlay.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,49 +597,49 @@ const usersHeaders = [
const permissions = [
{
permission: 'access:admin',
hint: 'Can access the administration area.',
hint: t('admin.groups.permissions.adminHint'),
warning: false,
restrictedForSystem: true,
disabled: false
},
{
permission: 'manage:users',
hint: 'Can create / manage users (but not users with administrative permissions)',
hint: t('admin.groups.permissions.userHint'),
warning: false,
restrictedForSystem: true,
disabled: false
},
{
permission: 'manage:groups',
hint: 'Can create / manage groups and assign permissions (but not manage:system) / page rules',
hint: t('admin.groups.permissions.groupHint'),
warning: true,
restrictedForSystem: true,
disabled: false
},
{
permission: 'manage:navigation',
hint: 'Can manage site navigation',
hint: $t('admin.groups.permissions.navigationHint'),
warning: false,
restrictedForSystem: true,
disabled: false
},
{
permission: 'manage:theme',
hint: 'Can modify site theme settings',
hint: t('admin.groups.permissions.themeHint'),
warning: false,
restrictedForSystem: true,
disabled: false
},
{
permission: 'manage:sites',
hint: 'Can create / manage sites',
hint: $t('admin.groups.permissions.sitesHint'),
warning: true,
restrictedForSystem: true,
disabled: false
},
{
permission: 'manage:system',
hint: 'Can manage and access everything. Root administrator.',
hint: t('admin.groups.permissions.systemHint'),
warning: true,
restrictedForSystem: true,
disabled: true
Expand All @@ -649,120 +649,120 @@ const permissions = [
const rules = [
{
permission: 'read:pages',
title: 'Read Pages',
hint: 'Can view and search pages.',
title: t('admin.groups.rules.read.pages.title'),
hint: t('admin.groups.rules.read.pages.hint'),
warning: false,
restrictedForSystem: false,
disabled: false
},
{
permission: 'write:pages',
title: 'Write Pages',
hint: 'Can create and edit pages.',
title: t('admin.groups.rules.write.pages.title'),
hint: t('admin.groups.rules.write.pages.hint'),
warning: false,
restrictedForSystem: true,
disabled: false
},
{
permission: 'review:pages',
title: 'Review Pages',
hint: 'Can review and approve edits submitted by users.',
title: t('admin.groups.rules.review.pages.title'),
hint: t('admin.groups.rules.review.pages.hint'),
warning: false,
restrictedForSystem: true,
disabled: false
},
{
permission: 'manage:pages',
title: 'Manage Pages',
hint: 'Can move existing pages to other locations the user has write access to.',
title: t('admin.groups.rules.manage.pages.title'),
hint: t('admin.groups.rules.manage.pages.hint'),
warning: false,
restrictedForSystem: true,
disabled: false
},
{
permission: 'delete:pages',
title: 'Delete Pages',
hint: 'Can delete existing pages.',
title: t('admin.groups.rules.delete.pages.title'),
hint: t('admin.groups.rules.delete.pages.hint'),
warning: false,
restrictedForSystem: true,
disabled: false
},
{
permission: 'write:styles',
title: 'Use CSS',
hint: 'Can insert CSS styles in pages.',
title: t('admin.groups.rules.write.styles.title'),
hint: t('admin.groups.rules.write.styles.hint'),
warning: false,
restrictedForSystem: true,
disabled: false
},
{
permission: 'write:scripts',
title: 'Use JavaScript',
hint: 'Can insert JavaScript in pages.',
title: t('admin.groups.rules.write.scripts.title'),
hint: t('admin.groups.rules.write.scripts.hint'),
warning: false,
restrictedForSystem: true,
disabled: false
},
{
permission: 'read:source',
title: 'View Page Source',
hint: 'Can view pages source.',
title: t('admin.groups.rules.read.source.title'),
hint: t('admin.groups.rules.read.source.hint'),
warning: false,
restrictedForSystem: false,
disabled: false
},
{
permission: 'read:history',
title: 'View Page History',
hint: 'Can view previous versions of pages.',
title: t('admin.groups.rules.read.history.title'),
hint: t('admin.groups.rules.read.history.hint'),
warning: false,
restrictedForSystem: false,
disabled: false
},
{
permission: 'read:assets',
title: 'View Assets',
hint: 'Can view / use assets (such as images and files) in pages.',
title: t('admin.groups.rules.read.assets.title'),
hint: t('admin.groups.rules.read.assets.hint'),
warning: false,
restrictedForSystem: false,
disabled: false
},
{
permission: 'write:assets',
title: 'Upload Assets',
hint: 'Can upload new assets (such as images and files).',
title: t('admin.groups.rules.write.assets.title'),
hint: t('admin.groups.rules.write.assets.hint'),
warning: false,
restrictedForSystem: true,
disabled: false
},
{
permission: 'manage:assets',
title: 'Manage Assets',
hint: 'Can edit and delete existing assets (such as images and files).',
title: t('admin.groups.rules.manage.assets.title'),
hint: t('admin.groups.rules.manage.assets.hint'),
warning: false,
restrictedForSystem: true,
disabled: false
},
{
permission: 'read:comments',
title: 'Read Comments',
hint: 'Can view page comments.',
title: t('admin.groups.rules.read.comments.title'),
hint: t('admin.groups.rules.read.comments.hint'),
warning: false,
restrictedForSystem: false,
disabled: false
},
{
permission: 'write:comments',
title: 'Write Comments',
hint: 'Can post new comments on pages.',
title: t('admin.groups.rules.write.comments.title'),
hint: t('admin.groups.rules.write.comments.hint'),
warning: false,
restrictedForSystem: false,
disabled: false
},
{
permission: 'manage:comments',
title: 'Manage Comments',
hint: 'Can edit and delete existing page comments.',
title: t('admin.groups.rules.manage.comments.title'),
hint: t('admin.groups.rules.manage.comments.hint'),
warning: false,
restrictedForSystem: true,
disabled: false
Expand Down