search

hotosm / osm-tasking-manager2

Designed and built for Humanitarian OpenStreetMap Team collaborative emergency/disaster mapping, the OSM Tasking Manager 2.0 divides an area into individual squares that can be rapidly mapped by thousands of volunteers.
http://tasks.hotosm.org
Other
425 stars 156 forks source link

Task lock history duration #935

Closed pgiraud closed 7 years ago

pgiraud commented 7 years ago

With this pull request, lock and unlock steps in task history are merged and duration is displayed.

capture d ecran 2017-01-08 a 15 35 41

Related to https://github.com/hotosm/osm-tasking-manager2/issues/469 and https://github.com/hotosm/osm-tasking-manager2/issues/452

Please review.

Piskvor commented 7 years ago

Looks much more readable, great! (just two cosmetic issues - console log and "during")

bgirardot commented 7 years ago

I agree this looks great, but the English is incorrect.

It should be "... for x minutes" or " ... for the duration of ... " but "during" is not correct.

Is this wording in the library?

pgiraud commented 7 years ago

It should be "... for x minutes" or " ... for the duration of ... " but "during" is not correct.

It has already been mentioned and fixed.

pgiraud commented 7 years ago

You have to update the sudmodules

git submodule update --init

bgirardot commented 7 years ago

that fixed it, thank you very much. I thought

git submodule update --recursive

would do the job, but it did not, --init did

bgirardot commented 7 years ago

This looks great.

I am curious, how did the strings get translated? Was that part of js lib ?

pgiraud commented 7 years ago

how did the strings get translated? Was that part of js lib ?

Exactly.

bgirardot commented 7 years ago

@pgiraud I do not see how to review this again, but i did review it and it looks great. Please merge at your convenience.