Changeset f517d06 in osmose-frontend


Ignore:
Timestamp:
Apr 27, 2015 10:32:07 PM (5 years ago)
Author:
Frederic Rodrigo <fred.rodrigo@…>
Children:
e7f8984
Parents:
10ac83d
Message:

Replace 'error' by 'issue' in string deplayed at user

Files:
16 edited

Legend:

Unmodified
Added
Removed
  • error.py

    rb23027a rf517d06  
    295295    else: 
    296296        abort(412, "Precondition Failed") 
    297         #print "No error found" 
     297        #print "No issue found" 
    298298 
    299299 
  • errors.py

    r6b53ea4 rf517d06  
    123123        gen = "false-positive" 
    124124    elif request.path.endswith("done"): 
    125         title = _("Fixed errors") 
     125        title = _("Fixed issues") 
    126126        gen = "done" 
    127127    else: 
  • static/map/map.js

    r75e79ce rf517d06  
    3131  map.addControl(editor); 
    3232 
    33   mapOverlay['Osmose Errors Heatmap'] = new OsmoseHeatmap(menu); 
     33  mapOverlay['Osmose Issues Heatmap'] = new OsmoseHeatmap(menu); 
    3434  var osmoseLayer = new OsmoseErrors(menu, urlVars, editor); 
    35   mapOverlay['Osmose Errors'] = osmoseLayer; 
     35  mapOverlay['Osmose Issues'] = osmoseLayer; 
    3636  editor.errors = osmoseLayer; 
    3737 
  • views/byuser/byuser.rss.tpl

    r370abfd rf517d06  
    55    <description>{{_("Statistics for user %s") % ", ".join(users)}}. 
    66%if count < 500: 
    7     {{_("Number of found errors: %d") % count}}. 
     7    {{_("Number of found issues: %d") % count}}. 
    88%else: 
    9     {{_("Number of found errors: more than %d") % count}}. 
     9    {{_("Number of found issues: more than %d") % count}}. 
    1010%end 
    1111    </description> 
  • views/byuser/byuser.tpl

    r84f6b00 rf517d06  
    22%rebase('layout.tpl', title=(_("Statistics for user %s") % ", ".join(users)), rss=rss) 
    33<h1>{{_("User statistics for %s") % ", ".join(users)}}</h1> 
    4 <p>{{_("This page shows errors on elements that were last modified by '%s'. This doesn't means that this user is responsible for all these errors.") % "', '".join(users)}}</p> 
     4<p>{{_("This page shows issues on elements that were last modified by '%s'. This doesn't means that this user is responsible for all these issues.") % "', '".join(users)}}</p> 
    55<p><a href="{{rss}}">{{_("This list is also available via rss.")}}</a></p> 
    66<p> 
    77%if count < 500: 
    8     {{_("Number of found errors: %d") % count}} 
     8    {{_("Number of found issues: %d") % count}} 
    99%else: 
    10     {{_("Number of found errors: more than %d") % count}} 
     10    {{_("Number of found issues: more than %d") % count}} 
    1111%end 
    1212 -  
    13 <a href='../map/#username={{username}}'>{{_("Show errors on a map")}}</a> 
     13<a href='../map/#username={{username}}'>{{_("Show issues on a map")}}</a> 
    1414</p> 
    1515 
  • views/byuser/byuser_count.rss.tpl

    r98d7d83 rf517d06  
    77    <link>http://{{website}}/byuser/{{username}}</link> 
    88    <item> 
    9         <title>{{_("Number of level {level} errors: {count}").format(level=1, count=count[1])}}</title> 
     9        <title>{{_("Number of level {level} issues: {count}").format(level=1, count=count[1])}}</title> 
    1010    </item> 
    1111    <item> 
    12         <title>{{_("Number of level {level} errors: {count}").format(level=2, count=count[2])}}</title> 
     12        <title>{{_("Number of level {level} issues: {count}").format(level=2, count=count[2])}}</title> 
    1313    </item> 
    1414    <item> 
    15         <title>{{_("Number of level {level} errors: {count}").format(level=3, count=count[3])}}</title> 
     15        <title>{{_("Number of level {level} issues: {count}").format(level=3, count=count[3])}}</title> 
    1616    </item> 
    1717</channel> 
  • views/byuser/index.tpl

    r32fbb9f rf517d06  
    11%rebase('layout.tpl', title=_("Statistics for user")) 
    22<h1>{{_("User statistics")}}</h1> 
    3 {{_("Osmose allows you to control your own errors.")}}<br> 
    4 {{_("By entering your OSM username in the following form, you will be able to see errors that are attached to your username. Note that the algorithm that attaches errors to username is not perfect, as Osmose only checks the last contributor of the relevant erroneous elements.")}} 
     3{{_("Osmose allows you to control your own issues.")}}<br> 
     4{{_("By entering your OSM username in the following form, you will be able to see issues that are attached to your username. Note that the algorithm that attaches issues to username is not perfect, as Osmose only checks the last contributor of the relevant erroneous elements.")}} 
    55<br><br> 
    66<form method='GET' action='#'> 
  • views/contact.tpl

    r61b37f2 rf517d06  
    11%rebase('layout.tpl', title=_("Contact")) 
    22<h1>{{_("Bug tracker")}}</h1> 
    3 <p>{{! _("Bug should be reported on <a href='http://trac.openstreetmap.fr'>trac</a>. The component to pick should be osmose-frontend for issues around the website, and osmose-backend for issues on the reported errors, or for suggestion for new analyses.")}}</p> 
     3<p>{{! _("Bug should be reported on <a href='http://trac.openstreetmap.fr'>trac</a>. The component to pick should be osmose-frontend for issues around the website, and osmose-backend for issues on the reported issues on OSM data, or for suggestion for new analyses.")}}</p> 
    44 
    55<h1>{{_("Providing patches")}}</h1> 
  • views/error/index.tpl

    rb23027a rf517d06  
    1 %rebase('layout.tpl', title=_("Information on error %d") % err_id, favicon="../images/markers/marker-l-%s.png" % marker['item']) 
     1%rebase('layout.tpl', title=_("Information on issue %d") % err_id, favicon="../images/markers/marker-l-%s.png" % marker['item']) 
    22%def show_html_results(columns, res): 
    33<table class="sortable" id ="table_marker"> 
  • views/errors/index.tpl

    r6b53ea4 rf517d06  
    9191<br> 
    9292%if errors: 
    93 %    str_more = _("Show more errors") 
     93%    str_more = _("Show more issues") 
    9494%    include("views/errors/list.tpl", errors=errors, gen=gen, opt_date=opt_date, translate=translate) 
    9595% 
     
    104104<a href="?{{urllib.urlencode(query_dict, True)}}">{{str_more}}</a> 
    105105%else: 
    106 <a href="?{{query}}&amp;limit=100">{{_("Show some errors")}}</a> 
     106<a href="?{{query}}&amp;limit=100">{{_("Show some issues")}}</a> 
    107107%end 
  • views/errors/list.tpl

    r6b53ea4 rf517d06  
    1313    <th>#</th> 
    1414    <th>{{_("item")}}</th> 
    15     <th title="{{_("information on error")}}">E</th> 
     15    <th title="{{_("information on issue")}}">E</th> 
    1616    <th title="{{_("position")}}">{{_("position (abbreviation)")}}</th> 
    1717    <th>{{_("elements (abbreviation)")}}</th> 
     
    2121%end 
    2222%if gen == "false-positive": 
    23     <th title="{{_("delete error")}}">X</th> 
     23    <th title="{{_("delete issue")}}">X</th> 
    2424%end 
    2525</tr> 
     
    3939%    end 
    4040%    e = gen if gen in ('error', 'false-positive') else 'error' 
    41     <td title="{{_(u"error n°")}}{{res["id"]}}"><a href="../{{e}}/{{res["id"]}}">E</a></td> 
     41    <td title="{{_(u"issue n°")}}{{res["id"]}}"><a href="../{{e}}/{{res["id"]}}">E</a></td> 
    4242%    if res["lat"] and res["lon"]: 
    4343%        lat = res["lat"] 
     
    9494%    end 
    9595%    if gen == "false-positive": 
    96     <td title="{{_("delete error #%d") % res["id"]}}"><a href="#" class="err_delete" id="delete={{gen}}={{res["id"]}}">X</a></td> 
     96    <td title="{{_("delete issue #%d") % res["id"]}}"><a href="#" class="err_delete" id="delete={{gen}}={{res["id"]}}">X</a></td> 
    9797%    end 
    9898</tr> 
  • views/false-positive/index.tpl

    r32fbb9f rf517d06  
    1 %rebase('layout.tpl', title=_("Information on error %d") % err_id, favicon="../images/markers/marker-l-%s.png" % marker['item']) 
     1%rebase('layout.tpl', title=_("Information on issue %d") % err_id, favicon="../images/markers/marker-l-%s.png" % marker['item']) 
    22%def show_html_results(columns, res): 
    33<table class="sortable" id ="table_marker"> 
  • views/index.tpl

    r2d3be8c rf517d06  
    22<h1>Osmose</h1> 
    33<ul> 
    4     <li><a href='map/'>{{_('Map of errors')}}</a> 
     4    <li><a href='map/'>{{_('Map of issues')}}</a> 
    55    <li><a href='{{_("http://wiki.openstreetmap.org/wiki/Osmose")}}'>{{_("Help on OSM wiki")}}</a> 
    66</ul> 
    77 
    8 <h2>{{_("Information on error database")}}</h2> 
     8<h2>{{_("Information on issues database")}}</h2> 
    99<ul> 
    1010    <li><a href='errors/false-positive'>{{_("False positives list")}}</a> 
  • views/map/index.tpl

    r659227a rf517d06  
    177177  <a href="../byuser/{{user}}">{{user}} ({{user_error_count[1]+user_error_count[2]+user_error_count[3]}}) ▼</a> 
    178178  <ul class="submenu"> 
    179     <li><a href="../byuser/{{user}}?level=1">{{_("Level %d errors (%d)") % (1, user_error_count[1])}}</a></li> 
    180     <li><a href="../byuser/{{user}}?level=2">{{_("Level %d errors (%d)") % (2, user_error_count[2])}}</a></li> 
    181     <li><a href="../byuser/{{user}}?level=3">{{_("Level %d errors (%d)") % (3, user_error_count[3])}}</a></li> 
     179    <li><a href="../byuser/{{user}}?level=1">{{_("Level %d issues (%d)") % (1, user_error_count[1])}}</a></li> 
     180    <li><a href="../byuser/{{user}}?level=2">{{_("Level %d issues (%d)") % (2, user_error_count[2])}}</a></li> 
     181    <li><a href="../byuser/{{user}}?level=3">{{_("Level %d issues (%d)") % (3, user_error_count[3])}}</a></li> 
    182182    <li><a href="../logout">{{_("Logout")}}</a></li> 
    183183  </ul> 
  • views/map/popup.tpl

    r9150aa4 rf517d06  
    7676    </div> 
    7777{%/new_elems%} 
    78 {{_("Error reported on: ")}} {%b_date%} 
     78{{_("Issue reported on: ")}} {%b_date%} 
    7979  </div> 
    8080  <div class="bulle_verif"> 
  • views/translation.tpl

    r2d3be8c rf517d06  
    2020<ul> 
    2121<li><a href="{{_("http://wiki.openstreetmap.org/wiki/Osmose")}}">{{_("OsmOse main page")}}</a></li> 
    22 <li><a href="{{_("http://wiki.openstreetmap.org/wiki/Osmose/errors")}}">{{_("Documentation on reported errors")}}</a></li> 
     22<li><a href="{{_("http://wiki.openstreetmap.org/wiki/Osmose/errors")}}">{{_("Documentation on reported issues")}}</a></li> 
    2323</ul> 
    2424 
Note: See TracChangeset for help on using the changeset viewer.