Fin de l’i18n et de la l10n en fr et en

TODO.md

@@ -4,7 +4,7 @@
 * [ ] Se faire héberger sur <openstreetmap.fr> histoire d’avoir une adresse web mémorisable
 * [X] Mettre des projets en avant sur la page d’accueil (genre ceux pour lesquels il y a eu de l’activité récemment, ceux qui viennent d’être créés, etc)
 * [X] Mettre des raccourcis clavier sur les boutons
-* […] Internationaliser tout ça et y localiser au moins en anglais
+* [X] Internationaliser tout ça et y localiser au moins en anglais
 * [ ] API pour interactions automatisées
 * [ ] outil : centroide ou emprise d’une liste arbirtraire de communes (par nom ou code INSEE)
 * [ ] outil : découpage d'une zone géographique en carrés d'une surface donnée

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "caboulot/omo",
-    "version": "0.0.1",
+    "version": "0.0.2",
     "type": "project",
     "license": "WTFPL",
     "minimum-stability": "stable",

translations/messages.en.yaml

@@ -1,110 +1,154 @@
 exception:
     project_not_found: 'Project not found'
     status_not_found: 'Status not found'
-    task_not_found: __exception.task_not_found
-    task_not_updated: __exception.task_not_updated
+    task_not_found: 'Task not found'
+    task_not_updated: 'Task not updated'
 alert:
     auth_failure: 'Authentification failed'
-    auth_success: 'Authentification successfull !'
-    project_created: __alert.project_created
-    project_not_created: __alert.project_not_created
-    project_not_found: __alert.project_not_found
-    project_updated: __alert.project_updated
-    project_not_updated: __alert.project_not_updated
-    project_removed: __alert.project_removed
-    project_not_removed: __alert.project_not_removed
-    no_overpass_query: __alert.no_overpass_query
-    overpass_please_wait: __alert.overpass_please_wait
-    missing_project: __alert.missing_project
-    task_created: __alert.task_created
-    task_not_created: __alert.task_not_created
-    task_not_found: __alert.task_not_found
-    can_not_comment: __alert.can_not_comment
-    task_not_updated: __alert.task_not_updated
-    task_not_removed: __alert.task_not_removed
-    task_not_modified: __alert.task_not_modified
+    auth_success: 'Authentification success'
+    project_created: 'Project created successfully'
+    project_not_created: 'Unable to create project'
+    project_not_found: 'Project not found'
+    project_updated: 'Project updated successfully'
+    project_not_updated: 'Unable to update project'
+    project_removed: 'Project removed successfully'
+    project_not_removed: 'Unable to remove project'
+    no_overpass_query: 'Project lacks of Overpass query'
+    overpass_please_wait: 'Please wait between Overpass queries'
+    missing_project: 'Project is missing'
+    task_created: 'Task created successfully'
+    task_not_created: 'Unable to create task'
+    task_not_found: 'Task not found'
+    can_not_comment: 'Unable to create comment'
+    task_not_updated: 'Unable to update task'
+    task_not_removed: 'Unable to remove task'
 title:
     popular_projects: 'Popular projects'
-    update_project: __title.update_project
-    create_project: __title.create_project
-    projects: __title.projects
-    map: __title.map
-    tasks: __title.tasks
-    comments: __title.comments
-    import_tasks: __title.import_tasks
-    update_task: __title.update_task
-    create_task: __title.create_task
-    description: __title.description
-    comment: __title.comment
-    source: __title.source
-    tools: __title.tools
+    update_project: 'Update project'
+    create_project: 'Create project'
+    projects: 'Projects'
+    map: 'Map'
+    tasks: 'Tasks'
+    comments: 'Comments'
+    import_tasks: 'Import tasks'
+    update_task: 'Update task'
+    create_task: 'Create task'
+    description: 'Description'
+    comment: 'Comment'
+    source: 'Source'
+    tools: 'Tools'
 text:
     home1: 'Handle tasks, even with nodes (or not).'
