Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 Fix jinja metadata #3680

Merged
merged 5 commits into from
Dec 3, 2024
Merged

🐛 Fix jinja metadata #3680

merged 5 commits into from
Dec 3, 2024

Conversation

Marigold
Copy link
Collaborator

@Marigold Marigold commented Dec 3, 2024

No description provided.

@owidbot
Copy link
Contributor

owidbot commented Dec 3, 2024

Quick links (staging server):

Site Dev Site Preview Admin Wizard Docs

Login: ssh owid@staging-site-fix-jinja

chart-diff: ✅ No charts for review.
data-diff: ❌ Found differences
= Dataset garden/war/2023-09-21/brecke
  = Table brecke
    ~ Column number_deaths_ongoing_conflicts (changed metadata)
+       +   <% set per_capita = "" %>
    ~ Column number_deaths_ongoing_conflicts_per_capita (changed metadata)
+       +   <% set per_capita = "" %>
= Dataset garden/war/2023-09-21/cow
  = Table cow
    ~ Column number_deaths_ongoing_conflicts (changed metadata)
+       +   <% set per_capita = "" %>
    ~ Column number_deaths_ongoing_conflicts_per_capita (changed metadata)
-       -   <% set per_capita = ", per 100,000 people" %> <%- if conflict_type == "all" -%>
        ?                                                   ^^^^^^^^^^^^ ^^^    -  ---  -
+       +   <% set per_capita = ", per 100,000 people" %> <% set per_capita = "" %>
        ?                                                   ^^^ ^  ++++++++
+       +   <%- if conflict_type == "all" -%>
  = Table cow_locations
  = Table cow_country
= Dataset garden/war/2023-09-21/mie
  = Table mie_country
  = Table mie
    ~ Column number_deaths_ongoing_conflicts_high (changed metadata)
+       +   <% set per_capita = "" %>
-       -     <%- if hostility == "all" -%> Included are conflicts between states where force was threatened, displayed, used, or escalated to a war that year
+       +     <%- if hostility_level == "all" -%> Included are conflicts between states where force was threatened, displayed, used, or escalated to a war that year
        ?                     ++++++
-       -     <%- elif hostility == "Threat to use force" -%> Included are conflicts between states where, at most, use of force was threatened that year
+       +     <%- elif hostility_level == "Threat to use force" -%> Included are conflicts between states where, at most, use of force was threatened that year
        ?                       ++++++
-       -     <%- elif hostility == "Display of force" -%> Included are conflicts between states where, at most, force was displayed that year
+       +     <%- elif hostility_level == "Display of force" -%> Included are conflicts between states where, at most, force was displayed that year
        ?                       ++++++
-       -     <%- elif hostility == "Use of force" -%> Included are conflicts between states where, at most, force was used that year, but there were fewer than 1,000 combatant deaths
+       +     <%- elif hostility_level == "Use of force" -%> Included are conflicts between states where, at most, force was used that year, but there were fewer than 1,000 combatant deaths
        ?                       ++++++
-       -     <%- elif hostility == "War" -%> Included are interstate wars that were ongoing that year
+       +     <%- elif hostility_level == "War" -%> Included are interstate wars that were ongoing that year
        ?                       ++++++
    ~ Column number_deaths_ongoing_conflicts_high_per_capita (changed metadata)
-       -   <% set per_capita = ", per 100,000 people" %> The << estimate >> estimate of the number of deaths of combatants due to fighting between states that year<< per_capita >>.
+       +   <% set per_capita = ", per 100,000 people" %> <% set per_capita = "" %>
+       +   The << estimate >> estimate of the number of deaths of combatants due to fighting between states that year<< per_capita >>.
-       -     <%- if hostility == "all" -%> Included are conflicts between states where force was threatened, displayed, used, or escalated to a war that year
+       +     <%- if hostility_level == "all" -%> Included are conflicts between states where force was threatened, displayed, used, or escalated to a war that year
        ?                     ++++++
-       -     <%- elif hostility == "Threat to use force" -%> Included are conflicts between states where, at most, use of force was threatened that year
+       +     <%- elif hostility_level == "Threat to use force" -%> Included are conflicts between states where, at most, use of force was threatened that year
        ?                       ++++++
