v6.8.5

app/controllers/ApplicationController.scala

@@ -11,8 +11,10 @@ import controllers.headers.ProvidesHeader
 import models.user._
 import models.amt.{AMTAssignment, AMTAssignmentTable}
 import models.daos.slick.DBTableDefinitions.{DBUser, UserTable}
+import models.street.StreetEdgeTable
 import play.api.Play
 import play.api.Play.current
+import play.api.i18n.Messages
 import java.util.Calendar
 import play.api.mvc._
 
@@ -132,7 +134,11 @@ class ApplicationController @Inject() (implicit val env: Environment[User, Sessi
                 val otherURL: String = Play.configuration.getString("city-params.landing-page-url." + otherCity).get
                 (otherName + ", " + otherState, otherURL)
               }
-              Future.successful(Ok(views.html.index("Project Sidewalk", Some(user), cityName, stateAbbreviation, cityShortName, mapathonLink, cityStr, otherCityUrls)))
+              // Get total audited distance. If using metric system, convert from miles to kilometers.
+              val auditedDistance: Float =
+                if (Messages("measurement.system") == "metric") StreetEdgeTable.auditedStreetDistance(1) * 1.60934.toFloat
+                else StreetEdgeTable.auditedStreetDistance(1)
+              Future.successful(Ok(views.html.index("Project Sidewalk", Some(user), cityName, stateAbbreviation, cityShortName, mapathonLink, cityStr, otherCityUrls, auditedDistance)))
             } else{
               WebpageActivityTable.save(WebpageActivity(0, user.userId.toString, ipAddress, activityLogText, timestamp))
               Future.successful(Redirect("/"))

app/views/admin/index.scala.html

@@ -13,6 +13,10 @@
 @import play.api.libs.json.Json
 
 @(title: String, user: Option[User] = None)(implicit lang: Lang)
+@convertDistance(distance: Float) = @{
+    if (Messages("measurement.system") == "metric") distance * 1.60934.toDouble
+    else distance.toDouble
+}
 @main(title) {
 @navbar(user, Some("/admin"))
 <style>
@@ -144,9 +148,9 @@ <h1>Activities</h1>
                             </tr>
                             <tr>
                                 <th>Audited Distance</th>
-                                <th>@("%.1f".format(StreetEdgeTable.auditedStreetDistance(1))) miles</td>
-                                <th>@("%.1f".format(StreetEdgeTable.auditedStreetDistanceToday())) miles</td>
-                                <th>@("%.1f".format(StreetEdgeTable.auditedStreetDistanceYesterday())) miles</td>
+                                <th>@("%.1f".format(convertDistance(StreetEdgeTable.auditedStreetDistance(1)))) @Messages("admin.overview.distance")</td>
+                                <th>@("%.1f".format(convertDistance(StreetEdgeTable.auditedStreetDistanceToday()))) @Messages("admin.overview.distance")</td>
+                                <th>@("%.1f".format(convertDistance(StreetEdgeTable.auditedStreetDistanceYesterday()))) @Messages("admin.overview.distance")</td>
                             </tr>
                             <tr>
                                 <th>Total Validation Users</th>
@@ -253,31 +257,31 @@ <h1>Coverage</h1>
                             </tr>
                             <tr>
                                 <th>Distance</th>
-                                <td>@("%.1f".format(StreetEdgeTable.auditedStreetDistance(1))) miles</td>
-                                <td>@("%.1f".format(StreetEdgeTable.totalStreetDistance())) miles</td>
+                                <td>@("%.1f".format(convertDistance(StreetEdgeTable.auditedStreetDistance(1)))) @Messages("admin.overview.distance")</td>
+                                <td>@("%.1f".format(convertDistance(StreetEdgeTable.totalStreetDistance()))) @Messages("admin.overview.distance")</td>
                                 <td>@("%.0f".format(StreetEdgeTable.streetDistanceCompletionRate(1) * 100))%</td>
                             </tr>
                             <tr style="font-size: 90%;">
                                 <td style="padding-left: 30px">Registered</td>
-                                <td>@("%.1f".format(StreetEdgeTable.auditedStreetDistance(1, "Registered"))) miles</td>
+                                <td>@("%.1f".format(convertDistance(StreetEdgeTable.auditedStreetDistance(1, "Registered")))) @Messages("admin.overview.distance")</td>
                                 <td></td>
                                 <td>@("%.0f".format(StreetEdgeTable.streetDistanceCompletionRate(1, "Registered") * 100))%</td>
                             </tr>
                             <tr style="font-size: 90%;">
                                 <td style="padding-left: 30px">Anonymous</td>
-                                <td>@("%.1f".format(StreetEdgeTable.auditedStreetDistance(1, "Anonymous"))) miles</td>
+                                <td>@("%.1f".format(convertDistance(StreetEdgeTable.auditedStreetDistance(1, "Anonymous")))) @Messages("admin.overview.distance")</td>
                                 <td></td>
                                 <td>@("%.0f".format(StreetEdgeTable.streetDistanceCompletionRate(1, "Anonymous") * 100))%</td>
                             </tr>
                             <tr style="font-size: 90%;">
                                 <td style="padding-left: 30px">Turker</td>
-                                <td>@("%.1f".format(StreetEdgeTable.auditedStreetDistance(1, "Turker"))) miles</td>
+                                <td>@("%.1f".format(convertDistance(StreetEdgeTable.auditedStreetDistance(1, "Turker")))) @Messages("admin.overview.distance")</td>
                                 <td></td>
                                 <td>@("%.0f".format(StreetEdgeTable.streetDistanceCompletionRate(1, "Turker") * 100))%</td>
                             </tr>
                             <tr style="font-size: 90%;">
                                 <td style="padding-left: 30px">Researcher</td>
-                                <td>@("%.1f".format(StreetEdgeTable.auditedStreetDistance(1, "Researcher"))) miles</td>
+                                <td>@("%.1f".format(convertDistance(StreetEdgeTable.auditedStreetDistance(1, "Researcher")))) @Messages("admin.overview.distance")</td>
                                 <td></td>
                                 <td>@("%.0f".format(StreetEdgeTable.streetDistanceCompletionRate(1, "Researcher") * 100))%</td>
                             </tr>
@@ -774,7 +778,8 @@ <h1>Label Search</h1>
 <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/smoothness/jquery-ui.css">
 <link href='@routes.Assets.at("stylesheets/admin.css")' rel="stylesheet"/>
 
-<script type="text/javascript" src='@routes.Assets.at("javascripts/lib/moment.js")'></script>
+<script type="text/javascript" src='@routes.Assets.at("javascripts/lib/moment/moment.js")'></script>
+<script type="text/javascript" src='@routes.Assets.at("javascripts/lib/moment/es.js")'></script>
 <script type="text/javascript" src='@routes.Assets.at("javascripts/lib/d3.v3.js")'></script>
 <script type="text/javascript" src='@routes.Assets.at("javascripts/lib/c3.min.js")'></script>
 <script type="text/javascript" src='@routes.Assets.at("javascripts/Admin/build/Admin.js")'></script>
@@ -788,6 +793,9 @@ <h1>Label Search</h1>
 <script type="text/javascript" src='@routes.Assets.at("javascripts/SVLabel/src/SVLabel/Panomarker.js")'></script>
 <script type="text/javascript" src='@routes.Assets.at("javascripts/SVValidate/src/util/PanoProperties.js")'></script>
 <script type="text/javascript" src='@routes.Assets.at("javascripts/TimestampLocalization.js")'></script>
+<script type="text/javascript">
+    updateTimestamps("@lang.code");
+</script>
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/vega/3.0.0-beta.33/vega.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/vega-lite/2.0.0-beta.4/vega-lite.js"></script>
@@ -853,7 +861,7 @@ <h1>Label Search</h1>
             fallbackLng: 'en',
             ns: ['common'],
             defaultNS: 'common',
-            lng: "@lang.language",
+            lng: "@lang.code",
             debug: false
         }, function(err, t) {
             var difficultRegionIds = @Json.toJson(RegionTable.difficultRegionIds);

app/views/admin/user.scala.html

@@ -9,7 +9,7 @@
 @import models.user.UserCurrentRegionTable
 @import models.region.RegionPropertyTable
 
-@(title: String, admin: Option[User] = None, user: Option[DBUser] = Some(DBUser("unknown", "unknown", "unknown")))
+@(title: String, admin: Option[User] = None, user: Option[DBUser] = Some(DBUser("unknown", "unknown", "unknown")))(implicit lang: Lang)
 
 @main(title) {
     @navbar(admin)
@@ -184,7 +184,8 @@ <h1>Feedback</h1>
     <link href='@routes.Assets.at("stylesheets/dataTables.bootstrap.min.css")' rel="stylesheet"/>
     <link href='@routes.Assets.at("stylesheets/userProfile.css")' rel="stylesheet"/>
 
-    <script type="text/javascript" src='@routes.Assets.at("javascripts/lib/moment.js")'></script>
+    <script type="text/javascript" src='@routes.Assets.at("javascripts/lib/moment/moment.js")'></script>
+    <script type="text/javascript" src='@routes.Assets.at("javascripts/lib/moment/es.js")'></script>
     <script type="text/javascript" src='@routes.Assets.at("javascripts/lib/d3.v3.js")'></script>
     <script type="text/javascript" src='@routes.Assets.at("javascripts/lib/c3.min.js")'></script>
     <script type="text/javascript" src='@routes.Assets.at("javascripts/lib/underscore.min.js")'></script>
@@ -198,6 +199,9 @@ <h1>Feedback</h1>
     <script type="text/javascript" src='@routes.Assets.at("javascripts/SVLabel/src/SVLabel/Panomarker.js")'></script>
     <script type="text/javascript" src='@routes.Assets.at("javascripts/SVValidate/src/util/PanoProperties.js")'></script>
     <script type="text/javascript" src='@routes.Assets.at("javascripts/TimestampLocalization.js")'></script>
+    <script type="text/javascript">
+        updateTimestamps("@lang.code");
+    </script>
 
     <script src='https://api.mapbox.com/mapbox.js/v3.1.1/mapbox.js'></script>
     <link href='https://api.mapbox.com/mapbox.js/v3.1.1/mapbox.css' rel='stylesheet' />

app/views/audit.scala.html

@@ -274,7 +274,7 @@ <h2 id="link-neighborhood-name"><span id="status-holder-neighborhood-name"></spa
                     <div class="status-row" id="neighborhood-status-row">
                         <span class="status-column-half">
                             <img src='@routes.Assets.at("javascripts/SVLabel/img/icons/WalkingFeet2.png")' class="status-icon" alt="Map icon" align="">
-                            <span><span class="bold" id="status-audited-distance">0.00</span> <small>@Messages("audit.right.ui.miles")</small></span>
+                            <span><span class="bold" id="status-audited-distance">0.00</span> <small>@Messages("audit.right.ui.distance")</small></span>
                         </span>
                         <span class="status-column-half">
                             <img src='@routes.Assets.at("javascripts/SVLabel/img/icons/Sidewalk/Icon_Other.png")' class="status-icon" alt="Total label count" align="">
@@ -1039,7 +1039,7 @@ <h1 class="text-center bold">@Messages("surface.problem")</h1>
             mainParam.missionSetProgress = @missionSetProgress;
             mainParam.hasCompletedAMission = @hasCompletedMission;
 
-            mainParam.language = "@lang.language";
+            mainParam.language = "@lang.code";
 
             svl.main = new Main(mainParam);
         }

app/views/developer.scala.html

@@ -85,7 +85,7 @@ <h3>Access Attributes</h3>
                                 <dt>Optional:</dt>
                                 <dd>You can pass a specific severity to look for and/or a specific filetype
                                     for the returned dataset. Severity can be an integer value from 1-5 or
-                                    "none" to represent data without a severity rating.You can pass a 
+                                    "none" to represent data without a severity rating. You can pass a 
                                     filetype that can be a string "csv" to represent data returned in
                                     CSV format or "geojson" for the GeoJSON format. The GeoJSON format
                                     is returned by default.</dd>
@@ -95,7 +95,7 @@ <h3>Access Attributes</h3>
                                     <code>severity=[int|string]</code><br />
                                 </li>
                                 <li>
-                                    <code>filetype=csv|geojson</code><br />
+                                    <code>filetype=[string]</code><br />
                                 </li>
                             </ul>
                         </td>

app/views/index.scala.html

@@ -3,7 +3,7 @@
 @import models.label._
 @import models.street.StreetEdgeTable
 @import play.api.libs.json.Json
-@(title: String, user: Option[User] = None, cityName: String, stateAbbreviation: String, cityShortName: String, mapathonLink: Option[String], cityId: String, otherCityURLs: List[(String, String)])(implicit lang: Lang)
+@(title: String, user: Option[User] = None, cityName: String, stateAbbreviation: String, cityShortName: String, mapathonLink: Option[String], cityId: String, otherCityURLs: List[(String, String)], auditedDistance: Float)(implicit lang: Lang)
 
 @main(title) {
     @navbar(user, Some("/"))
@@ -32,8 +32,9 @@
                     <a class="bodyStartBtn" href="@routes.AuditController.audit()">@Messages("navbar.explore") @cityShortName</a>
                     <br><br>
                     <span class="header-text">@Messages("landing.also.in")</span>
-                    @for((cityName, cityURL) <- otherCityURLs.filter(_._1 != "San Pedro Garza García, MX-NLE")) {
-                        <a id="@cityName" class="otherCityLink" href="@{cityURL + "/audit"}">@cityName</a> &nbsp;
+                    @for((cityName, cityURL) <- otherCityURLs) {
+                        <!-- Replacing a space with a nbsp in order to make sure wrapping works as intended. -->
+                        <a id="@cityName" class="otherCityLink" href="@{cityURL + "/audit"}">@cityName.replace(" ", " ")</a> &nbsp;
                     }
                     <br>
                     @if(mapathonLink.isDefined) {
@@ -210,7 +211,7 @@
             <div id="numberholder">
                 <div class="row" id="anim-numbers">
                     <div class="col-md-3 col-sm-4"><span id="percentage">45</span></div>
-                    <div class="col-md-3 col-sm-4"><span id="nummiles">45</span></div>
+                    <div class="col-md-3 col-sm-4"><span id="distance">45</span></div>
                     <div class="col-md-3 col-sm-4"><span id="numlabels">36,583</span></div>
                     <div class="col-md-3 hidden-sm"><a href="/validate"><span id="numvalidation">123,583</span></a></div>
                 </div>
@@ -224,15 +225,14 @@
 
             </div>
             <script language="javascript">
-                    if(@("%.0f".format(StreetEdgeTable.streetDistanceCompletionRate(1) * 100))<100) {
-                        document.getElementById('conditional-text').innerHTML = "@Messages("landing.stats.content.unfinished", "%.0f".format(StreetEdgeTable.auditedStreetDistance(1)), cityName, stateAbbreviation, "%.1f".format(StreetEdgeTable.streetDistanceCompletionRate(1) * 100))";
+                    if (@("%.0f".format(StreetEdgeTable.streetDistanceCompletionRate(1) * 100)) < 100) {
+                        document.getElementById('conditional-text').innerHTML = "@Messages("landing.stats.content.unfinished", "%,.0f".format(auditedDistance), cityName, stateAbbreviation, "%.1f".format(StreetEdgeTable.streetDistanceCompletionRate(1) * 100))";
                     } else {
-                        document.getElementById('conditional-text').innerHTML = "We did it! Users like you have mapped all @("%.0f".format(StreetEdgeTable.auditedStreetDistance(1))) miles of @cityName, @stateAbbreviation. However, we are not done. The more users who contribute, the better quality data. So start exploring today!";
+                        document.getElementById('conditional-text').innerHTML = "@Messages("landing.stats.content.finished", "%,.0f".format(auditedDistance), cityName, stateAbbreviation)";
                     }
-
                     var percentageAnim = new CountUp("percentage", 0, @("%.1f".format(StreetEdgeTable.streetDistanceCompletionRate(1) * 100)),1,2.5,{suffix:'%'});
                     var labelsAnim = new CountUp("numlabels", 0, @LabelTable.countLabels,0,2.5,{suffix:''});
-                    var milesAnim = new CountUp("nummiles", 0, @("%.1f".format(StreetEdgeTable.auditedStreetDistance(1))),1,2.5,{suffix:''});
+                    var distanceAnim = new CountUp("distance", 0, @("%.1f".format(auditedDistance)),1,2.5,{suffix:''});
                     var validationsAnim = new CountUp("numvalidation", 0, @LabelValidationTable.countValidations,0,2.5,{suffix:''});
             </script>
         </div>
@@ -377,7 +377,7 @@
             fallbackLng: 'en',
             ns: ['common'],
             defaultNS: 'common',
-            lng: "@lang.language",
+            lng: "@lang.code",
             debug: false
         }, function(err, t) {
             var difficultRegionIds = @Json.toJson(RegionTable.difficultRegionIds);

app/views/labelMap.scala.html

@@ -83,7 +83,8 @@
     <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/smoothness/jquery-ui.css">
     <link href='@routes.Assets.at("stylesheets/admin.css")' rel="stylesheet"/>
 
-    <script type="text/javascript" src='@routes.Assets.at("javascripts/lib/moment.js")'></script>
+    <script type="text/javascript" src='@routes.Assets.at("javascripts/lib/moment/moment.js")'></script>
+    <script type="text/javascript" src='@routes.Assets.at("javascripts/lib/moment/es.js")'></script>
     <script type="text/javascript" src='@routes.Assets.at("javascripts/Admin/build/Admin.js")'></script>
     <script type="text/javascript" src='@routes.Assets.at("javascripts/lib/jquery.dataTables.min.js")'></script>
     <script type="text/javascript" src='@routes.Assets.at("javascripts/lib/dataTables.bootstrap.min.js")'></script>
@@ -93,6 +94,9 @@
     <script type="text/javascript" src='@routes.Assets.at("javascripts/SVLabel/src/SVLabel/Panomarker.js")'></script>
     <script type="text/javascript" src='@routes.Assets.at("javascripts/SVValidate/src/util/PanoProperties.js")'></script>
     <script type="text/javascript" src='@routes.Assets.at("javascripts/TimestampLocalization.js")'></script>
+    <script type="text/javascript">
+        updateTimestamps("@lang.code");
+    </script>
 
     <script src='https://api.mapbox.com/mapbox.js/v3.1.1/mapbox.js'></script>
     <link href='https://api.mapbox.com/mapbox.js/v3.1.1/mapbox.css' rel='stylesheet' />

app/views/main.scala.html

@@ -235,6 +235,10 @@
                 });
             });
     </script>
-    <script type="text/javascript" src='@routes.Assets.at("javascripts/lib/moment.js")'></script>
+    <script type="text/javascript" src='@routes.Assets.at("javascripts/lib/moment/moment.js")'></script>
+    <script type="text/javascript" src='@routes.Assets.at("javascripts/lib/moment/es.js")'></script>
     <script type="text/javascript" src='@routes.Assets.at("javascripts/TimestampLocalization.js")'></script>
+    <script type="text/javascript">
+        updateTimestamps("@lang.code");
+    </script>
 </body>

app/views/mobileValidate.scala.html

@@ -190,7 +190,7 @@ <h3>@Messages("validate.mission.complete.category")</h3>
             param.canvasHeight = window.innerHeight;
             param.canvasWidth = window.innerWidth;
             param.canvasCount = 1;
-            param.language = "@lang.language";
+            param.language = "@lang.code";
             param.modalText = {
                 1: "@Messages("labeling.guide.curb.ramp.summary")",
                 2: "@Messages("labeling.guide.curb.ramp.summary")",

app/views/rapidValidation.scala.html

@@ -407,7 +407,7 @@ <h1 class="status-holder-header-2" id="label-type-counterexample"></h1>
                 param.canvasHeight = 130;
                 param.canvasWidth = 240;
                 param.canvasCount = 9;
-                param.language = "@lang.language";
+                param.language = "@lang.code";
                 param.modalText = {
                     1: "@Messages("labeling.guide.curb.ramp.summary")",
                     2: "@Messages("labeling.guide.curb.ramp.summary")",