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

Enhancement/6078 ohsome now my contributions #10

Merged
merged 4 commits into from
Oct 12, 2023
Merged

Enhancement/6078 ohsome now my contributions #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c7f928
fix stats tooltip typo
royallsilwallz Oct 10, 2023
a858e01
Merge pull request #6021 from hotosm/enhancement/5999-ohsomeNow-stats
ramyaragupathy Oct 10, 2023
547e0ce
Revert changes to yarn.lock in #6021 (#6076)
HelNershingThapa Oct 11, 2023
de8bfc3
replace zero with - for ohsomeNow stats no value case in My Contribut…
royallsilwallz Oct 11, 2023
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
2 changes: 1 addition & 1 deletion frontend/src/components/statsTimestamp/messages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ export default defineMessages({
project: {
id: 'stats.ohsome.timestamp.project',
defaultMessage:
'These stats were retrieved using the default changeset comment of the project and were last updated at {formattedDate}',
'These stats were retrieved using the default changeset comment of the project and were last updated at {formattedDate} ({timeZone}).',
},
});
4 changes: 2 additions & 2 deletions frontend/src/components/userDetail/elementsMapped.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,12 @@ export const ElementsMapped = ({ userStats, osmStats }) => {
<StatsCard
icon={<MarkerIcon className={iconClass} style={iconStyle} />}
description={<FormattedMessage {...messages.poiMapped} />}
value={osmStats.total_poi_count_add || 0}
value={osmStats.total_poi_count_add || '-'}
/>
<StatsCard
icon={<WavesIcon className={iconClass} style={iconStyle} />}
description={<FormattedMessage {...messages.waterwaysMapped} />}
value={osmStats.total_waterway_km_add || 0}
value={osmStats.total_waterway_km_add || '-'}
/>
</div>
<div className="cf w-100 relative tr pt3 pr3">
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@
"project.stats.changesets": "Changesets",
"project.stats.edits": "Edits",
"stats.ohsome.timestamp.generic": "These statistics come from ohsomeNow Stats and were last updated at {formattedDate} ({timeZone}). Missing fields will be made available soon!",
"stats.ohsome.timestamp.project": "These stats were retrieved using the default changeset comment of the project and were last updated at {formattedDate} ({timeZone})",
"stats.ohsome.timestamp.project": "These stats were retrieved using the default changeset comment of the project and were last updated at {formattedDate} ({timeZone}).",
"project.tasks.unsaved_map_changes.title": "You have some unsaved map changes",
"project.tasks.unsaved_map_changes.split": "Save or undo it to be able to split the task",
"project.tasks.unsaved_map_changes.unlock": "Save or undo it to be able to select another task",
Expand Down
Loading
Loading