-       -     <%- elif hostility == "Display of force" -%> Included are conflicts between states where, at most, force was displayed that year
+       +     <%- elif hostility_level == "Display of force" -%> Included are conflicts between states where, at most, force was displayed that year
        ?                       ++++++
-       -     <%- elif hostility == "Use of force" -%> Included are conflicts between states where, at most, force was used that year, but there were fewer than 1,000 combatant deaths
+       +     <%- elif hostility_level == "Use of force" -%> Included are conflicts between states where, at most, force was used that year, but there were fewer than 1,000 combatant deaths
        ?                       ++++++
-       -     <%- elif hostility == "War" -%> Included are interstate wars that were ongoing that year
+       +     <%- elif hostility_level == "War" -%> Included are interstate wars that were ongoing that year
        ?                       ++++++
    ~ Column number_deaths_ongoing_conflicts_low (changed metadata)
+       +   <% set per_capita = "" %>
-       -     <%- if hostility == "all" -%> Included are conflicts between states where force was threatened, displayed, used, or escalated to a war that year
+       +     <%- if hostility_level == "all" -%> Included are conflicts between states where force was threatened, displayed, used, or escalated to a war that year
        ?                     ++++++
-       -     <%- elif hostility == "Threat to use force" -%> Included are conflicts between states where, at most, use of force was threatened that year
+       +     <%- elif hostility_level == "Threat to use force" -%> Included are conflicts between states where, at most, use of force was threatened that year
        ?                       ++++++
-       -     <%- elif hostility == "Display of force" -%> Included are conflicts between states where, at most, force was displayed that year
+       +     <%- elif hostility_level == "Display of force" -%> Included are conflicts between states where, at most, force was displayed that year
        ?                       ++++++
-       -     <%- elif hostility == "Use of force" -%> Included are conflicts between states where, at most, force was used that year, but there were fewer than 1,000 combatant deaths
+       +     <%- elif hostility_level == "Use of force" -%> Included are conflicts between states where, at most, force was used that year, but there were fewer than 1,000 combatant deaths
        ?                       ++++++
-       -     <%- elif hostility == "War" -%> Included are interstate wars that were ongoing that year
+       +     <%- elif hostility_level == "War" -%> Included are interstate wars that were ongoing that year
        ?                       ++++++
    ~ Column number_deaths_ongoing_conflicts_low_per_capita (changed metadata)
-       -   <% set per_capita = ", per 100,000 people" %> The << estimate >> estimate of the number of deaths of combatants due to fighting between states that year<< per_capita >>.
+       +   <% set per_capita = ", per 100,000 people" %> <% set per_capita = "" %>
+       +   The << estimate >> estimate of the number of deaths of combatants due to fighting between states that year<< per_capita >>.
-       -     <%- if hostility == "all" -%> Included are conflicts between states where force was threatened, displayed, used, or escalated to a war that year
+       +     <%- if hostility_level == "all" -%> Included are conflicts between states where force was threatened, displayed, used, or escalated to a war that year
        ?                     ++++++
-       -     <%- elif hostility == "Threat to use force" -%> Included are conflicts between states where, at most, use of force was threatened that year
+       +     <%- elif hostility_level == "Threat to use force" -%> Included are conflicts between states where, at most, use of force was threatened that year
        ?                       ++++++
-       -     <%- elif hostility == "Display of force" -%> Included are conflicts between states where, at most, force was displayed that year
+       +     <%- elif hostility_level == "Display of force" -%> Included are conflicts between states where, at most, force was displayed that year
        ?                       ++++++
-       -     <%- elif hostility == "Use of force" -%> Included are conflicts between states where, at most, force was used that year, but there were fewer than 1,000 combatant deaths
+       +     <%- elif hostility_level == "Use of force" -%> Included are conflicts between states where, at most, force was used that year, but there were fewer than 1,000 combatant deaths
        ?                       ++++++