-    home2: __text.home2
+    home2: 'The idea here is to have a little simple and collaborative toll, easy to admin and use in order to map things somewhere as a team.'
     home3: 'In order to contact the developer, please send an email to %mailto_link%'
-    login_to_create_project: __text.login_to_create_project
-    see_also: __text.see_also
-    osm: __text.osm
-    osmcha: __text.osmcha
+    login_to_create_project: 'Login is required to create projects.'
+    see_also: 'See also'
+    osm: 'OSM'
+    osmcha: 'OSMCha'
+field:
+    project:
+        name: 'Project name'
+        description: 'Project description'
+        hashtags: 'Hashtags'
+        hashtags_help: 'Space separated words, without <samp>#</samp>'
+        source: Source
+        source_help: 'If multiple separate with <samp>;</samp>'
+        imagery: Imagery
+        imagery_help: 'Refer to <a href="https://josm.openstreetmap.de/wiki/Maps" target="_blank">the wiki</a>'
+        overpass: 'Overpass Query'
+        overpass_help: 'Build it on <a href="https://overpass-turbo.eu/" target="_blank">the website</a>. Omit <samp>[out:json][timeout:25];</samp> before and <samp>out geom;</samp> after.'
+        tags: 'Tags'
+    csv:
+        csv: 'CSV file'
+        csv_mime_constraint: 'Unexpected MIME type'
+        csv_help: 'Regular CSV file (UTF8 encoded, comma separated, enclosed with double quotes, escaped with backslashes and normal UNIX end of lines) where the first line is headings like "name,description,osm,geojson,status" and one of the "todo", "doing" or "done" value in the status column.'
+    task:
+        name: 'Task name'
+        description: 'Task description'
+        geojson: GeoJSON
+        geojson_help: 'The task representation on the map, in <a href="https://en.wikipedia.org/wiki/GeoJSON" target="_blank">GeoJSON</a> format (will also be available as <a href="https://en.wikipedia.org/wiki/GPS_Exchange_Format" target="_blank">GPX</a>). Handy tool&nbsp;: <a href="https://geojson.io/" target="_blank">geojson.io</a>.'
+        osm: 'OSM data'
+        osm_help: 'What to send to JOSM in XML format (see <a href="https://wiki.openstreetmap.org/wiki/OSM_XML" target="_blank">OSM XML - OpenStreetMap Wiki</a>)'
+        status: Status
+        urgent: Urgent
+        urgent_help: 'Optional signed integer.'
+        important: Important
+        important_help: 'Optional signed integer.'
+    city_tool:
+        area: "French admin_level=6 administrative element"
+    osmose_tool:
+        item: Item
+        item_help: 'Refer to the list <a href="https://wiki.openstreetmap.org/wiki/FR:Osmose/issues" target="_blank">on the wiki</a>'
+        source: 'Source ID'
+        class: 'Class ID'
+        limit: Limit
+        limit_help: 'Max number of issues'
+        group_by_city: 'Group issues by cities'
 button:
     close: Close
     toggle_navigation: 'Toggle navigation'
-    more: __button.more
-    goto_projects: __button.goto_projects
-    create_project: __button.create_project
-    details: __button.details
-    back_to_projects: __button.back_to_projects
-    projects: __button.projects
-    update_project: __button.update_project
-    update: __button.update
-    remove_project: __button.remove_project
-    remove: __button.remove
-    query_overpass: __button.query_overpass
-    overpass: __button.overpass
-    import_tasks: __button.import_tasks
-    import: __button.import
-    export_tasks: __button.export_tasks
-    export: __button.export
-    create_task: __button.create_task
-    create: __button.create
-    pick_task: __button.pick_task
-    pick: __button.pick
-    back_to_project: __button.back_to_project
-    project: __button.project
-    update_task: __button.update_task
-    remove_task: __button.remove_task
-    download_task: __button.download_task
-    download: __button.download
-    josm_remote_control: __button.josm_remote_control
-    josm: __button.josm
-    changeset: __button.changeset
+    more: 'More'
+    goto_projects: 'Browse projects'
+    create_project: 'Create project'
+    details: 'Open project'
+    projects: 'Projects'
+    back_to_projects: 'Back to projects'
+    update: 'Update'
+    update_project: 'Update project'
+    remove: 'Remove'
+    remove_project: 'Remove project'
+    overpass: 'Overpass'
+    query_overpass: 'Query Overpass'
+    import_tasks: 'Import tasks'
+    import: 'Import'
+    export_tasks: 'Export tasks'
+    export: 'Export'
+    create_task: 'Create task'
+    create: 'Create'
+    pick_task: 'Pick a random task' 
+    pick: 'Pick'
+    back_to_project: 'Back to project'
+    project: 'Project'
+    update_task: 'Update task'
+    remove_task: 'Remove task'
+    download_task: 'Download task'
+    download: 'Download'
+    josm_remote_control: 'JOSM remote control'
+    josm: 'JOSM'
+    changeset: 'Changeset #%changeset_id%'
+    comment: Comment
+    generate: Generate
 menu:
     on_osm: 'OSM Profile'
     logout: Logout
     login: Login
 map:
