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

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 %>
 

lib/osm_community_index.rb

@@ -21,7 +21,7 @@ def self.add_to_i18n
         id = community.id
 
         strings = community_locale_yaml[id] || {}
-        strings["name"] = resolve_name(community, community_locale_yaml, community_en_yaml)
+        strings["name"] = resolve_name(community, community_locale_yaml, community_en_yaml, locale)
 
         obj.deep_merge!("osm_community_index" => { "communities" => { id => strings } })
       end
@@ -30,7 +30,7 @@ def self.add_to_i18n
     end
   end
 
-  def self.resolve_name(community, community_locale_yaml, community_en_yaml)
+  def self.resolve_name(community, community_locale_yaml, community_en_yaml, locale_name)
     # If theres an explicitly translated name then use that
     translated_name = community_locale_yaml.dig(community.id, "name")
     return translated_name if translated_name
@@ -42,8 +42,8 @@ def self.resolve_name(community, community_locale_yaml, community_en_yaml)
     # Change the `{community}` placeholder to `%{community}` and use Ruby's Kernel.format to fill it in.
     begin
       translated_name = format(template.gsub("{", "%{"), { :community => community_name }) if template && community_name
-    rescue KeyError => e
-      Rails.logger.warn e.full_message
+    rescue KeyError
+      Rails.logger.warn "Could not find a translated name for community #{community.id.inspect} in locale #{locale_name.inspect}"
     end
     return translated_name if translated_name
 

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

test/lib/osm_community_index_test.rb

@@ -9,7 +9,7 @@ def test_community_name_fallback
     community_locale_yaml = {}
     community_en_yaml = {}
 
-    name = OsmCommunityIndex.resolve_name(community, community_locale_yaml, community_en_yaml)
+    name = OsmCommunityIndex.resolve_name(community, community_locale_yaml, community_en_yaml, "en")
     assert_equal("Community Name", name)
   end
 
@@ -19,7 +19,7 @@ def test_resource_name_fallback
     community_locale_yaml = {}
     community_en_yaml = {}
 
-    name = OsmCommunityIndex.resolve_name(community, community_locale_yaml, community_en_yaml)
+    name = OsmCommunityIndex.resolve_name(community, community_locale_yaml, community_en_yaml, "en")
     assert_equal("Chapter Name", name)
   end
 
@@ -29,7 +29,7 @@ def test_i18n_explicit_name
     community_locale_yaml = { "foo-chapter" => { "name" => "Translated Chapter Name" } }
     community_en_yaml = {}
 
-    name = OsmCommunityIndex.resolve_name(community, community_locale_yaml, community_en_yaml)
+    name = OsmCommunityIndex.resolve_name(community, community_locale_yaml, community_en_yaml, "en")
     assert_equal("Translated Chapter Name", name)
   end
 
@@ -39,7 +39,7 @@ def test_i18n_fallback_name
     community_locale_yaml = { "_communities" => { "communityname" => "Translated Community" }, "_defaults" => { "osm-lc" => { "name" => "{community} Chapter" } } }
     community_en_yaml = {}
 
-    name = OsmCommunityIndex.resolve_name(community, community_locale_yaml, community_en_yaml)
+    name = OsmCommunityIndex.resolve_name(community, community_locale_yaml, community_en_yaml, "en")
     assert_equal("Translated Community Chapter", name)
   end
 
@@ -49,7 +49,7 @@ def test_i18n_invalid_replacement_token
     community_locale_yaml = { "_communities" => { "communityname" => "Translated Community" }, "_defaults" => { "osm-lc" => { "name" => "{comminauté} Chapter" } } }
     community_en_yaml = {}
 
-    name = OsmCommunityIndex.resolve_name(community, community_locale_yaml, community_en_yaml)
+    name = OsmCommunityIndex.resolve_name(community, community_locale_yaml, community_en_yaml, "en")
     assert_equal("Community Name", name)
   end
 end