-       -     <%- elif hostility == "War" -%> Included are interstate wars that were ongoing that year
+       +     <%- elif hostility_level == "War" -%> Included are interstate wars that were ongoing that year
        ?                       ++++++
    ~ Column number_new_conflicts (changed metadata)
-       -   <%- if hostility == "Use of force" -%>
+       +   <%- if hostility_level == "Use of force" -%>
        ?                   ++++++
-       -   <%- elif hostility == "War" -%>
+       +   <%- elif hostility_level == "War" -%>
        ?                     ++++++
-       -   <%- if hostility == "all" -%> Included are conflicts between states where force was threatened, displayed, used, or escalated to a war that year
+       +   <%- if hostility_level == "all" -%> Included are conflicts between states where force was threatened, displayed, used, or escalated to a war that year
        ?                   ++++++
-       -   <%- elif hostility == "Threat to use force" -%> Included are conflicts between states where, at most, use of force was threatened that year
+       +   <%- elif hostility_level == "Threat to use force" -%> Included are conflicts between states where, at most, use of force was threatened that year
        ?                     ++++++
-       -   <%- elif hostility == "Display of force" -%> Included are conflicts between states where, at most, force was displayed that year
+       +   <%- elif hostility_level == "Display of force" -%> Included are conflicts between states where, at most, force was displayed that year
        ?                     ++++++
-       -   <%- elif hostility == "Use of force" -%> Included are conflicts between states where, at most, force was used that year, but there were fewer than 1,000 combatant deaths
+       +   <%- elif hostility_level == "Use of force" -%> Included are conflicts between states where, at most, force was used that year, but there were fewer than 1,000 combatant deaths
        ?                     ++++++
-       -   <%- elif hostility == "War" -%> Included are interstate wars that were ongoing that year
+       +   <%- elif hostility_level == "War" -%> Included are interstate wars that were ongoing that year
        ?                     ++++++
    ~ Column number_new_conflicts_per_country (changed metadata)
-       -   The number of wars divided by the number of all states. This accounts for the changing number of states over time. <%- if hostility == "Use of force" -%>
+       +   The number of wars divided by the number of all states. This accounts for the changing number of states over time. <%- if hostility_level == "Use of force" -%>
        ?                                                                                                                                      ++++++
-       -   <%- elif hostility == "War" -%>
+       +   <%- elif hostility_level == "War" -%>
        ?                     ++++++
-       -   <%- if hostility == "all" -%> Included are conflicts between states where force was threatened, displayed, used, or escalated to a war that year
+       +   <%- if hostility_level == "all" -%> Included are conflicts between states where force was threatened, displayed, used, or escalated to a war that year
        ?                   ++++++
-       -   <%- elif hostility == "Threat to use force" -%> Included are conflicts between states where, at most, use of force was threatened that year
+       +   <%- elif hostility_level == "Threat to use force" -%> Included are conflicts between states where, at most, use of force was threatened that year
        ?                     ++++++
-       -   <%- elif hostility == "Display of force" -%> Included are conflicts between states where, at most, force was displayed that year
+       +   <%- elif hostility_level == "Display of force" -%> Included are conflicts between states where, at most, force was displayed that year
        ?                     ++++++
-       -   <%- elif hostility == "Use of force" -%> Included are conflicts between states where, at most, force was used that year, but there were fewer than 1,000 combatant deaths
+       +   <%- elif hostility_level == "Use of force" -%> Included are conflicts between states where, at most, force was used that year, but there were fewer than 1,000 combatant deaths
        ?                     ++++++
-       -   <%- elif hostility == "War" -%> Included are interstate wars that were ongoing that year
+       +   <%- elif hostility_level == "War" -%> Included are interstate wars that were ongoing that year
        ?                     ++++++
    ~ Column number_new_conflicts_per_country_pair (changed metadata)
-       -   <%- if hostility == "Use of force" -%>
+       +   <%- if hostility_level == "Use of force" -%>
        ?                   ++++++
-       -   <%- elif hostility == "War" -%>
+       +   <%- elif hostility_level == "War" -%>
        ?                     ++++++
-       -   <%- if hostility == "all" -%> Included are conflicts between states where force was threatened, displayed, used, or escalated to a war that year
+       +   <%- if hostility_level == "all" -%> Included are conflicts between states where force was threatened, displayed, used, or escalated to a war that year
        ?                   ++++++