-    legend: __map.legend
-    overpass: __map.overpass
-    open_with: __map.open_with
-    or: __map.or
-    osm: __map.osm
-    panoramax: __map.panoramax
-    pifomap: __map.pifomap
-    pifometre: __map.pifometre
-    geohack: __map.geohack
-    geoportail: __map.geoportail
-    f4map: __map.f4map
-    mapillary: __map.mapillary
-    googlemaps: __map.googlemaps
-    bing: __map.bing
+    legend: 'Legend'
+    overpass: 'Overpass'
+    open_with: 'Open with…'
+    osm: 'OSM'
+    panoramax: 'Panoramax'
+    pifomap: 'Pifomap'
+    pifometre: 'Pifomètre'
+    geohack: 'GeoHack'
+    geoportail: 'GéoPortail'
+    f4map: 'F4Map'
+    mapillary: 'Mapillary'
+    googlemaps: 'Google Maps'
+    bing: 'Bing'
 clipboard:
-    copy: __clipboard.copy
+    copy: 'Copy to clipboard'
 popup:
-    see_also: __popup.see_also
-    osm: __popup.osm
-    panoramax: __popup.panoramax
-    waymarkedtrails: __popup.waymarkedtrails
-    josm: __popup.josm
+    see_also: 'See also'
+    osm: 'OSM'
+    panoramax: 'Panoramax'
+    waymarkedtrails: 'WayMarkedTrail'
+    josm: 'JOSM'
+comment:
+    start: '%username% starts task [%task_name%](%task_url%)'
+    reset: '%username% resets task [%task_name%](%task_url%)'
+    finish: '%username% finishes task [%task_name%](%task_url%)'
+    cancel: '%username% cancels task [%task_name%](%task_url%)'
 workflow:
     place:
         todo: 'To do'
@@ -120,18 +164,13 @@ workflow:
         reset_task: 'Reset task'
         reset: Reset
 breadcrumb:
-    projects: __breadcrumb.projects
-    create_project: __breadcrumb.create_project
-    project: __breadcrumb.project
-    create_task: __breadcrumb.create_task
+    projects: 'Projects'
+    create_project: 'Create project'
+    project: 'Project'
+    create_task: 'Create task'
 column:
     task:
-        name: __column.task.name
-        status: __column.task.status
-        important: __column.task.important
-        urgent: __column.task.urgent
-comment:
-    start: __comment.start
-    reset: __comment.reset
-    finish: __comment.finish
-    cancel: __comment.cancel
+        name: 'Task'
+        status: 'Status'
+        important: 'Important'
+        urgent: 'Urgent'

translations/messages.fr.yaml

@@ -82,7 +82,7 @@ field:
         source: 'Identifiant de source'
         class: 'Identifiant de classe'
         limit: Limite
-        limit_help: 'Nombre mmaximal de signalements à renvoyer'
+        limit_help: 'Nombre maximal de signalements à renvoyer'
         group_by_city: 'Regrouper les signalements par commune'
 button:
     close: Fermer