Merge remote-tracking branch 'upstream/pull/6850'

Author: tomhughes

app/assets/javascripts/heatmap.js

@@ -66,13 +66,13 @@ $(document).on("turbo:frame-load", function () {
   }
 
   function getTooltipText(date, value) {
-    const localizedDate = OSM.i18n.l("date.formats.heatmap", date);
+    const localizedDate = OSM.i18n.l("date.formats.contribution_calendar", date);
 
     if (value > 0) {
-      return OSM.i18n.t("javascripts.heatmap.tooltip.contributions", { count: value, date: localizedDate });
+      return OSM.i18n.t("javascripts.contribution_calendar.tooltip.contributions", { count: value, date: localizedDate });
     }
 
-    return OSM.i18n.t("javascripts.heatmap.tooltip.no_contributions", { date: localizedDate });
+    return OSM.i18n.t("javascripts.contribution_calendar.tooltip.no_contributions", { date: localizedDate });
   }
 
   function getWeekInfo() {

app/views/profiles/heatmaps/show.html.erb

@@ -6,7 +6,7 @@
 <% end %>
 
 <%= bootstrap_form_for current_user, :url => { :action => :update } do |f| %>
-  <%= f.check_box :public_heatmap, :label => t(".show_heatmap_in_public"), :checked => current_user.public_heatmap? %>
+  <%= f.check_box :public_heatmap, :label => t(".show_contribution_calendar_in_public"), :checked => current_user.public_heatmap? %>
 
   <%= f.primary t(".save") %>
   <%= link_to t(".cancel"), current_user, :class => "btn btn-link" %>

app/views/profiles/profile_sections/_navigation.html.erb

@@ -15,6 +15,6 @@
     <%= link_to t(".location"), profile_location_path, :class => { "nav-link" => true, "active" => controller_name == "locations" } %>
   </li>
   <li class="nav-item">
-    <%= link_to t(".heatmap"), profile_heatmap_path, :class => { "nav-link" => true, "active" => controller_name == "heatmaps" } %>
+    <%= link_to t(".contribution_calendar"), profile_heatmap_path, :class => { "nav-link" => true, "active" => controller_name == "heatmaps" } %>
   </li>
 </ul>

app/views/users/show.html.erb

@@ -300,7 +300,7 @@
 <% end %>
 <% if owned %>
   <div class="mt-2">
-    <%= link_to t(".edit_heatmap"), profile_heatmap_path, :class => "btn btn-sm w-100 btn-outline-primary edit_heatmap_button" %>
+    <%= link_to t(".edit_contribution_calendar"), profile_heatmap_path, :class => "btn btn-sm w-100 btn-outline-primary edit_heatmap_button" %>
   </div>
 <% end %>
 

doc/CONFIGURE.md

@@ -50,10 +50,15 @@ osmosis --read-pbf greater-london-latest.osm.pbf \
 
 ## User Management
 
-After creating a user through the web interface at [http://localhost:3000/user/new](http://localhost:3000/user/new), you may need to perform additional user management tasks.
+Many features of the website require a user. The following script can get you started:
 
-> [!TIP]
-> If you don't want to set up your development box to send emails, you can manually confirm users and grant permissions through the Rails console.
+```bash
+$ bundle exec rails dev:populate
+```
+
+This will create two users: `admin` (with administrator privileges) and `mapper` (with normal privileges). For either of them, the password is `password` (feel free to change it).
+
+Alternatively, you can create users manually using the web interface at [http://localhost:3000/user/new](http://localhost:3000/user/new). If you go this route, you may need to perform additional user management tasks. At the very least, new users need to be activated in order to sign in. You can do this via the Rails console as follows.
 
 ### Managing Users via Rails Console
 
@@ -100,7 +105,9 @@ There are two built-in applications which communicate via the API, and therefore
 * **iD** - the web-based editor
 * **The website itself** - for the Notes functionality
 
-You need to register these applications with *one* of the users you created. After that iD and Notes functionality becomes available to every user of the website.
+If you used the `dev:populate` script to create your initial users, this step should not be necessary.
+
+Otherwise, you need to register these applications with *one* of the users you created. After that iD and Notes functionality becomes available to every user of the website.
 
 ### Automated OAuth Setup (Recommended)
 

test/controllers/profiles/heatmaps_controller_test.rb

@@ -49,7 +49,7 @@ def test_update
       follow_redirect!
       assert_response :success
       assert_template :show
-      assert_dom ".alert-success", :text => "Heatmap updated."
+      assert_dom ".alert-success", :text => "Contribution Calendar updated."
 
       assert_not_predicate user.reload, :public_heatmap?
       refute_select heatmap_selector
@@ -60,7 +60,7 @@ def test_update
       follow_redirect!
       assert_response :success
       assert_template :show
-      assert_dom ".alert-success", :text => "Heatmap updated."
+      assert_dom ".alert-success", :text => "Contribution Calendar updated."
 
       assert_predicate user.reload, :public_heatmap?
       assert_select heatmap_selector