-       -   <%- elif hostility == "Threat to use force" -%> Included are conflicts between states where, at most, use of force was threatened that year
+       +   <%- elif hostility_level == "Threat to use force" -%> Included are conflicts between states where, at most, use of force was threatened that year
        ?                     ++++++
-       -   <%- elif hostility == "Display of force" -%> Included are conflicts between states where, at most, force was displayed that year
+       +   <%- elif hostility_level == "Display of force" -%> Included are conflicts between states where, at most, force was displayed that year
        ?                     ++++++
-       -   <%- elif hostility == "Use of force" -%> Included are conflicts between states where, at most, force was used that year, but there were fewer than 1,000 combatant deaths
+       +   <%- elif hostility_level == "Use of force" -%> Included are conflicts between states where, at most, force was used that year, but there were fewer than 1,000 combatant deaths
        ?                     ++++++
-       -   <%- elif hostility == "War" -%> Included are interstate wars that were ongoing that year
+       +   <%- elif hostility_level == "War" -%> Included are interstate wars that were ongoing that year
        ?                     ++++++
    ~ Column number_ongoing_conflicts (changed metadata)
-       -   <%- if hostility == "all" -%> Included are conflicts between states where force was threatened, displayed, used, or escalated to a war that year
+       +   <%- if hostility_level == "all" -%> Included are conflicts between states where force was threatened, displayed, used, or escalated to a war that year
        ?                   ++++++
-       -   <%- elif hostility == "Threat to use force" -%> Included are conflicts between states where, at most, use of force was threatened that year
+       +   <%- elif hostility_level == "Threat to use force" -%> Included are conflicts between states where, at most, use of force was threatened that year
        ?                     ++++++
-       -   <%- elif hostility == "Display of force" -%> Included are conflicts between states where, at most, force was displayed that year
+       +   <%- elif hostility_level == "Display of force" -%> Included are conflicts between states where, at most, force was displayed that year
        ?                     ++++++
-       -   <%- elif hostility == "Use of force" -%> Included are conflicts between states where, at most, force was used that year, but there were fewer than 1,000 combatant deaths
+       +   <%- elif hostility_level == "Use of force" -%> Included are conflicts between states where, at most, force was used that year, but there were fewer than 1,000 combatant deaths
        ?                     ++++++
-       -   <%- elif hostility == "War" -%> Included are interstate wars that were ongoing that year
+       +   <%- elif hostility_level == "War" -%> Included are interstate wars that were ongoing that year
        ?                     ++++++
    ~ Column number_ongoing_conflicts_per_country (changed metadata)
-       -   The number of wars divided by the number of all states. This accounts for the changing number of states over time. <%- if hostility == "all" -%> Included are conflicts between states where force was threatened, displayed, used, or escalated to a war that year
+       +   The number of wars divided by the number of all states. This accounts for the changing number of states over time. <%- if hostility_level == "all" -%> Included are conflicts between states where force was threatened, displayed, used, or escalated to a war that year
        ?                                                                                                                                      ++++++
-       -   <%- elif hostility == "Threat to use force" -%> Included are conflicts between states where, at most, use of force was threatened that year
+       +   <%- elif hostility_level == "Threat to use force" -%> Included are conflicts between states where, at most, use of force was threatened that year
        ?                     ++++++
-       -   <%- elif hostility == "Display of force" -%> Included are conflicts between states where, at most, force was displayed that year
+       +   <%- elif hostility_level == "Display of force" -%> Included are conflicts between states where, at most, force was displayed that year
        ?                     ++++++
-       -   <%- elif hostility == "Use of force" -%> Included are conflicts between states where, at most, force was used that year, but there were fewer than 1,000 combatant deaths
+       +   <%- elif hostility_level == "Use of force" -%> Included are conflicts between states where, at most, force was used that year, but there were fewer than 1,000 combatant deaths
        ?                     ++++++
