Skip to content
Open
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
4 changes: 4 additions & 0 deletions .github/workflows/pr_test_frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ jobs:
working-directory: ./frontend
run: yarn install

- name: Check for duplicate translation message ids
working-directory: ./frontend
run: yarn build-locales

- name: Run Yarn test
working-directory: ./frontend
run: yarn test
Expand Down
24 changes: 15 additions & 9 deletions frontend/src/components/badges/messages.js
Original file line number Diff line number Diff line change
@@ -1,30 +1,36 @@
import { defineMessages } from 'react-intl';

export default defineMessages({
add: { id: 'management.fields.managers.add', defaultMessage: 'Add' },
import managementMessages from '../teamsAndOrgs/messages';

const messages = defineMessages({
badgeInfo: { id: 'management.titles.badge_information', defaultMessage: 'Badge information' },
badges: { id: 'management.badges', defaultMessage: 'Badges' },
building: { id: 'management.badges.building', defaultMessage: 'buildings added' },
cancel: { id: 'management.button.cancel', defaultMessage: 'Cancel' },
changeset: { id: 'management.badges.changeset', defaultMessage: 'Number of changesets' },
changesets: { id: 'management.badges.changesets', defaultMessage: 'Changesets' },
description: { id: 'management.fields.description', defaultMessage: 'Description' },
hidden: { id: 'management.badges.hidden', defaultMessage: 'Hide this badge from users' },
highway: { id: 'management.badges.highway', defaultMessage: 'km of highways added' },
road: { id: 'management.badges.road', defaultMessage: 'km of roads added' },
image: { id: 'management.fields.organisation.image', defaultMessage: 'Image' },
imageError: { id: 'management.badges.imageError', defaultMessage: 'Error uploading image' },
manage: { id: 'management.link.manage', defaultMessage: 'Manage {entity}' },
metric: { id: 'management.badges.metric', defaultMessage: 'Metric' },
name: { id: 'management.fields.name', defaultMessage: 'Name' },
needsRequirements: { id: 'management.badges.needsRequirements', defaultMessage: 'Needs at least one requirement' },
noBadges: { id: 'management.no_badges', defaultMessage: 'There are no badges yet.' },
poi: { id: 'management.badges.poi', defaultMessage: 'Points of Interest' },
remove: { id: 'management.remove', defaultMessage: 'Remove' },
requirements: { id: 'management.badges.requirements', defaultMessage: 'Requirements' },
save: { id: 'management.button.save', defaultMessage: 'Save' },
uploadNew: { id: 'management.badges.uploadNew', defaultMessage: 'Upload new' },
uploading: { id: 'management.badges.uploading', defaultMessage: 'Uploading...' },
value: { id: 'management.badges.value', defaultMessage: 'Value' },
waterway: { id: 'management.badges.waterway', defaultMessage: 'km of waterways added' },
});

export default {

Check warning on line 26 in frontend/src/components/badges/messages.js

View workflow job for this annotation

GitHub Actions / Build Static Files

Assign object to a variable before exporting as module default
...messages,
add: managementMessages.add,
badges: managementMessages.badges,
cancel: managementMessages.cancel,
description: managementMessages.description,
image: managementMessages.image,
manage: managementMessages.manage,
name: managementMessages.name,
save: managementMessages.save,
};
4 changes: 0 additions & 4 deletions frontend/src/components/header/messages.js
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,4 @@ export default defineMessages({
id: 'serviceWorker.dialog.remindMeLater',
defaultMessage: 'Remind me later',
},
sandbox: {
id: 'project.detail.sandbox',
defaultMessage: 'Sandbox Mode',
},
});
18 changes: 12 additions & 6 deletions frontend/src/components/levels/messages.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
import { defineMessages } from 'react-intl';

export default defineMessages({
import managementMessages from '../teamsAndOrgs/messages';

const messages = defineMessages({
add: { id: 'management.levels.add', defaultMessage: 'Add' },
approvals_required: { id: 'management.levels.approvals_required', defaultMessage: 'Approvals required' },
cancel: { id: 'management.button.cancel', defaultMessage: 'Cancel' },
color: { id: 'management.levels.color', defaultMessage: 'Color' },
levelInfoTitle: { id: 'management.titles.level_information', defaultMessage: 'Level information' },
levels: { id: 'management.levels', defaultMessage: 'Levels' },
manage: { id: 'management.link.manage', defaultMessage: 'Manage {entity}' },
name: { id: 'management.fields.name', defaultMessage: 'Name' },
noLevels: { id: 'management.no_levels', defaultMessage: 'There are no levels yet.' },
peer_review: { id: 'management.levels.peer_review', defaultMessage: 'Require peer review' },
required_badges: { id: 'management.levels.required_badges', defaultMessage: 'Required badges' },
save: { id: 'management.button.save', defaultMessage: 'Save' },
needsBadges: { id: 'management.levels.needsBadges', defaultMessage: 'Needs at least one badge' },
});

export default {

Check warning on line 16 in frontend/src/components/levels/messages.js

View workflow job for this annotation

GitHub Actions / Build Static Files

Assign object to a variable before exporting as module default
...messages,
cancel: managementMessages.cancel,
levels: managementMessages.levels,
manage: managementMessages.manage,
name: managementMessages.name,
save: managementMessages.save,
};
6 changes: 3 additions & 3 deletions frontend/src/components/projectEdit/messages.js
Original file line number Diff line number Diff line change
Expand Up @@ -752,15 +752,15 @@ export default defineMessages({
defaultMessage: 'Something went wrong!',
},
databse: {
id: 'management.projects.create.review.database',
id: 'management.projects.edit.database',
defaultMessage: 'Database',
},
databaseOSM: {
id: 'management.projects.create.review.database.osm',
id: 'management.projects.edit.database.osm',
defaultMessage: 'OSM',
},
databaseSandbox: {
id: 'management.projects.create.review.database.sandbox',
id: 'management.projects.edit.database.sandbox',
defaultMessage: 'Sandbox',
},
disabledSandboxPriority: {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/taskSelection/messages.js
Original file line number Diff line number Diff line change
Expand Up @@ -859,7 +859,7 @@ export default defineMessages({
'You need to be member of one of the mapping teams to be able to map this project.',
},
infoBox: {
id: 'project.detail.sandbox',
id: 'project.detail.sandbox.info',
defaultMessage: 'Sandbox(Practice)',
},
infoBoxTooltip: {
Expand Down
Loading
Loading