-       -   <%- elif hostility == "War" -%> Included are interstate wars that were ongoing that year
+       +   <%- elif hostility_level == "War" -%> Included are interstate wars that were ongoing that year
        ?                     ++++++
    ~ Column number_ongoing_conflicts_per_country_pair (changed metadata)
-       -   The number of wars divided by the number of all state-pairs. This accounts for the changing number of states over time. <%- if hostility == "all" -%> Included are conflicts between states where force was threatened, displayed, used, or escalated to a war that year
+       +   The number of wars divided by the number of all state-pairs. This accounts for the changing number of states over time. <%- if hostility_level == "all" -%> Included are conflicts between states where force was threatened, displayed, used, or escalated to a war that year
        ?                                                                                                                                           ++++++
-       -   <%- elif hostility == "Threat to use force" -%> Included are conflicts between states where, at most, use of force was threatened that year
+       +   <%- elif hostility_level == "Threat to use force" -%> Included are conflicts between states where, at most, use of force was threatened that year
        ?                     ++++++
-       -   <%- elif hostility == "Display of force" -%> Included are conflicts between states where, at most, force was displayed that year
+       +   <%- elif hostility_level == "Display of force" -%> Included are conflicts between states where, at most, force was displayed that year
        ?                     ++++++
-       -   <%- elif hostility == "Use of force" -%> Included are conflicts between states where, at most, force was used that year, but there were fewer than 1,000 combatant deaths
+       +   <%- elif hostility_level == "Use of force" -%> Included are conflicts between states where, at most, force was used that year, but there were fewer than 1,000 combatant deaths
        ?                     ++++++
-       -   <%- elif hostility == "War" -%> Included are interstate wars that were ongoing that year
+       +   <%- elif hostility_level == "War" -%> Included are interstate wars that were ongoing that year
        ?                     ++++++
= Dataset garden/war/2024-08-26/ucdp
  = Table ucdp
    ~ Column number_deaths_ongoing_conflicts (changed metadata)
+       +   <% set per_capita = "" %>
    ~ Column number_deaths_ongoing_conflicts_civilians (changed metadata)
+       +   <% set per_capita = "" %>
-       -   The << estimate >> estimate of the number of deaths of << people_type >> from one-sided violence that was ongoing that year<< per_capita >>.
+       +   The << estimate | default('') >> estimate of the number of deaths of << people_type >> from one-sided violence that was ongoing that year<< per_capita >>.
        ?                   ++++++++++++++
    ~ Column number_deaths_ongoing_conflicts_combatants (changed metadata)
+       +   <% set per_capita = "" %>
-       -   The << estimate >> estimate of the number of deaths of << people_type >> from one-sided violence that was ongoing that year<< per_capita >>.
+       +   The << estimate | default('') >> estimate of the number of deaths of << people_type >> from one-sided violence that was ongoing that year<< per_capita >>.
        ?                   ++++++++++++++
    ~ Column number_deaths_ongoing_conflicts_high (changed metadata)
+       +   <% set per_capita = "" %>
    ~ Column number_deaths_ongoing_conflicts_high_per_capita (changed metadata)
-       -   <% set per_capita = ", per 100,000 people" %> <%- if conflict_type == "all" -%>
        ?                                                   ^^^^^^^^^^^^ ^^^    -  ---  -
+       +   <% set per_capita = ", per 100,000 people" %> <% set per_capita = "" %>
        ?                                                   ^^^ ^  ++++++++
+       +   <%- if conflict_type == "all" -%>
    ~ Column number_deaths_ongoing_conflicts_low (changed metadata)
+       +   <% set per_capita = "" %>
    ~ Column number_deaths_ongoing_conflicts_low_per_capita (changed metadata)
-       -   <% set per_capita = ", per 100,000 people" %> <%- if conflict_type == "all" -%>
        ?                                                   ^^^^^^^^^^^^ ^^^    -  ---  -
+       +   <% set per_capita = ", per 100,000 people" %> <% set per_capita = "" %>
        ?                                                   ^^^ ^  ++++++++
+       +   <%- if conflict_type == "all" -%>
    ~ Column number_deaths_ongoing_conflicts_per_capita (changed metadata)
-       -   <% set per_capita = ", per 100,000 people" %> <%- if conflict_type == "all" -%>
        ?                                                   ^^^^^^^^^^^^ ^^^    -  ---  -
+       +   <% set per_capita = ", per 100,000 people" %> <% set per_capita = "" %>
        ?                                                   ^^^ ^  ++++++++
+       +   <%- if conflict_type == "all" -%>
    ~ Column number_deaths_ongoing_conflicts_unknown (changed metadata)
+       +   <% set per_capita = "" %>
-       -   The << estimate >> estimate of the number of deaths of << people_type >> from one-sided violence that was ongoing that year<< per_capita >>.
+       +   The << estimate | default('') >> estimate of the number of deaths of << people_type >> from one-sided violence that was ongoing that year<< per_capita >>.
        ?                   ++++++++++++++
  = Table ucdp_locations
    ~ Column death_rate (changed metadata)
-       -   <% set per_capita = ", per 100,000 people" %> <%- if conflict_type == "all" -%>
        ?                                                   ^^^^^^^^^^^^ ^^^    -  ---  -
+       +   <% set per_capita = ", per 100,000 people" %> <% set per_capita = "" %>
        ?                                                   ^^^ ^  ++++++++
+       +   <%- if conflict_type == "all" -%>
    ~ Column death_rate_high (changed metadata)
-       -   <% set per_capita = ", per 100,000 people" %> <%- if conflict_type == "all" -%>
        ?                                                   ^^^^^^^^^^^^ ^^^    -  ---  -
+       +   <% set per_capita = ", per 100,000 people" %> <% set per_capita = "" %>
        ?                                                   ^^^ ^  ++++++++
+       +   <%- if conflict_type == "all" -%>
    ~ Column death_rate_low (changed metadata)
-       -   <% set per_capita = ", per 100,000 people" %> <%- if conflict_type == "all" -%>
        ?                                                   ^^^^^^^^^^^^ ^^^    -  ---  -
+       +   <% set per_capita = ", per 100,000 people" %> <% set per_capita = "" %>
        ?                                                   ^^^ ^  ++++++++
+       +   <%- if conflict_type == "all" -%>
    ~ Column number_deaths (changed metadata)
+       +   <% set per_capita = "" %>
    ~ Column number_deaths_civilians (changed metadata)
+       +   <% set per_capita = "" %>
-       -   The << estimate >> estimate of the number of deaths of << people_type >> from one-sided violence that was ongoing that year<< per_capita >>.
+       +   The << estimate | default('') >> estimate of the number of deaths of << people_type >> from one-sided violence that was ongoing that year<< per_capita >>.
        ?                   ++++++++++++++
    ~ Column number_deaths_combatants (changed metadata)
+       +   <% set per_capita = "" %>
-       -   The << estimate >> estimate of the number of deaths of << people_type >> from one-sided violence that was ongoing that year<< per_capita >>.
+       +   The << estimate | default('') >> estimate of the number of deaths of << people_type >> from one-sided violence that was ongoing that year<< per_capita >>.
        ?                   ++++++++++++++
    ~ Column number_deaths_high (changed metadata)
+       +   <% set per_capita = "" %>
    ~ Column number_deaths_low (changed metadata)
+       +   <% set per_capita = "" %>
    ~ Column number_deaths_unknown (changed metadata)
+       +   <% set per_capita = "" %>
-       -   The << estimate >> estimate of the number of deaths of << people_type >> from one-sided violence that was ongoing that year<< per_capita >>.
+       +   The << estimate | default('') >> estimate of the number of deaths of << people_type >> from one-sided violence that was ongoing that year<< per_capita >>.
        ?                   ++++++++++++++
  = Table ucdp_country
= Dataset garden/war/2024-08-26/ucdp_prio
  = Table ucdp_prio
    ~ Column number_deaths_ongoing_conflicts (changed metadata)
+       +   <% set per_capita = "" %>
    ~ Column number_deaths_ongoing_conflicts_high (changed metadata)
+       +   <% set per_capita = "" %>
    ~ Column number_deaths_ongoing_conflicts_high_per_capita (changed metadata)
-       -   <% set per_capita = ", per 100,000 people" %> <%- if conflict_type == "all" -%>
        ?                                                   ^^^^^^^^^^^^ ^^^    -  ---  -
+       +   <% set per_capita = ", per 100,000 people" %> <% set per_capita = "" %>
        ?                                                   ^^^ ^  ++++++++
+       +   <%- if conflict_type == "all" -%>
    ~ Column number_deaths_ongoing_conflicts_low (changed metadata)
+       +   <% set per_capita = "" %>
    ~ Column number_deaths_ongoing_conflicts_low_per_capita (changed metadata)
-       -   <% set per_capita = ", per 100,000 people" %> <%- if conflict_type == "all" -%>
        ?                                                   ^^^^^^^^^^^^ ^^^    -  ---  -
+       +   <% set per_capita = ", per 100,000 people" %> <% set per_capita = "" %>
        ?                                                   ^^^ ^  ++++++++
+       +   <%- if conflict_type == "all" -%>
    ~ Column number_deaths_ongoing_conflicts_per_capita (changed metadata)
-       -   <% set per_capita = ", per 100,000 people" %> <%- if conflict_type == "all" -%>
        ?                                                   ^^^^^^^^^^^^ ^^^    -  ---  -
+       +   <% set per_capita = ", per 100,000 people" %> <% set per_capita = "" %>
        ?                                                   ^^^ ^  ++++++++
+       +   <%- if conflict_type == "all" -%>
= Dataset garden/war/2024-11-22/ucdp_preview
  = Table ucdp_preview
    ~ Column number_deaths_ongoing_conflicts (changed metadata)
+       +   <% set per_capita = "" %>
    ~ Column number_deaths_ongoing_conflicts_civilians (changed metadata)
+       +   <% set per_capita = "" %>
-       -   The << estimate >> estimate of the number of deaths of << people_type >> from one-sided violence that was ongoing that year<< per_capita >>.
+       +   The << estimate | default('') >> estimate of the number of deaths of << people_type >> from one-sided violence that was ongoing that year<< per_capita >>.
        ?                   ++++++++++++++
    ~ Column number_deaths_ongoing_conflicts_combatants (changed metadata)
+       +   <% set per_capita = "" %>
-       -   The << estimate >> estimate of the number of deaths of << people_type >> from one-sided violence that was ongoing that year<< per_capita >>.
+       +   The << estimate | default('') >> estimate of the number of deaths of << people_type >> from one-sided violence that was ongoing that year<< per_capita >>.
        ?                   ++++++++++++++
    ~ Column number_deaths_ongoing_conflicts_high (changed metadata)
+       +   <% set per_capita = "" %>
    ~ Column number_deaths_ongoing_conflicts_high_per_capita (changed metadata)
-       -   <% set per_capita = ", per 100,000 people" %> <%- if conflict_type == "all" -%>
        ?                                                   ^^^^^^^^^^^^ ^^^    -  ---  -
+       +   <% set per_capita = ", per 100,000 people" %> <% set per_capita = "" %>
        ?                                                   ^^^ ^  ++++++++
+       +   <%- if conflict_type == "all" -%>
    ~ Column number_deaths_ongoing_conflicts_low (changed metadata)
+       +   <% set per_capita = "" %>
    ~ Column number_deaths_ongoing_conflicts_low_per_capita (changed metadata)
-       -   <% set per_capita = ", per 100,000 people" %> <%- if conflict_type == "all" -%>
        ?                                                   ^^^^^^^^^^^^ ^^^    -  ---  -
+       +   <% set per_capita = ", per 100,000 people" %> <% set per_capita = "" %>
        ?                                                   ^^^ ^  ++++++++
+       +   <%- if conflict_type == "all" -%>
    ~ Column number_deaths_ongoing_conflicts_per_capita (changed metadata)
-       -   <% set per_capita = ", per 100,000 people" %> <%- if conflict_type == "all" -%>
        ?                                                   ^^^^^^^^^^^^ ^^^    -  ---  -
+       +   <% set per_capita = ", per 100,000 people" %> <% set per_capita = "" %>
        ?                                                   ^^^ ^  ++++++++
+       +   <%- if conflict_type == "all" -%>
    ~ Column number_deaths_ongoing_conflicts_unknown (changed metadata)
+       +   <% set per_capita = "" %>
-       -   The << estimate >> estimate of the number of deaths of << people_type >> from one-sided violence that was ongoing that year<< per_capita >>.
+       +   The << estimate | default('') >> estimate of the number of deaths of << people_type >> from one-sided violence that was ongoing that year<< per_capita >>.
        ?                   ++++++++++++++
  = Table ucdp_preview_country
  = Table ucdp_preview_locations
    ~ Column death_rate (changed metadata)
-       -   <% set per_capita = ", per 100,000 people" %> <%- if conflict_type == "all" -%>
        ?                                                   ^^^^^^^^^^^^ ^^^    -  ---  -
+       +   <% set per_capita = ", per 100,000 people" %> <% set per_capita = "" %>
        ?                                                   ^^^ ^  ++++++++
+       +   <%- if conflict_type == "all" -%>
    ~ Column death_rate_high (changed metadata)
-       -   <% set per_capita = ", per 100,000 people" %> <%- if conflict_type == "all" -%>
        ?                                                   ^^^^^^^^^^^^ ^^^    -  ---  -
+       +   <% set per_capita = ", per 100,000 people" %> <% set per_capita = "" %>
        ?                                                   ^^^ ^  ++++++++
+       +   <%- if conflict_type == "all" -%>
    ~ Column death_rate_low (changed metadata)
-       -   <% set per_capita = ", per 100,000 people" %> <%- if conflict_type == "all" -%>
        ?                                                   ^^^^^^^^^^^^ ^^^    -  ---  -
+       +   <% set per_capita = ", per 100,000 people" %> <% set per_capita = "" %>
        ?                                                   ^^^ ^  ++++++++
+       +   <%- if conflict_type == "all" -%>
    ~ Column number_deaths (changed metadata)
+       +   <% set per_capita = "" %>
    ~ Column number_deaths_civilians (changed metadata)
+       +   <% set per_capita = "" %>
-       -   The << estimate >> estimate of the number of deaths of << people_type >> from one-sided violence that was ongoing that year<< per_capita >>.
+       +   The << estimate | default('') >> estimate of the number of deaths of << people_type >> from one-sided violence that was ongoing that year<< per_capita >>.
        ?                   ++++++++++++++
    ~ Column number_deaths_combatants (changed metadata)
+       +   <% set per_capita = "" %>
-       -   The << estimate >> estimate of the number of deaths of << people_type >> from one-sided violence that was ongoing that year<< per_capita >>.
+       +   The << estimate | default('') >> estimate of the number of deaths of << people_type >> from one-sided violence that was ongoing that year<< per_capita >>.
        ?                   ++++++++++++++
    ~ Column number_deaths_high (changed metadata)
+       +   <% set per_capita = "" %>
    ~ Column number_deaths_low (changed metadata)
+       +   <% set per_capita = "" %>
    ~ Column number_deaths_unknown (changed metadata)
+       +   <% set per_capita = "" %>
-       -   The << estimate >> estimate of the number of deaths of << people_type >> from one-sided violence that was ongoing that year<< per_capita >>.
+       +   The << estimate | default('') >> estimate of the number of deaths of << people_type >> from one-sided violence that was ongoing that year<< per_capita >>.
        ?                   ++++++++++++++


Legend: +New  ~Modified  -Removed  =Identical  Details
Hint: Run this locally with etl diff REMOTE data/ --include yourdataset --verbose --snippet

Automatically updated datasets matching weekly_wildfires|excess_mortality|covid|fluid|flunet|country_profile|garden/ihme_gbd/2019/gbd_risk are not included

Edited: 2024-12-03 12:53:17 UTC
Execution time: 18.42 seconds

@Marigold Marigold marked this pull request as ready for review December 3, 2024 13:16
@Marigold Marigold merged commit 1e80661 into master Dec 3, 2024
8 checks passed
@Marigold Marigold deleted the fix-jinja branch December 3, 2024 13:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants